Skip to content

Commit 3683b97

Browse files
mlykotommlykotom
authored
Merge pull request #426 from android/renovate/main-kotlin-dependencies
Update Kotlin Dependencies (main)
2 parents 83dfd2d + 1279238 commit 3683b97

File tree

39 files changed

+61
-75
lines changed

39 files changed

+61
-75
lines changed

‎AccessibilityCodelab/app/build.gradle

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
plugins {
1818
id 'com.android.application'
1919
id 'kotlin-android'
20+
id 'org.jetbrains.kotlin.plugin.compose'
2021
}
2122

2223
android {
@@ -79,10 +80,6 @@ android {
7980
compose true
8081
}
8182

82-
composeOptions {
83-
kotlinCompilerExtensionVersion '1.5.13'
84-
}
85-
8683
packagingOptions {
8784
excludes += "/META-INF/AL2.0"
8885
excludes += "/META-INF/LGPL2.1"
@@ -114,7 +111,7 @@ dependencies {
114111
implementation "com.google.accompanist:accompanist-swiperefresh:$accompanist_version"
115112
implementation "com.google.accompanist:accompanist-systemuicontroller:$accompanist_version"
116113

117-
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0"
114+
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1"
118115

119116
implementation 'androidx.appcompat:appcompat:1.6.1'
120117
implementation 'androidx.activity:activity-ktx:1.9.0'

‎AccessibilityCodelab/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,13 @@ buildscript {
2222

2323
dependencies {
2424
classpath 'com.android.tools.build:gradle:8.4.0'
25-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23"
25+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
2626
}
2727
}
2828

2929
plugins {
3030
id 'com.diffplug.spotless' version '6.25.0'
31+
id 'org.jetbrains.kotlin.plugin.compose' version "2.0.0" apply false
3132
}
3233

3334
subprojects {

‎AccessibilityCodelab/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎AdaptiveUiCodelab/app/build.gradle

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
plugins {
1818
id 'com.android.application'
1919
id 'org.jetbrains.kotlin.android'
20+
id 'org.jetbrains.kotlin.plugin.compose'
2021
}
2122

2223
android {
@@ -52,9 +53,6 @@ android {
5253
buildFeatures {
5354
compose true
5455
}
55-
composeOptions {
56-
kotlinCompilerExtensionVersion '1.5.13'
57-
}
5856
packagingOptions {
5957
resources {
6058
excludes += '/META-INF/{AL2.0,LGPL2.1}'
@@ -81,7 +79,7 @@ dependencies {
8179
implementation 'androidx.activity:activity-compose:1.9.0'
8280
implementation 'androidx.core:core-ktx:1.13.1'
8381
implementation "androidx.window:window:1.2.0"
84-
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0"
82+
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1"
8583

8684
testImplementation 'junit:junit:4.13.2'
8785
androidTestImplementation 'androidx.test.ext:junit:1.1.5'

‎AdaptiveUiCodelab/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ buildscript {
2020
}
2121
dependencies {
2222
classpath "com.android.tools.build:gradle:8.4.0"
23-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23"
23+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
24+
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0"
2425
}
2526
}
2627

‎AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎AdvancedStateAndSideEffectsCodelab/app/build.gradle

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ plugins {
1919
id 'kotlin-android'
2020
id 'kotlin-kapt'
2121
id 'dagger.hilt.android.plugin'
22+
id 'org.jetbrains.kotlin.plugin.compose'
2223
}
2324

2425
// Reads the Google maps key that is used in the AndroidManifest
@@ -83,10 +84,6 @@ android {
8384
shaders false
8485
}
8586

86-
composeOptions {
87-
kotlinCompilerExtensionVersion '1.5.13'
88-
}
89-
9087
packagingOptions {
9188
// Multiple dependency bring these files in. Exclude them to enable
9289
// our test APK to build (has no effect on our AARs)
@@ -96,7 +93,7 @@ android {
9693
}
9794

9895
dependencies {
99-
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0"
96+
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1"
10097
implementation "com.google.android.libraries.maps:maps:3.1.0-beta"
10198
implementation "com.google.maps.android:maps-v3-ktx:3.4.0"
10299
constraints {
@@ -136,7 +133,7 @@ dependencies {
136133
androidTestImplementation "androidx.test:rules:1.5.0"
137134
androidTestImplementation "androidx.test.espresso:espresso-core:3.5.1"
138135
androidTestImplementation "androidx.test.ext:junit-ktx:1.1.5"
139-
androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.8.0"
136+
androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.8.1"
140137
androidTestImplementation "com.google.dagger:hilt-android:2.51.1"
141138
androidTestImplementation "com.google.dagger:hilt-android-testing:2.51.1"
142139
kaptAndroidTest "com.google.dagger:hilt-compiler:2.51.1"

‎AdvancedStateAndSideEffectsCodelab/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,9 @@ buildscript {
2121
}
2222
dependencies {
2323
classpath "com.android.tools.build:gradle:8.4.0"
24-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23"
24+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
2525
classpath "com.google.dagger:hilt-android-gradle-plugin:2.51.1"
26+
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0"
2627
}
2728
}
2829

‎AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎AnimationCodelab/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ buildscript {
2121
}
2222
dependencies {
2323
classpath 'com.android.tools.build:gradle:8.4.0'
24-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23"
24+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
25+
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0"
2526
}
2627
}
2728

‎AnimationCodelab/finished/build.gradle

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
plugins {
1818
id 'com.android.application'
1919
id 'kotlin-android'
20+
id 'org.jetbrains.kotlin.plugin.compose'
2021
}
2122

2223
android {
@@ -39,9 +40,6 @@ android {
3940
kotlinOptions {
4041
jvmTarget = '1.8'
4142
}
42-
composeOptions {
43-
kotlinCompilerExtensionVersion '1.5.13'
44-
}
4543
}
4644

4745
dependencies {

‎AnimationCodelab/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎AnimationCodelab/start/build.gradle

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
plugins {
1818
id 'com.android.application'
1919
id 'kotlin-android'
20+
id 'org.jetbrains.kotlin.plugin.compose'
2021
}
2122

2223
android {
@@ -39,9 +40,6 @@ android {
3940
kotlinOptions {
4041
jvmTarget = '1.8'
4142
}
42-
composeOptions {
43-
kotlinCompilerExtensionVersion '1.5.13'
44-
}
4543
}
4644

4745
dependencies {

‎BasicLayoutsCodelab/app/build.gradle

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
plugins {
1818
id 'com.android.application'
1919
id 'org.jetbrains.kotlin.android'
20+
id 'org.jetbrains.kotlin.plugin.compose'
2021
}
2122

2223
android {
@@ -52,9 +53,6 @@ android {
5253
buildFeatures {
5354
compose true
5455
}
55-
composeOptions {
56-
kotlinCompilerExtensionVersion '1.5.13'
57-
}
5856
packagingOptions {
5957
resources {
6058
excludes += '/META-INF/{AL2.0,LGPL2.1}'

‎BasicLayoutsCodelab/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ buildscript {
2121
}
2222
dependencies {
2323
classpath "com.android.tools.build:gradle:8.4.0"
24-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23"
24+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
25+
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0"
2526
}
2627
}
2728

‎BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎BasicStateCodelab/app/build.gradle.kts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
plugins {
1818
id("com.android.application")
1919
id("org.jetbrains.kotlin.android")
20+
id("org.jetbrains.kotlin.plugin.compose")
2021
}
2122

2223
android {
@@ -55,9 +56,6 @@ android {
5556
buildFeatures {
5657
compose = true
5758
}
58-
composeOptions {
59-
kotlinCompilerExtensionVersion = "1.5.13"
60-
}
6159
packaging {
6260
resources {
6361
excludes += "/META-INF/{AL2.0,LGPL2.1}"

‎BasicStateCodelab/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ buildscript {
2121

2222
dependencies {
2323
classpath 'com.android.tools.build:gradle:8.4.0'
24-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23"
24+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
25+
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0"
2526
}
2627
}
2728

‎BasicStateCodelab/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎BasicsCodelab/app/build.gradle.kts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
plugins {
1818
id("com.android.application")
1919
id("org.jetbrains.kotlin.android")
20+
id("org.jetbrains.kotlin.plugin.compose")
2021
}
2122

2223
android {
@@ -55,9 +56,6 @@ android {
5556
buildFeatures {
5657
compose = true
5758
}
58-
composeOptions {
59-
kotlinCompilerExtensionVersion = "1.5.13"
60-
}
6159
packaging {
6260
resources {
6361
excludes += "/META-INF/{AL2.0,LGPL2.1}"

‎BasicsCodelab/build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,6 @@
1717
// Top-level build file where you can add configuration options common to all sub-projects/modules.
1818
plugins {
1919
id("com.android.application") version "8.4.0" apply false
20-
id("org.jetbrains.kotlin.android") version "1.9.23" apply false
20+
id("org.jetbrains.kotlin.android") version "2.0.0" apply false
21+
id("org.jetbrains.kotlin.plugin.compose") version "2.0.0" apply false
2122
}

‎BasicsCodelab/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎MigrationCodelab/app/build.gradle

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ apply plugin: 'com.android.application'
1818
apply plugin: 'kotlin-android'
1919
apply plugin: 'kotlin-kapt'
2020
apply plugin: 'androidx.navigation.safeargs.kotlin'
21+
apply plugin: 'org.jetbrains.kotlin.plugin.compose'
22+
2123

2224
android {
2325
compileSdkVersion 34
@@ -49,9 +51,6 @@ android {
4951
dataBinding true
5052
compose true
5153
}
52-
composeOptions {
53-
kotlinCompilerExtensionVersion '1.5.13'
54-
}
5554
packagingOptions {
5655
// Multiple dependency bring these files in. Exclude them to enable
5756
// our test APK to build (has no effect on our AARs)
@@ -83,8 +82,8 @@ dependencies {
8382
implementation "com.github.bumptech.glide:glide:4.16.0"
8483
implementation "com.google.android.material:material:1.11.0"
8584
implementation "com.google.code.gson:gson:2.10.1"
86-
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0"
87-
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0"
85+
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1"
86+
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1"
8887

8988
// Compose
9089
implementation "androidx.compose.runtime:runtime"

‎MigrationCodelab/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@ buildscript {
2222

2323
dependencies {
2424
classpath "com.android.tools.build:gradle:8.4.0"
25-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23"
25+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
2626
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.7.7"
27+
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0"
2728
}
2829
}
2930

‎MigrationCodelab/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎NavigationCodelab/app/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
plugins {
1818
id 'com.android.application'
1919
id 'kotlin-android'
20+
id 'org.jetbrains.kotlin.plugin.compose'
2021
}
2122

2223
android {
@@ -69,7 +70,7 @@ android {
6970
}
7071

7172
composeOptions {
72-
kotlinCompilerExtensionVersion '1.5.13'
73+
kotlinCompilerExtensionVersion '1.5.14'
7374
}
7475

7576
packagingOptions {

‎NavigationCodelab/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ buildscript {
2222

2323
dependencies {
2424
classpath "com.android.tools.build:gradle:8.4.0"
25-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23"
25+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
26+
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0"
2627
}
2728
}
2829

‎NavigationCodelab/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)