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

bparrishMines · web-flow · commit eda3e80e7d10 · 2022-06-03T15:48:12.000-07:00
diff --git a/packages/image_picker/image_picker_android/CHANGELOG.md b/packages/image_picker/image_picker_android/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.8.5
+
+* Updates gradle to 7.1.2.
+
 ## 0.8.4+13
 
 * Minor fixes for new analysis options.
diff --git a/packages/image_picker/image_picker_android/android/build.gradle b/packages/image_picker/image_picker_android/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0'
+        classpath 'com.android.tools.build:gradle:7.1.2'
     }
 }
 
@@ -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 {
diff --git a/packages/image_picker/image_picker_android/example/android/app/build.gradle b/packages/image_picker/image_picker_android/example/android/app/build.gradle
@@ -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'
 }
diff --git a/packages/image_picker/image_picker_android/example/android/build.gradle b/packages/image_picker/image_picker_android/example/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0'
+        classpath 'com.android.tools.build:gradle:7.1.2'
     }
 }
 
diff --git a/packages/image_picker/image_picker_android/example/android/gradle.properties b/packages/image_picker/image_picker_android/example/android/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.jvmargs=-Xmx1536M
-android.enableR8=true
 android.useAndroidX=true
+android.enableJetifier=true
diff --git a/packages/image_picker/image_picker_android/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/image_picker/image_picker_android/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -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
diff --git a/packages/image_picker/image_picker_android/pubspec.yaml b/packages/image_picker/image_picker_android/pubspec.yaml
@@ -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"

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ buildscript {`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`dependencies {`
`11`		`- classpath 'com.android.tools.build:gradle:3.3.0'`
	`11`	`+ classpath 'com.android.tools.build:gradle:7.1.2'`
`12`	`12`	`}`
`13`	`13`	`}`
`14`	`14`
`@@ -33,14 +33,14 @@ android {`
`33`	`33`	`disable 'GradleDependency'`
`34`	`34`	`}`
`35`	`35`	`dependencies {`
`36`		`- implementation 'androidx.core:core:1.0.2'`
`37`		`- implementation 'androidx.annotation:annotation:1.0.0'`
`38`		`- implementation 'androidx.exifinterface:exifinterface:1.3.0'`
	`36`	`+ implementation 'androidx.core:core:1.8.0'`
	`37`	`+ implementation 'androidx.annotation:annotation:1.3.0'`
	`38`	`+ implementation 'androidx.exifinterface:exifinterface:1.3.3'`
`39`	`39`
`40`	`40`	`testImplementation 'junit:junit:4.12'`
`41`	`41`	`testImplementation 'org.mockito:mockito-core:3.10.0'`
`42`		`- testImplementation 'androidx.test:core:1.2.0'`
`43`		`- testImplementation "org.robolectric:robolectric:4.3.1"`
	`42`	`+ testImplementation 'androidx.test:core:1.4.0'`
	`43`	`+ testImplementation "org.robolectric:robolectric:4.8.1"`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`compileOptions {`
Original file line number	Diff line number	Diff line change
`@@ -63,5 +63,5 @@ dependencies {`
`63`	`63`	`testImplementation 'junit:junit:4.12'`
`64`	`64`	`androidTestImplementation 'androidx.test:runner:1.2.0'`
`65`	`65`	`androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'`
`66`		`- api 'androidx.test:core:1.2.0'`
	`66`	`+ api 'androidx.test:core:1.4.0'`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ buildscript {`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`dependencies {`
`8`		`- classpath 'com.android.tools.build:gradle:3.3.0'`
	`8`	`+ classpath 'com.android.tools.build:gradle:7.1.2'`
`9`	`9`	`}`
`10`	`10`	`}`
`11`	`11`