Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[camerax] Add a dependency on kotlin-bom to align versions of kotlin-stdlib #3960

Merged
merged 7 commits into from
May 12, 2023
Merged

[camerax] Add a dependency on kotlin-bom to align versions of kotlin-stdlib #3960

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9220ea3
aligning kotlin version
May 10, 2023
8fb2f71
Merge branch 'main' into kotlin_version_fix
gmackall May 10, 2023
86b48b2
adding changelog/pubspec for kotlin version fix changes
May 10, 2023
f1696d9
changing kotlin version to 1.7.10 in example app
May 10, 2023
26f1c72
removing readme note about duplicate class issue, as the problem shou…
May 10, 2023
169f828
updating CHANGELOG to also note that the README section on the duplic…
May 10, 2023
eda00fe
fixing typos/style issues in CHANGELOG
May 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions packages/camera/camera_android_camerax/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## 0.5.0+2

* Add a dependency on kotlin-bom to align versions kotlin transitive dependencies.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: Adds

https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#changelog-style

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this missing an "of" in "versions kotlin"?

(also, "Kotlin")

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes it is 🤦. It was originally "to align Kotlin transitive dependencies" and I missed an "of" when adding "versions"

* Remove note in `README.md` regarding duplicate Kotlin classes issue.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removes


## 0.5.0+1

* Update `README.md` to include known duplicate Kotlin classes issue.
Expand Down
9 changes: 0 additions & 9 deletions packages/camera/camera_android_camerax/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down
4 changes: 4 additions & 0 deletions packages/camera/camera_android_camerax/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
}
2 changes: 1 addition & 1 deletion packages/camera/camera_android_camerax/example/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
buildscript {
ext.kotlin_version = '1.8.0'
ext.kotlin_version = '1.7.10'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why does this have version 1.7.10 but the code here packages/camera/camera_android_camerax/android/build.gradle
Has 1.8.10?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We explicitly want to test that the plugin works out of the box for users with a default flutter create setup, which still uses 1.7.10. Otherwise anyone using this plugin gets confusing compile errors and has to change their app settings.

repositories {
google()
mavenCentral()
Expand Down
2 changes: 1 addition & 1 deletion packages/camera/camera_android_camerax/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down