diff --git a/AccessibilityCodelab/app/src/main/java/com/example/jetnews/ui/home/PostCards.kt b/AccessibilityCodelab/app/src/main/java/com/example/jetnews/ui/home/PostCards.kt index 8fe29a6b6..520d25ddd 100644 --- a/AccessibilityCodelab/app/src/main/java/com/example/jetnews/ui/home/PostCards.kt +++ b/AccessibilityCodelab/app/src/main/java/com/example/jetnews/ui/home/PostCards.kt @@ -202,10 +202,8 @@ fun PostCardPopular( Text( text = stringResource( id = R.string.home_post_min_read, - formatArgs = arrayOf( - post.metadata.date, - post.metadata.readTimeMinutes - ) + post.metadata.date, + post.metadata.readTimeMinutes ), style = MaterialTheme.typography.bodyMedium ) diff --git a/AccessibilityCodelab/build.gradle b/AccessibilityCodelab/build.gradle index 308698e10..a571b46b3 100644 --- a/AccessibilityCodelab/build.gradle +++ b/AccessibilityCodelab/build.gradle @@ -22,13 +22,13 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:8.13.2' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.21" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.0" } } plugins { id 'com.diffplug.spotless' version '8.1.0' - id 'org.jetbrains.kotlin.plugin.compose' version "2.2.21" apply false + id 'org.jetbrains.kotlin.plugin.compose' version "2.3.0" apply false } subprojects { diff --git a/AdaptiveUiCodelab/gradle/libs.versions.toml b/AdaptiveUiCodelab/gradle/libs.versions.toml index 342b1e281..d63169889 100644 --- a/AdaptiveUiCodelab/gradle/libs.versions.toml +++ b/AdaptiveUiCodelab/gradle/libs.versions.toml @@ -6,7 +6,7 @@ activityCompose = "1.12.2" espressoCore = "3.7.0" junit = "4.13.2" junitVersion = "1.3.0" -kotlin = "2.2.21" +kotlin = "2.3.0" kotlinxCoroutinesAndroid = "1.10.2" lifecycle = "2.10.0" material3Adaptive = "1.2.0" diff --git a/AdvancedStateAndSideEffectsCodelab/app/build.gradle b/AdvancedStateAndSideEffectsCodelab/app/build.gradle index c0ce921a2..dbccc20c0 100644 --- a/AdvancedStateAndSideEffectsCodelab/app/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/app/build.gradle @@ -127,6 +127,7 @@ dependencies { implementation "androidx.lifecycle:lifecycle-runtime-compose:$lifecycle_version" implementation "com.google.dagger:hilt-android:2.57.2" kapt "com.google.dagger:hilt-compiler:2.57.2" + kapt "org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.9.0" implementation "io.coil-kt:coil-compose:2.7.0" @@ -140,4 +141,5 @@ dependencies { androidTestImplementation "com.google.dagger:hilt-android:2.57.2" androidTestImplementation "com.google.dagger:hilt-android-testing:2.57.2" kaptAndroidTest "com.google.dagger:hilt-compiler:2.57.2" + kaptAndroidTest "org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.9.0" } diff --git a/AdvancedStateAndSideEffectsCodelab/build.gradle b/AdvancedStateAndSideEffectsCodelab/build.gradle index 169287e21..6352cf302 100644 --- a/AdvancedStateAndSideEffectsCodelab/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/build.gradle @@ -21,9 +21,9 @@ buildscript { } dependencies { classpath "com.android.tools.build:gradle:8.13.2" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.21" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.0" classpath "com.google.dagger:hilt-android-gradle-plugin:2.57.2" - classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.2.21" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.2.0" } } diff --git a/BasicLayoutsCodelab/build.gradle b/BasicLayoutsCodelab/build.gradle index 852fa9566..efbb18cc0 100644 --- a/BasicLayoutsCodelab/build.gradle +++ b/BasicLayoutsCodelab/build.gradle @@ -20,8 +20,8 @@ buildscript { } dependencies { classpath "com.android.tools.build:gradle:8.13.2" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.21" - classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.2.21" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.0" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.0" } } diff --git a/MigrationCodelab/build.gradle b/MigrationCodelab/build.gradle index ebdab402a..9347e7fc3 100644 --- a/MigrationCodelab/build.gradle +++ b/MigrationCodelab/build.gradle @@ -22,9 +22,9 @@ buildscript { dependencies { classpath "com.android.tools.build:gradle:8.13.2" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.21" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.0" classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.9.6" - classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.2.21" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.0" } } diff --git a/NavigationCodelab/build.gradle b/NavigationCodelab/build.gradle index 30e32b711..40948b4da 100644 --- a/NavigationCodelab/build.gradle +++ b/NavigationCodelab/build.gradle @@ -22,8 +22,8 @@ buildscript { dependencies { classpath "com.android.tools.build:gradle:8.13.2" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.21" - classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.2.21" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.0" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.0" } } diff --git a/PerformanceCodelab/gradle/libs.versions.toml b/PerformanceCodelab/gradle/libs.versions.toml index f9753e2d4..cfaae3c55 100644 --- a/PerformanceCodelab/gradle/libs.versions.toml +++ b/PerformanceCodelab/gradle/libs.versions.toml @@ -6,7 +6,7 @@ kotlinx-datetime = "0.7.1-0.6.x-compat" lifecycle-viewmodel-compose = "2.10.0" material-icons-core = "1.7.8" media3 = "1.9.0" -org-jetbrains-kotlin-android = "2.2.21" +org-jetbrains-kotlin-android = "2.3.0" core-ktx = "1.17.0" junit = "4.13.2" androidx-test-ext-junit = "1.3.0" diff --git a/TestingCodelab/build.gradle b/TestingCodelab/build.gradle index 9b9b365dd..74dbf64a1 100644 --- a/TestingCodelab/build.gradle +++ b/TestingCodelab/build.gradle @@ -30,7 +30,7 @@ buildscript { espressoVersion = '3.7.0' fragmentVersion = '1.8.9' junitVersion = '4.13.1' - kotlinVersion = '2.2.21' + kotlinVersion = '2.3.0' ktlintVersion = '0.48.2' ktxVersion = '1.17.0' lifecycleVersion = '2.3.0' diff --git a/ThemingCodelab/build.gradle b/ThemingCodelab/build.gradle index 3935f6c6f..d6f19d436 100644 --- a/ThemingCodelab/build.gradle +++ b/ThemingCodelab/build.gradle @@ -22,8 +22,8 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:8.13.2' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.21" - classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.2.21" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.0" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.3.0" } }