Skip to content

Commit 6603c7b

Browse files
authored
Merge pull request #427 from android/renovate/end-kotlin-dependencies
Update Kotlin Dependencies (end)
2 parents aa2f317 + e6c7036 commit 6603c7b

File tree

26 files changed

+44
-53
lines changed

26 files changed

+44
-53
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 {
@@ -62,10 +63,6 @@ android {
6263
compose true
6364
}
6465

65-
composeOptions {
66-
kotlinCompilerExtensionVersion '1.5.13'
67-
}
68-
6966
packagingOptions {
7067
excludes += "/META-INF/AL2.0"
7168
excludes += "/META-INF/LGPL2.1"
@@ -99,7 +96,7 @@ dependencies {
9996

10097
implementation "com.google.android.material:material:1.11.0"
10198

102-
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0"
99+
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1"
103100

104101
implementation 'androidx.appcompat:appcompat:1.6.1'
105102
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
implementation "androidx.compose.material3:material3-window-size-class:1.2.1"
8684

8785
testImplementation 'junit:junit:4.13.2'

AdaptiveUiCodelab/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

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 {
@@ -138,7 +135,7 @@ dependencies {
138135
androidTestImplementation "androidx.test:rules:1.5.0"
139136
androidTestImplementation "androidx.test.espresso:espresso-core:3.5.1"
140137
androidTestImplementation "androidx.test.ext:junit-ktx:1.1.5"
141-
androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.8.0"
138+
androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.8.1"
142139
androidTestImplementation "com.google.dagger:hilt-android:2.51.1"
143140
androidTestImplementation "com.google.dagger:hilt-android-testing:2.51.1"
144141
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

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
@@ -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

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

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

PerformanceCodelab/gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
coil = "2.6.0"
33
com-android-application = "8.3.2"
44
desugar_jdk_libs = "2.0.4"
5-
kotlinx-datetime = "0.5.0"
5+
kotlinx-datetime = "0.6.0"
66
lifecycle-viewmodel-compose = "2.7.0"
77
material-icons-core = "1.6.6"
88
media3 = "1.3.1"
9-
org-jetbrains-kotlin-android = "2.0.0-RC2"
9+
org-jetbrains-kotlin-android = "2.0.0"
1010
core-ktx = "1.13.0"
1111
junit = "4.13.2"
1212
androidx-test-ext-junit = "1.1.5"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Tue May 16 11:33:31 AEST 2023
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

TestingCodelab/app/build.gradle

Lines changed: 1 addition & 4 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 {
@@ -75,10 +76,6 @@ android {
7576
shaders false
7677
}
7778

78-
composeOptions {
79-
kotlinCompilerExtensionVersion rootProject.composeCompilerVersion
80-
}
81-
8279
packagingOptions {
8380
exclude "META-INF/licenses/**"
8481
exclude "META-INF/AL2.0"

TestingCodelab/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,12 @@ buildscript {
2525
// App dependencies
2626
appCompatVersion = '1.6.1'
2727
activityComposeVersion = '1.9.0'
28-
composeCompilerVersion = '1.5.13'
2928
coreTestingVersion = '2.2.0'
3029
coroutinesVersion = "1.5.2"
3130
espressoVersion = '3.5.1'
3231
fragmentVersion = '1.7.0'
3332
junitVersion = '4.13.1'
34-
kotlinVersion = '1.9.23'
33+
kotlinVersion = '2.0.0'
3534
ktlintVersion = '0.48.2'
3635
ktxVersion = '1.13.1'
3736
lifecycleVersion = '2.3.0'
@@ -51,6 +50,7 @@ buildscript {
5150
dependencies {
5251
classpath "com.android.tools.build:gradle:8.4.0"
5352
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
53+
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:$kotlinVersion"
5454
}
5555
}
5656

TestingCodelab/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

ThemingCodelab/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"
@@ -110,7 +107,7 @@ dependencies {
110107
androidTestImplementation "androidx.compose.ui:ui-test"
111108
androidTestImplementation "androidx.compose.ui:ui-test-junit4"
112109

113-
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0"
110+
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1"
114111

115112
implementation 'androidx.appcompat:appcompat:1.6.1'
116113
implementation 'androidx.activity:activity-ktx:1.9.0'

ThemingCodelab/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

ThemingCodelab/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)