Skip to content

Commit c5d03ee

Browse files
gmackallgmackall
authored
[many] Remove dependency on kotlin-bom (#7088)
~This dependency seems to no longer be necessary. I expected this would be because the the androidx upgrade that [landed recently](flutter/engine#53592) fixed the problem ([see theory](#7036 (comment))), but it seems that the packages even build on stable successfully. Perhaps there have been updates to the underlying `androidx` libraries themselves that fix the conflict, and we updated the versions in plugins far enough? I'm unsure.~ Updated for 3.24 release. In a sense, fixes flutter/flutter#125062
1 parent 2703d10 commit c5d03ee

File tree

32 files changed

+74
-64
lines changed

32 files changed

+74
-64
lines changed

‎packages/camera/camera_android_camerax/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## 0.6.8+3
2+
3+
* Removes dependency on org.jetbrains.kotlin:kotlin-bom.
4+
* Updates minimum supported SDK version to Flutter 3.24/Dart 3.5.
5+
16
## 0.6.8+2
27

38
* Marks uses of `Camera2Interop` with `@OptIn` annotation.

‎packages/camera/camera_android_camerax/android/build.gradle

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,4 @@ dependencies {
7171
testImplementation 'org.mockito:mockito-inline:5.0.0'
7272
testImplementation 'androidx.test:core:1.4.0'
7373
testImplementation 'org.robolectric:robolectric:4.10.3'
74-
75-
// org.jetbrains.kotlin:kotlin-bom artifact purpose is to align kotlin stdlib and related code versions.
76-
// See: https://youtrack.jetbrains.com/issue/KT-55297/kotlin-stdlib-should-declare-constraints-on-kotlin-stdlib-jdk8-and-kotlin-stdlib-jdk7
77-
implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.10"))
7874
}

‎packages/camera/camera_android_camerax/example/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ description: Demonstrates how to use the camera_android_camerax plugin.
33
publish_to: 'none'
44

55
environment:
6-
sdk: ^3.4.0
7-
flutter: ">=3.22.0"
6+
sdk: ^3.5.0
7+
flutter: ">=3.24.0"
88

99
dependencies:
1010
camera_android_camerax:

‎packages/camera/camera_android_camerax/pubspec.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ name: camera_android_camerax
22
description: Android implementation of the camera plugin using the CameraX library.
33
repository: https://github.com/flutter/packages/tree/main/packages/camera/camera_android_camerax
44
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22
5-
version: 0.6.8+2
5+
version: 0.6.8+3
66

77
environment:
8-
sdk: ^3.4.0
9-
flutter: ">=3.22.0"
8+
sdk: ^3.5.0
9+
flutter: ">=3.24.0"
1010

1111
flutter:
1212
plugin:

‎packages/file_selector/file_selector_android/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## 0.5.1+7
2+
3+
* Removes dependency on org.jetbrains.kotlin:kotlin-bom.
4+
* Updates minimum supported SDK version to Flutter 3.24/Dart 3.5.
5+
16
## 0.5.1+6
27

38
* Bumps androidx.annotation:annotation from 1.8.1 to 1.8.2.

‎packages/file_selector/file_selector_android/android/build.gradle

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,6 @@ android {
4343
testImplementation 'org.mockito:mockito-inline:5.1.0'
4444
testImplementation 'androidx.test:core:1.3.0'
4545
testImplementation "org.robolectric:robolectric:4.12.1"
46-
47-
// org.jetbrains.kotlin:kotlin-bom artifact purpose is to align kotlin stdlib and related code versions.
48-
// See: https://youtrack.jetbrains.com/issue/KT-55297/kotlin-stdlib-should-declare-constraints-on-kotlin-stdlib-jdk8-and-kotlin-stdlib-jdk7
49-
implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.10"))
5046
}
5147

5248
lintOptions {

‎packages/file_selector/file_selector_android/example/android/build.gradle

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

88
dependencies {
9-
classpath 'com.android.tools.build:gradle:7.3.0'
9+
classpath 'com.android.tools.build:gradle:8.1.0'
1010
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1111
}
1212
}

‎packages/file_selector/file_selector_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-7.6.3-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip

‎packages/file_selector/file_selector_android/example/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ description: Demonstrates how to use the file_selector_android plugin.
33
publish_to: 'none'
44

55
environment:
6-
sdk: ^3.3.0
7-
flutter: ">=3.19.0"
6+
sdk: ^3.5.0
7+
flutter: ">=3.24.0"
88

99
dependencies:
1010
file_selector_android:

‎packages/file_selector/file_selector_android/pubspec.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ name: file_selector_android
22
description: Android implementation of the file_selector package.
33
repository: https://github.com/flutter/packages/tree/main/packages/file_selector/file_selector_android
44
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+file_selector%22
5-
version: 0.5.1+6
5+
version: 0.5.1+7
66

77
environment:
8-
sdk: ^3.4.0
9-
flutter: ">=3.22.0"
8+
sdk: ^3.5.0
9+
flutter: ">=3.24.0"
1010

1111
flutter:
1212
plugin:

‎packages/image_picker/image_picker_android/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## 0.8.12+13
2+
3+
* Removes dependency on org.jetbrains.kotlin:kotlin-bom.
4+
* Updates minimum supported SDK version to Flutter 3.24/Dart 3.5.
5+
16
## 0.8.12+12
27

38
* Bumps androidx.annotation:annotation from 1.8.1 to 1.8.2.

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,6 @@ android {
4242
implementation 'androidx.annotation:annotation:1.8.2'
4343
implementation 'androidx.exifinterface:exifinterface:1.3.7'
4444
implementation 'androidx.activity:activity:1.9.1'
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.22"))
4845

4946
testImplementation 'junit:junit:4.13.2'
5047
testImplementation 'org.mockito:mockito-core:5.1.1'

‎packages/image_picker/image_picker_android/example/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ description: Demonstrates how to use the image_picker plugin.
33
publish_to: none
44

55
environment:
6-
sdk: ^3.4.0
7-
flutter: ">=3.22.0"
6+
sdk: ^3.5.0
7+
flutter: ">=3.24.0"
88

99
dependencies:
1010
flutter:

‎packages/image_picker/image_picker_android/pubspec.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ name: image_picker_android
22
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
5-
version: 0.8.12+12
5+
version: 0.8.12+13
66

77
environment:
8-
sdk: ^3.4.0
9-
flutter: ">=3.22.0"
8+
sdk: ^3.5.0
9+
flutter: ">=3.24.0"
1010

1111
flutter:
1212
plugin:

‎packages/in_app_purchase/in_app_purchase_android/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## 0.3.6+8
2+
3+
* Removes dependency on org.jetbrains.kotlin:kotlin-bom.
4+
* Updates minimum supported SDK version to Flutter 3.24/Dart 3.5.
5+
16
## 0.3.6+7
27

38
* Sets `android.buildFeatures.buildConfig` to true for compatibility with AGP 8.0+.

‎packages/in_app_purchase/in_app_purchase_android/android/build.gradle

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,6 @@ android {
6363

6464
dependencies {
6565
implementation 'androidx.annotation:annotation:1.8.2'
66-
// org.jetbrains.kotlin:kotlin-bom artifact purpose is to align kotlin stdlib and related code versions.
67-
// See: https://youtrack.jetbrains.com/issue/KT-55297/kotlin-stdlib-should-declare-constraints-on-kotlin-stdlib-jdk8-and-kotlin-stdlib-jdk7
68-
implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.22"))
6966
implementation 'com.android.billingclient:billing:6.2.0'
7067
testImplementation 'junit:junit:4.13.2'
7168
testImplementation 'org.json:json:20240303'

‎packages/in_app_purchase/in_app_purchase_android/example/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ description: Demonstrates how to use the in_app_purchase_android plugin.
33
publish_to: none
44

55
environment:
6-
sdk: ^3.4.0
7-
flutter: ">=3.22.0"
6+
sdk: ^3.5.0
7+
flutter: ">=3.24.0"
88

99
dependencies:
1010
flutter:

‎packages/in_app_purchase/in_app_purchase_android/pubspec.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ name: in_app_purchase_android
22
description: An implementation for the Android platform of the Flutter `in_app_purchase` plugin. This uses the Android BillingClient APIs.
33
repository: https://github.com/flutter/packages/tree/main/packages/in_app_purchase/in_app_purchase_android
44
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+in_app_purchase%22
5-
version: 0.3.6+7
5+
version: 0.3.6+8
66

77
environment:
8-
sdk: ^3.4.0
9-
flutter: ">=3.22.0"
8+
sdk: ^3.5.0
9+
flutter: ">=3.24.0"
1010

1111
flutter:
1212
plugin:

‎packages/interactive_media_ads/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## 0.1.2+2
2+
3+
* Removes dependency on org.jetbrains.kotlin:kotlin-bom.
4+
* Updates minimum supported SDK version to Flutter 3.24/Dart 3.5.
5+
16
## 0.1.2+1
27

38
* Updates README to clarify supported features and link to issues tracker.

‎packages/interactive_media_ads/android/build.gradle

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,6 @@ android {
5757
testImplementation "org.mockito.kotlin:mockito-kotlin:4.1.0"
5858
testImplementation 'org.mockito:mockito-inline:5.1.0'
5959
testImplementation 'androidx.test:core:1.3.0'
60-
61-
// org.jetbrains.kotlin:kotlin-bom artifact purpose is to align kotlin stdlib and related code versions.
62-
// See: https://youtrack.jetbrains.com/issue/KT-55297/kotlin-stdlib-should-declare-constraints-on-kotlin-stdlib-jdk8-and-kotlin-stdlib-jdk7
63-
implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.10"))
6460
}
6561

6662
lintOptions {

‎packages/interactive_media_ads/android/src/main/kotlin/dev/flutter/packages/interactive_media_ads/AdsRequestProxyApi.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class AdsRequestProxyApi(override val pigeonRegistrar: ProxyApiRegistrar) :
2121
*
2222
* This must match the version in pubspec.yaml.
2323
*/
24-
const val pluginVersion = "0.1.2+1"
24+
const val pluginVersion = "0.1.2+2"
2525
}
2626

2727
override fun setAdTagUrl(pigeon_instance: AdsRequest, adTagUrl: String) {

‎packages/interactive_media_ads/example/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ description: "Demonstrates how to use the interactive_media_ads plugin."
33
publish_to: 'none' # Remove this line if you wish to publish to pub.dev
44

55
environment:
6-
sdk: ^3.3.0
7-
flutter: ">=3.19.0"
6+
sdk: ^3.5.0
7+
flutter: ">=3.24.0"
88

99
dependencies:
1010
flutter:

‎packages/interactive_media_ads/ios/interactive_media_ads/Sources/interactive_media_ads/AdsRequestProxyAPIDelegate.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class AdsRequestProxyAPIDelegate: PigeonApiDelegateIMAAdsRequest {
1313
/// The current version of the `interactive_media_ads` plugin.
1414
///
1515
/// This must match the version in pubspec.yaml.
16-
static let pluginVersion = "0.1.2+1"
16+
static let pluginVersion = "0.1.2+2"
1717

1818
func pigeonDefaultConstructor(
1919
pigeonApi: PigeonApiIMAAdsRequest, adTagUrl: String, adDisplayContainer: IMAAdDisplayContainer,

‎packages/interactive_media_ads/pubspec.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ name: interactive_media_ads
22
description: A Flutter plugin for using the Interactive Media Ads SDKs on Android and iOS.
33
repository: https://github.com/flutter/packages/tree/main/packages/interactive_media_ads
44
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+interactive_media_ads%22
5-
version: 0.1.2+1 # This must match the version in
5+
version: 0.1.2+2 # This must match the version in
66
# `android/src/main/kotlin/dev/flutter/packages/interactive_media_ads/AdsRequestProxyApi.kt` and
77
# `ios/interactive_media_ads/Sources/interactive_media_ads/AdsRequestProxyAPIDelegate.swift`
88

99
environment:
10-
sdk: ^3.3.0
11-
flutter: ">=3.19.0"
10+
sdk: ^3.5.0
11+
flutter: ">=3.24.0"
1212

1313
flutter:
1414
plugin:

‎packages/local_auth/local_auth_android/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## 1.0.44
2+
3+
* Removes dependency on org.jetbrains.kotlin:kotlin-bom.
4+
* Updates minimum supported SDK version to Flutter 3.24/Dart 3.5.
5+
16
## 1.0.43
27

38
* Updates lint checks to ignore NewerVersionAvailable.

‎packages/local_auth/local_auth_android/android/build.gradle

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,4 @@ dependencies {
6868
androidTestImplementation 'androidx.test:runner:1.2.0'
6969
androidTestImplementation 'androidx.test:rules:1.2.0'
7070
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
71-
// TODO(camsim99): org.jetbrains.kotlin:kotlin-bom artifact purpose is to align kotlin stdlib and related code versions.
72-
// This should be removed when https://github.com/flutter/flutter/issues/125062 is fixed.
73-
implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.10"))
7471
}

‎packages/local_auth/local_auth_android/example/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ description: Demonstrates how to use the local_auth_android plugin.
33
publish_to: none
44

55
environment:
6-
sdk: ^3.4.0
7-
flutter: ">=3.22.0"
6+
sdk: ^3.5.0
7+
flutter: ">=3.24.0"
88

99
dependencies:
1010
flutter:

‎packages/local_auth/local_auth_android/pubspec.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ name: local_auth_android
22
description: Android implementation of the local_auth plugin.
33
repository: https://github.com/flutter/packages/tree/main/packages/local_auth/local_auth_android
44
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+local_auth%22
5-
version: 1.0.43
5+
version: 1.0.44
66

77
environment:
8-
sdk: ^3.4.0
9-
flutter: ">=3.22.0"
8+
sdk: ^3.5.0
9+
flutter: ">=3.24.0"
1010

1111
flutter:
1212
plugin:

‎packages/url_launcher/url_launcher_android/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## 6.3.10
2+
3+
* Removes dependency on org.jetbrains.kotlin:kotlin-bom.
4+
* Updates minimum supported SDK version to Flutter 3.24/Dart 3.5.
5+
16
## 6.3.9
27

38
* Bumps androidx.annotation:annotation from 1.8.1 to 1.8.2.

‎packages/url_launcher/url_launcher_android/android/build.gradle

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,4 @@ dependencies {
7171
testImplementation 'org.mockito:mockito-core:5.1.1'
7272
testImplementation 'androidx.test:core:1.0.0'
7373
testImplementation 'org.robolectric:robolectric:4.10.3'
74-
75-
// org.jetbrains.kotlin:kotlin-bom artifact purpose is to align kotlin stdlib and related code versions.
76-
// See: https://youtrack.jetbrains.com/issue/KT-55297/kotlin-stdlib-should-declare-constraints-on-kotlin-stdlib-jdk8-and-kotlin-stdlib-jdk7
77-
implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.22"))
7874
}

‎packages/url_launcher/url_launcher_android/example/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ description: Demonstrates how to use the url_launcher plugin.
33
publish_to: none
44

55
environment:
6-
sdk: ^3.4.0
7-
flutter: ">=3.22.0"
6+
sdk: ^3.5.0
7+
flutter: ">=3.24.0"
88

99
dependencies:
1010
flutter:

‎packages/url_launcher/url_launcher_android/pubspec.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ name: url_launcher_android
22
description: Android implementation of the url_launcher plugin.
33
repository: https://github.com/flutter/packages/tree/main/packages/url_launcher/url_launcher_android
44
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+url_launcher%22
5-
version: 6.3.9
5+
version: 6.3.10
66
environment:
7-
sdk: ^3.4.0
8-
flutter: ">=3.22.0"
7+
sdk: ^3.5.0
8+
flutter: ">=3.24.0"
99

1010
flutter:
1111
plugin:

0 commit comments

Comments
 (0)