Skip to content

Commit

Permalink
Update Kotlin Dependencies (main) (#489)
Browse files Browse the repository at this point in the history
* Update Kotlin Dependencies

* Update Kotlin Dependencies

* Remove unused test rule that was giving deprecation error

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Jolanda Verhoef <[email protected]>
  • Loading branch information
renovate[bot] and JolandaVerhoef authored Nov 7, 2024
1 parent 4f52b42 commit 7673bc7
Show file tree
Hide file tree
Showing 18 changed files with 31 additions and 73 deletions.
2 changes: 1 addition & 1 deletion AccessibilityCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ dependencies {
implementation "com.google.accompanist:accompanist-swiperefresh:$accompanist_version"
implementation "com.google.accompanist:accompanist-systemuicontroller:$accompanist_version"

implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0"

implementation 'androidx.appcompat:appcompat:1.7.0'
implementation 'androidx.activity:activity-ktx:1.9.3'
Expand Down
4 changes: 2 additions & 2 deletions AccessibilityCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ buildscript {

dependencies {
classpath 'com.android.tools.build:gradle:8.7.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21"
}
}

plugins {
id 'com.diffplug.spotless' version '6.25.0'
id 'org.jetbrains.kotlin.plugin.compose' version "2.0.20" apply false
id 'org.jetbrains.kotlin.plugin.compose' version "2.0.21" apply false
}

subprojects {
Expand Down
4 changes: 2 additions & 2 deletions AdaptiveUiCodelab/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ activityCompose = "1.9.3"
espressoCore = "3.6.1"
junit = "4.13.2"
junitVersion = "1.2.1"
kotlin = "2.0.20"
kotlinxCoroutinesAndroid = "1.8.1"
kotlin = "2.0.21"
kotlinxCoroutinesAndroid = "1.9.0"
lifecycle = "2.8.7"
window = "1.3.0"

Expand Down
4 changes: 2 additions & 2 deletions AdvancedStateAndSideEffectsCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ android {
}

dependencies {
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0"
implementation "com.google.android.libraries.maps:maps:3.1.0-beta"
implementation "com.google.maps.android:maps-v3-ktx:3.4.0"
constraints {
Expand Down Expand Up @@ -134,7 +134,7 @@ dependencies {
androidTestImplementation "androidx.test:rules:1.6.1"
androidTestImplementation "androidx.test.espresso:espresso-core:3.6.1"
androidTestImplementation "androidx.test.ext:junit-ktx:1.2.1"
androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.8.1"
androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0"
androidTestImplementation "com.google.dagger:hilt-android:2.52"
androidTestImplementation "com.google.dagger:hilt-android-testing:2.52"
kaptAndroidTest "com.google.dagger:hilt-compiler:2.52"
Expand Down

This file was deleted.

4 changes: 2 additions & 2 deletions AdvancedStateAndSideEffectsCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ buildscript {
}
dependencies {
classpath "com.android.tools.build:gradle:8.7.2"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21"
classpath "com.google.dagger:hilt-android-gradle-plugin:2.52"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21"
}
}

Expand Down
4 changes: 2 additions & 2 deletions AnimationCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:8.7.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21"
}
}

Expand Down
4 changes: 2 additions & 2 deletions BasicLayoutsCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ buildscript {
}
dependencies {
classpath "com.android.tools.build:gradle:8.7.2"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21"
}
}

Expand Down
4 changes: 2 additions & 2 deletions BasicStateCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ buildscript {

dependencies {
classpath 'com.android.tools.build:gradle:8.7.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21"
}
}

Expand Down
4 changes: 2 additions & 2 deletions BasicsCodelab/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
id("com.android.application") version "8.7.2" apply false
id("org.jetbrains.kotlin.android") version "2.0.20" apply false
id("org.jetbrains.kotlin.plugin.compose") version "2.0.20" apply false
id("org.jetbrains.kotlin.android") version "2.0.21" apply false
id("org.jetbrains.kotlin.plugin.compose") version "2.0.21" apply false
}
4 changes: 2 additions & 2 deletions MigrationCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ dependencies {
implementation "com.github.bumptech.glide:glide:4.16.0"
implementation "com.google.android.material:material:1.12.0"
implementation "com.google.code.gson:gson:2.11.0"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0"

// Compose
implementation "androidx.compose.runtime:runtime"
Expand Down
4 changes: 2 additions & 2 deletions MigrationCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ buildscript {

dependencies {
classpath "com.android.tools.build:gradle:8.7.2"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.8.3"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21"
}
}

Expand Down
4 changes: 2 additions & 2 deletions NavigationCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ buildscript {

dependencies {
classpath "com.android.tools.build:gradle:8.7.2"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21"
}
}

Expand Down
2 changes: 1 addition & 1 deletion PerformanceCodelab/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ kotlinx-datetime = "0.6.1"
lifecycle-viewmodel-compose = "2.8.7"
material-icons-core = "1.7.5"
media3 = "1.4.1"
org-jetbrains-kotlin-android = "2.0.20"
org-jetbrains-kotlin-android = "2.0.21"
core-ktx = "1.15.0"
junit = "4.13.2"
androidx-test-ext-junit = "1.2.1"
Expand Down
4 changes: 2 additions & 2 deletions TestingCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ buildscript {

dependencies {
classpath "com.android.tools.build:gradle:8.7.2"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21"
}
}

Expand Down
2 changes: 1 addition & 1 deletion ThemingCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ dependencies {
androidTestImplementation "androidx.compose.ui:ui-test"
androidTestImplementation "androidx.compose.ui:ui-test-junit4"

implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0"

implementation 'androidx.appcompat:appcompat:1.7.0'
implementation 'androidx.activity:activity-ktx:1.9.3'
Expand Down
4 changes: 2 additions & 2 deletions ThemingCodelab/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ buildscript {

dependencies {
classpath 'com.android.tools.build:gradle:8.7.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21"
}
}

Expand Down
4 changes: 2 additions & 2 deletions ThemingCodelabM2/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ buildscript {
}
dependencies {
classpath "com.android.tools.build:gradle:8.7.2"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21"
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21"
}
}

Expand Down

0 comments on commit 7673bc7

Please sign in to comment.