Skip to content

Commit a6532f9

Browse files
authored
[image_picker] Upgrade androidx.activity to 1.7.0 and add a dependency on kotlin-bom to align kotlin transitive dependencies (flutter#3968)
Taking over flutter/packages#3536 bumps androidx.activity:activity to 1.7.0 Adds a workaround to fix duplicate class failures described here flutter#125062.
1 parent 94d21d8 commit a6532f9

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
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.6+15
2+
3+
* Bumps androidx.activity:activity from 1.6.1 to 1.7.0.
4+
15
## 0.8.6+14
26

37
* Fixes Java warnings.

packages/image_picker/image_picker_android/android/build.gradle

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,10 @@ android {
4141
implementation 'androidx.core:core:1.9.0'
4242
implementation 'androidx.annotation:annotation:1.3.0'
4343
implementation 'androidx.exifinterface:exifinterface:1.3.6'
44-
implementation 'androidx.activity:activity:1.6.1'
44+
implementation 'androidx.activity:activity:1.7.0'
45+
// org.jetbrains.kotlin:kotlin-bom artifact purpose is to align kotlin stdlib and related code versions.
46+
// See: https://youtrack.jetbrains.com/issue/KT-55297/kotlin-stdlib-should-declare-constraints-on-kotlin-stdlib-jdk8-and-kotlin-stdlib-jdk7
47+
implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.10"))
4548

4649
testImplementation 'junit:junit:4.13.2'
4750
testImplementation 'org.mockito:mockito-core:5.1.1'

packages/image_picker/image_picker_android/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: Android implementation of the image_picker plugin.
33
repository: https://github.com/flutter/packages/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
55

6-
version: 0.8.6+14
6+
version: 0.8.6+15
77

88
environment:
99
sdk: ">=2.18.0 <4.0.0"

0 commit comments

Comments
 (0)