Skip to content
This repository has been archived by the owner on Feb 22, 2023. It is now read-only.

[image_picker_android] Add jetifier back with gradle and androidx upgrades #5890

Merged
merged 4 commits into from
Jun 3, 2022
Merged

[image_picker_android] Add jetifier back with gradle and androidx upgrades #5890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aef876e
add jetifier back with gradle and androidx upgrades
bparrishMines Jun 3, 2022
2e70b9f
lower versions
bparrishMines Jun 3, 2022
02ca3eb
version bump
bparrishMines Jun 3, 2022
1b9e5ea
fix version
bparrishMines Jun 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions packages/image_picker/image_picker_android/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.8.5

* Updates gradle to 7.1.2.

## 0.8.4+13

* Minor fixes for new analysis options.
Expand Down
12 changes: 6 additions & 6 deletions packages/image_picker/image_picker_android/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:3.3.0'
classpath 'com.android.tools.build:gradle:7.1.2'
}
}

Expand All @@ -33,14 +33,14 @@ android {
disable 'GradleDependency'
}
dependencies {
implementation 'androidx.core:core:1.0.2'
implementation 'androidx.annotation:annotation:1.0.0'
implementation 'androidx.exifinterface:exifinterface:1.3.0'
implementation 'androidx.core:core:1.8.0'
implementation 'androidx.annotation:annotation:1.3.0'
implementation 'androidx.exifinterface:exifinterface:1.3.3'

testImplementation 'junit:junit:4.12'
testImplementation 'org.mockito:mockito-core:3.10.0'
testImplementation 'androidx.test:core:1.2.0'
testImplementation "org.robolectric:robolectric:4.3.1"
testImplementation 'androidx.test:core:1.4.0'
testImplementation "org.robolectric:robolectric:4.8.1"
}

compileOptions {
Expand Down
2 changes: 1 addition & 1 deletion packages/image_picker/image_picker_android/example/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,5 +63,5 @@ dependencies {
testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test:runner:1.2.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
api 'androidx.test:core:1.2.0'
api 'androidx.test:core:1.4.0'
}
2 changes: 1 addition & 1 deletion packages/image_picker/image_picker_android/example/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:3.3.0'
classpath 'com.android.tools.build:gradle:7.1.2'
}
}

Expand Down
2 changes: 1 addition & 1 deletion packages/image_picker/image_picker_android/example/android/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
org.gradle.jvmargs=-Xmx1536M
android.enableR8=true
android.useAndroidX=true
android.enableJetifier=true
2 changes: 1 addition & 1 deletion ...mage_picker/image_picker_android/example/android/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
2 changes: 1 addition & 1 deletion packages/image_picker/image_picker_android/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: image_picker_android
description: Android implementation of the image_picker plugin.
repository: https://github.com/flutter/plugins/tree/main/packages/image_picker/image_picker_android
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+image_picker%22
version: 0.8.4+13
version: 0.8.5

environment:
sdk: ">=2.14.0 <3.0.0"
Expand Down