From 9220ea3a6c23aa297ca2153ef1fa59405d86cac6 Mon Sep 17 00:00:00 2001 From: Gray Mackall Date: Wed, 10 May 2023 10:31:32 -0700 Subject: [PATCH 1/6] aligning kotlin version --- packages/camera/camera_android_camerax/android/build.gradle | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/camera/camera_android_camerax/android/build.gradle b/packages/camera/camera_android_camerax/android/build.gradle index 64bf11774172..837ab1b1f0b2 100644 --- a/packages/camera/camera_android_camerax/android/build.gradle +++ b/packages/camera/camera_android_camerax/android/build.gradle @@ -72,4 +72,8 @@ dependencies { testImplementation 'org.mockito:mockito-inline:5.0.0' testImplementation 'androidx.test:core:1.4.0' testImplementation 'org.robolectric:robolectric:4.8' + + // org.jetbrains.kotlin:kotlin-bom artifact purpose is to align kotlin stdlib and related code versions. + // See: https://youtrack.jetbrains.com/issue/KT-55297/kotlin-stdlib-should-declare-constraints-on-kotlin-stdlib-jdk8-and-kotlin-stdlib-jdk7 + implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.10")) } From 86b48b2031c8174e5141f40f4ff5be3762216eae Mon Sep 17 00:00:00 2001 From: Gray Mackall Date: Wed, 10 May 2023 11:01:47 -0700 Subject: [PATCH 2/6] adding changelog/pubspec for kotlin version fix changes --- packages/camera/camera_android_camerax/CHANGELOG.md | 4 ++++ packages/camera/camera_android_camerax/pubspec.yaml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/camera/camera_android_camerax/CHANGELOG.md b/packages/camera/camera_android_camerax/CHANGELOG.md index fc240cf231d7..c7960d06000b 100644 --- a/packages/camera/camera_android_camerax/CHANGELOG.md +++ b/packages/camera/camera_android_camerax/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.5.0+2 + +* Add a dependency on kotlin-bom to align versions kotlin transitive dependencies. + ## 0.5.0+1 * Update `README.md` to include known duplicate Kotlin classes issue. diff --git a/packages/camera/camera_android_camerax/pubspec.yaml b/packages/camera/camera_android_camerax/pubspec.yaml index 164f230bee14..7c5776663234 100644 --- a/packages/camera/camera_android_camerax/pubspec.yaml +++ b/packages/camera/camera_android_camerax/pubspec.yaml @@ -3,7 +3,7 @@ description: Android implementation of the camera plugin using the CameraX libra repository: https://github.com/flutter/packages/tree/main/packages/camera/camera_android_camerax issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22 -version: 0.5.0+1 +version: 0.5.0+2 environment: sdk: ">=2.19.0 <4.0.0" From f1696d9e32eb4dabdd3837509949745a68a019af Mon Sep 17 00:00:00 2001 From: Gray Mackall Date: Wed, 10 May 2023 11:48:26 -0700 Subject: [PATCH 3/6] changing kotlin version to 1.7.10 in example app --- .../camera/camera_android_camerax/example/android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/camera/camera_android_camerax/example/android/build.gradle b/packages/camera/camera_android_camerax/example/android/build.gradle index ff7e7df1891b..3aa0008fd27c 100644 --- a/packages/camera/camera_android_camerax/example/android/build.gradle +++ b/packages/camera/camera_android_camerax/example/android/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlin_version = '1.8.0' + ext.kotlin_version = '1.7.10' repositories { google() mavenCentral() From 26f1c72c952a3410849b8efee74f8a3cdaca716c Mon Sep 17 00:00:00 2001 From: Gray Mackall Date: Wed, 10 May 2023 11:51:15 -0700 Subject: [PATCH 4/6] removing readme note about duplicate class issue, as the problem should be fixed --- packages/camera/camera_android_camerax/README.md | 9 --------- 1 file changed, 9 deletions(-) diff --git a/packages/camera/camera_android_camerax/README.md b/packages/camera/camera_android_camerax/README.md index fd7c03e1969f..a357008b8ba4 100644 --- a/packages/camera/camera_android_camerax/README.md +++ b/packages/camera/camera_android_camerax/README.md @@ -49,15 +49,6 @@ Any specified `ResolutionPreset` wll go unused in favor of CameraX defaults and `setZoomLevel` is unimplemented. -## Known Issues - -### Receiving `Duplicate class kotlin.*` error - -If you receive a `Duplicate class kotlin.*` error when using this plugin -implementation, you may need to update your app's Kotlin version. You can do -this by finding your app's `android/build.gradle` file and updating the -`org.jetbrains.kotlin:kotlin-stdlib-jdk7` dependency to at least version 1.18.10. - ## Contributing For more information on contributing to this plugin, see [`CONTRIBUTING.md`](CONTRIBUTING.md). From 169f828fd336643113da0f0bde355d954454c781 Mon Sep 17 00:00:00 2001 From: Gray Mackall Date: Wed, 10 May 2023 11:55:29 -0700 Subject: [PATCH 5/6] updating CHANGELOG to also note that the README section on the duplicate class issue was removed --- packages/camera/camera_android_camerax/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/camera/camera_android_camerax/CHANGELOG.md b/packages/camera/camera_android_camerax/CHANGELOG.md index c7960d06000b..271784f2fc41 100644 --- a/packages/camera/camera_android_camerax/CHANGELOG.md +++ b/packages/camera/camera_android_camerax/CHANGELOG.md @@ -1,6 +1,7 @@ ## 0.5.0+2 * Add a dependency on kotlin-bom to align versions kotlin transitive dependencies. +* Remove note in `README.md` regarding duplicate Kotlin classes issue. ## 0.5.0+1 From eda00fe0ee329433a013b63a1b7727f90f2d0de2 Mon Sep 17 00:00:00 2001 From: Gray Mackall Date: Wed, 10 May 2023 12:49:31 -0700 Subject: [PATCH 6/6] fixing typos/style issues in CHANGELOG --- packages/camera/camera_android_camerax/CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/camera/camera_android_camerax/CHANGELOG.md b/packages/camera/camera_android_camerax/CHANGELOG.md index 271784f2fc41..13d2f18fb926 100644 --- a/packages/camera/camera_android_camerax/CHANGELOG.md +++ b/packages/camera/camera_android_camerax/CHANGELOG.md @@ -1,7 +1,7 @@ ## 0.5.0+2 -* Add a dependency on kotlin-bom to align versions kotlin transitive dependencies. -* Remove note in `README.md` regarding duplicate Kotlin classes issue. +* Adds a dependency on kotlin-bom to align versions of Kotlin transitive dependencies. +* Removes note in `README.md` regarding duplicate Kotlin classes issue. ## 0.5.0+1