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

diff --git a/packages/image_picker/image_picker_android/CHANGELOG.md b/packages/image_picker/image_picker_android/CHANGELOG.md
index eede634..a5cc613 100644
--- 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
index 928c7cd..516c7ae 100755
--- a/packages/image_picker/image_picker_android/android/build.gradle
+++ b/packages/image_picker/image_picker_android/android/build.gradle

@@ -8,7 +8,7 @@
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0'
+        classpath 'com.android.tools.build:gradle:7.1.2'
     }
 }
 
@@ -33,14 +33,14 @@
         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
index e73e3fe..c8e8f3f 100755
--- 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 @@
     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
index e101ac0..e29a443 100755
--- 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 @@
     }
 
     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
index d12b9a8..94adc3a 100755
--- 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
index 019065d..cb24abd 100644
--- 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 @@
 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
index 6accfb0..3d17e8a 100755
--- a/packages/image_picker/image_picker_android/pubspec.yaml
+++ b/packages/image_picker/image_picker_android/pubspec.yaml

@@ -2,7 +2,7 @@
 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"