Skip to content

Commit b6aad3c

Browse files
bparrishMinesmvanbeusekom
authored andcommitted
[image_picker_android] Add jetifier back with gradle and androidx upgrades (flutter#5890)
1 parent 8ad287c commit b6aad3c

File tree

7 files changed

+15
-11
lines changed

7 files changed

+15
-11
lines changed

packages/image_picker/image_picker_android/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.8.5
2+
3+
* Updates gradle to 7.1.2.
4+
15
## 0.8.4+13
26

37
* Minor fixes for new analysis options.

packages/image_picker/image_picker_android/android/build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ buildscript {
88
}
99

1010
dependencies {
11-
classpath 'com.android.tools.build:gradle:3.3.0'
11+
classpath 'com.android.tools.build:gradle:7.1.2'
1212
}
1313
}
1414

@@ -33,14 +33,14 @@ android {
3333
disable 'GradleDependency'
3434
}
3535
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'
3939

4040
testImplementation 'junit:junit:4.12'
4141
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"
4444
}
4545

4646
compileOptions {

packages/image_picker/image_picker_android/example/android/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,5 +63,5 @@ dependencies {
6363
testImplementation 'junit:junit:4.12'
6464
androidTestImplementation 'androidx.test:runner:1.2.0'
6565
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'
6767
}

packages/image_picker/image_picker_android/example/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
}
66

77
dependencies {
8-
classpath 'com.android.tools.build:gradle:3.3.0'
8+
classpath 'com.android.tools.build:gradle:7.1.2'
99
}
1010
}
1111

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
org.gradle.jvmargs=-Xmx1536M
2-
android.enableR8=true
32
android.useAndroidX=true
3+
android.enableJetifier=true

packages/image_picker/image_picker_android/example/android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
zipStoreBase=GRADLE_USER_HOME
44
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip

packages/image_picker/image_picker_android/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: image_picker_android
22
description: Android implementation of the image_picker plugin.
33
repository: https://github.com/flutter/plugins/tree/main/packages/image_picker/image_picker_android
44
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+image_picker%22
5-
version: 0.8.4+13
5+
version: 0.8.5
66

77
environment:
88
sdk: ">=2.14.0 <3.0.0"

0 commit comments

Comments
 (0)