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

Jump to bottom

Update Kotlin Dependencies (end) #490

Open
wants to merge 1 commit into
base: end
Choose a base branch
from
Open

Update Kotlin Dependencies (end) #490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion AccessibilityCodelab/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,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.2'
Expand Down
4 changes: 2 additions & 2 deletions AccessibilityCodelab/build.gradle
View file
Open in desktop
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.6.1'
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ activityCompose = "1.9.2"
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.6"
material3Adaptive = "1.0.0"
material3AdaptiveNavSuite = "1.3.0"
Expand Down
4 changes: 2 additions & 2 deletions AdvancedStateAndSideEffectsCodelab/app/build.gradle
View file
Open in desktop
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 @@ -136,7 +136,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
4 changes: 2 additions & 2 deletions AdvancedStateAndSideEffectsCodelab/build.gradle
View file
Open in desktop
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.6.1"
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 BasicLayoutsCodelab/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ buildscript {
}
dependencies {
classpath "com.android.tools.build:gradle:8.6.1"
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 MigrationCodelab/app/build.gradle
View file
Open in desktop
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
View file
Open in desktop
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.6.1"
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.1"
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
View file
Open in desktop
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.6.1"
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
View file
Open in desktop
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.6"
material-icons-core = "1.7.2"
media3 = "1.4.1"
org-jetbrains-kotlin-android = "2.0.20"
org-jetbrains-kotlin-android = "2.0.21"
core-ktx = "1.13.1"
junit = "4.13.2"
androidx-test-ext-junit = "1.2.1"
Expand Down
2 changes: 1 addition & 1 deletion TestingCodelab/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ buildscript {
espressoVersion = '3.6.1'
fragmentVersion = '1.8.3'
junitVersion = '4.13.1'
kotlinVersion = '2.0.20'
kotlinVersion = '2.0.21'
ktlintVersion = '0.48.2'
ktxVersion = '1.13.1'
lifecycleVersion = '2.3.0'
Expand Down
2 changes: 1 addition & 1 deletion ThemingCodelab/app/build.gradle
View file
Open in desktop
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.2'
Expand Down
4 changes: 2 additions & 2 deletions ThemingCodelab/build.gradle
View file
Open in desktop
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.6.1'
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
Loading