diff --git a/AccessibilityCodelab/app/build.gradle b/AccessibilityCodelab/app/build.gradle index 6fceaadcb..70f35ad55 100644 --- a/AccessibilityCodelab/app/build.gradle +++ b/AccessibilityCodelab/app/build.gradle @@ -17,6 +17,7 @@ plugins { id 'com.android.application' id 'kotlin-android' + id 'org.jetbrains.kotlin.plugin.compose' } android { @@ -62,10 +63,6 @@ android { compose true } - composeOptions { - kotlinCompilerExtensionVersion '1.5.13' - } - packagingOptions { excludes += "/META-INF/AL2.0" excludes += "/META-INF/LGPL2.1" @@ -99,7 +96,7 @@ dependencies { implementation "com.google.android.material:material:1.11.0" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1" implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.activity:activity-ktx:1.9.0' diff --git a/AccessibilityCodelab/build.gradle b/AccessibilityCodelab/build.gradle index 5ea0dc4c2..c440d7d8c 100644 --- a/AccessibilityCodelab/build.gradle +++ b/AccessibilityCodelab/build.gradle @@ -22,12 +22,13 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:8.4.0' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0" } } plugins { id 'com.diffplug.spotless' version '6.25.0' + id 'org.jetbrains.kotlin.plugin.compose' version "2.0.0" apply false } subprojects { diff --git a/AccessibilityCodelab/gradle/wrapper/gradle-wrapper.properties b/AccessibilityCodelab/gradle/wrapper/gradle-wrapper.properties index a80b22ce5..a4413138c 100644 --- a/AccessibilityCodelab/gradle/wrapper/gradle-wrapper.properties +++ b/AccessibilityCodelab/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/AdaptiveUiCodelab/app/build.gradle b/AdaptiveUiCodelab/app/build.gradle index 04e57c1b6..8eafbd244 100644 --- a/AdaptiveUiCodelab/app/build.gradle +++ b/AdaptiveUiCodelab/app/build.gradle @@ -17,6 +17,7 @@ plugins { id 'com.android.application' id 'org.jetbrains.kotlin.android' + id 'org.jetbrains.kotlin.plugin.compose' } android { @@ -52,9 +53,6 @@ android { buildFeatures { compose true } - composeOptions { - kotlinCompilerExtensionVersion '1.5.13' - } packagingOptions { resources { excludes += '/META-INF/{AL2.0,LGPL2.1}' @@ -81,7 +79,7 @@ dependencies { implementation 'androidx.activity:activity-compose:1.9.0' implementation 'androidx.core:core-ktx:1.13.1' implementation "androidx.window:window:1.2.0" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1" implementation "androidx.compose.material3:material3-window-size-class:1.2.1" testImplementation 'junit:junit:4.13.2' diff --git a/AdaptiveUiCodelab/build.gradle b/AdaptiveUiCodelab/build.gradle index e89535a96..3ae3df02b 100644 --- a/AdaptiveUiCodelab/build.gradle +++ b/AdaptiveUiCodelab/build.gradle @@ -21,7 +21,8 @@ buildscript { } dependencies { classpath "com.android.tools.build:gradle:8.4.0" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0" } } diff --git a/AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.properties b/AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.properties index a80b22ce5..a4413138c 100644 --- a/AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.properties +++ b/AdaptiveUiCodelab/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/AdvancedStateAndSideEffectsCodelab/app/build.gradle b/AdvancedStateAndSideEffectsCodelab/app/build.gradle index 00f6e41ec..be275d55d 100644 --- a/AdvancedStateAndSideEffectsCodelab/app/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/app/build.gradle @@ -19,6 +19,7 @@ plugins { id 'kotlin-android' id 'kotlin-kapt' id 'dagger.hilt.android.plugin' + id 'org.jetbrains.kotlin.plugin.compose' } // Reads the Google maps key that is used in the AndroidManifest @@ -83,10 +84,6 @@ android { shaders false } - composeOptions { - kotlinCompilerExtensionVersion '1.5.13' - } - packagingOptions { // Multiple dependency bring these files in. Exclude them to enable // our test APK to build (has no effect on our AARs) @@ -96,7 +93,7 @@ android { } dependencies { - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1" implementation "com.google.android.libraries.maps:maps:3.1.0-beta" implementation "com.google.maps.android:maps-v3-ktx:3.4.0" constraints { @@ -138,7 +135,7 @@ dependencies { androidTestImplementation "androidx.test:rules:1.5.0" androidTestImplementation "androidx.test.espresso:espresso-core:3.5.1" androidTestImplementation "androidx.test.ext:junit-ktx:1.1.5" - androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.8.0" + androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.8.1" androidTestImplementation "com.google.dagger:hilt-android:2.51.1" androidTestImplementation "com.google.dagger:hilt-android-testing:2.51.1" kaptAndroidTest "com.google.dagger:hilt-compiler:2.51.1" diff --git a/AdvancedStateAndSideEffectsCodelab/build.gradle b/AdvancedStateAndSideEffectsCodelab/build.gradle index 7f99d5437..36e3f8371 100644 --- a/AdvancedStateAndSideEffectsCodelab/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/build.gradle @@ -21,8 +21,9 @@ buildscript { } dependencies { classpath "com.android.tools.build:gradle:8.4.0" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0" classpath "com.google.dagger:hilt-android-gradle-plugin:2.51.1" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0" } } diff --git a/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.properties b/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.properties index a80b22ce5..a4413138c 100644 --- a/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.properties +++ b/AdvancedStateAndSideEffectsCodelab/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/BasicLayoutsCodelab/app/build.gradle b/BasicLayoutsCodelab/app/build.gradle index ff82ee316..c7e509733 100644 --- a/BasicLayoutsCodelab/app/build.gradle +++ b/BasicLayoutsCodelab/app/build.gradle @@ -17,6 +17,7 @@ plugins { id 'com.android.application' id 'org.jetbrains.kotlin.android' + id 'org.jetbrains.kotlin.plugin.compose' } android { @@ -52,9 +53,6 @@ android { buildFeatures { compose true } - composeOptions { - kotlinCompilerExtensionVersion '1.5.13' - } packagingOptions { resources { excludes += '/META-INF/{AL2.0,LGPL2.1}' diff --git a/BasicLayoutsCodelab/build.gradle b/BasicLayoutsCodelab/build.gradle index de991fe92..73922b2a2 100644 --- a/BasicLayoutsCodelab/build.gradle +++ b/BasicLayoutsCodelab/build.gradle @@ -20,7 +20,8 @@ buildscript { } dependencies { classpath "com.android.tools.build:gradle:8.4.0" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0" } } diff --git a/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.properties b/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.properties index a80b22ce5..a4413138c 100644 --- a/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.properties +++ b/BasicLayoutsCodelab/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/MigrationCodelab/app/build.gradle b/MigrationCodelab/app/build.gradle index e6d5ef9c0..ae32d3fa3 100644 --- a/MigrationCodelab/app/build.gradle +++ b/MigrationCodelab/app/build.gradle @@ -18,6 +18,8 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' apply plugin: 'kotlin-kapt' apply plugin: 'androidx.navigation.safeargs.kotlin' +apply plugin: 'org.jetbrains.kotlin.plugin.compose' + android { compileSdkVersion 34 @@ -49,9 +51,6 @@ android { dataBinding true compose true } - composeOptions { - kotlinCompilerExtensionVersion '1.5.13' - } packagingOptions { // Multiple dependency bring these files in. Exclude them to enable // our test APK to build (has no effect on our AARs) @@ -83,8 +82,8 @@ dependencies { implementation "com.github.bumptech.glide:glide:4.16.0" implementation "com.google.android.material:material:1.11.0" implementation "com.google.code.gson:gson:2.10.1" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1" // Compose implementation "androidx.compose.runtime:runtime" diff --git a/MigrationCodelab/build.gradle b/MigrationCodelab/build.gradle index b0fe6821d..bf8bc62d8 100644 --- a/MigrationCodelab/build.gradle +++ b/MigrationCodelab/build.gradle @@ -22,8 +22,9 @@ buildscript { dependencies { classpath "com.android.tools.build:gradle:8.4.0" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0" classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.7.7" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0" } } diff --git a/MigrationCodelab/gradle/wrapper/gradle-wrapper.properties b/MigrationCodelab/gradle/wrapper/gradle-wrapper.properties index a80b22ce5..a4413138c 100644 --- a/MigrationCodelab/gradle/wrapper/gradle-wrapper.properties +++ b/MigrationCodelab/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/NavigationCodelab/app/build.gradle b/NavigationCodelab/app/build.gradle index 1b3515b27..b53362bd0 100644 --- a/NavigationCodelab/app/build.gradle +++ b/NavigationCodelab/app/build.gradle @@ -17,6 +17,7 @@ plugins { id 'com.android.application' id 'kotlin-android' + id 'org.jetbrains.kotlin.plugin.compose' } android { @@ -69,7 +70,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion '1.5.13' + kotlinCompilerExtensionVersion '1.5.14' } packagingOptions { diff --git a/NavigationCodelab/build.gradle b/NavigationCodelab/build.gradle index 3448112a2..af5e2a1fe 100644 --- a/NavigationCodelab/build.gradle +++ b/NavigationCodelab/build.gradle @@ -22,7 +22,8 @@ buildscript { dependencies { classpath "com.android.tools.build:gradle:8.4.0" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0" } } diff --git a/NavigationCodelab/gradle/wrapper/gradle-wrapper.properties b/NavigationCodelab/gradle/wrapper/gradle-wrapper.properties index a80b22ce5..a4413138c 100644 --- a/NavigationCodelab/gradle/wrapper/gradle-wrapper.properties +++ b/NavigationCodelab/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/PerformanceCodelab/gradle/libs.versions.toml b/PerformanceCodelab/gradle/libs.versions.toml index a8d4cacd4..14e7f497e 100644 --- a/PerformanceCodelab/gradle/libs.versions.toml +++ b/PerformanceCodelab/gradle/libs.versions.toml @@ -2,11 +2,11 @@ coil = "2.6.0" com-android-application = "8.3.2" desugar_jdk_libs = "2.0.4" -kotlinx-datetime = "0.5.0" +kotlinx-datetime = "0.6.0" lifecycle-viewmodel-compose = "2.7.0" material-icons-core = "1.6.6" media3 = "1.3.1" -org-jetbrains-kotlin-android = "2.0.0-RC2" +org-jetbrains-kotlin-android = "2.0.0" core-ktx = "1.13.0" junit = "4.13.2" androidx-test-ext-junit = "1.1.5" diff --git a/PerformanceCodelab/gradle/wrapper/gradle-wrapper.properties b/PerformanceCodelab/gradle/wrapper/gradle-wrapper.properties index b9d06574c..850939b4e 100644 --- a/PerformanceCodelab/gradle/wrapper/gradle-wrapper.properties +++ b/PerformanceCodelab/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Tue May 16 11:33:31 AEST 2023 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/TestingCodelab/app/build.gradle b/TestingCodelab/app/build.gradle index d69ac3ccc..28f6d55e8 100644 --- a/TestingCodelab/app/build.gradle +++ b/TestingCodelab/app/build.gradle @@ -17,6 +17,7 @@ plugins { id 'com.android.application' id 'kotlin-android' + id 'org.jetbrains.kotlin.plugin.compose' } android { @@ -75,10 +76,6 @@ android { shaders false } - composeOptions { - kotlinCompilerExtensionVersion rootProject.composeCompilerVersion - } - packagingOptions { exclude "META-INF/licenses/**" exclude "META-INF/AL2.0" diff --git a/TestingCodelab/build.gradle b/TestingCodelab/build.gradle index 18987087a..b5572b7c3 100644 --- a/TestingCodelab/build.gradle +++ b/TestingCodelab/build.gradle @@ -25,13 +25,12 @@ buildscript { // App dependencies appCompatVersion = '1.6.1' activityComposeVersion = '1.9.0' - composeCompilerVersion = '1.5.13' coreTestingVersion = '2.2.0' coroutinesVersion = "1.5.2" espressoVersion = '3.5.1' fragmentVersion = '1.7.0' junitVersion = '4.13.1' - kotlinVersion = '1.9.23' + kotlinVersion = '2.0.0' ktlintVersion = '0.48.2' ktxVersion = '1.13.1' lifecycleVersion = '2.3.0' @@ -51,6 +50,7 @@ buildscript { dependencies { classpath "com.android.tools.build:gradle:8.4.0" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:$kotlinVersion" } } diff --git a/TestingCodelab/gradle/wrapper/gradle-wrapper.properties b/TestingCodelab/gradle/wrapper/gradle-wrapper.properties index a80b22ce5..a4413138c 100644 --- a/TestingCodelab/gradle/wrapper/gradle-wrapper.properties +++ b/TestingCodelab/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/ThemingCodelab/app/build.gradle b/ThemingCodelab/app/build.gradle index 2a6793d24..9f4f598f2 100644 --- a/ThemingCodelab/app/build.gradle +++ b/ThemingCodelab/app/build.gradle @@ -17,6 +17,7 @@ plugins { id 'com.android.application' id 'kotlin-android' + id 'org.jetbrains.kotlin.plugin.compose' } android { @@ -79,10 +80,6 @@ android { compose true } - composeOptions { - kotlinCompilerExtensionVersion '1.5.13' - } - packagingOptions { excludes += "/META-INF/AL2.0" excludes += "/META-INF/LGPL2.1" @@ -110,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.0" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1" implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.activity:activity-ktx:1.9.0' diff --git a/ThemingCodelab/build.gradle b/ThemingCodelab/build.gradle index e634673ec..68b7d4a94 100644 --- a/ThemingCodelab/build.gradle +++ b/ThemingCodelab/build.gradle @@ -22,7 +22,8 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:8.4.0' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0" + classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0" } } diff --git a/ThemingCodelab/gradle/wrapper/gradle-wrapper.properties b/ThemingCodelab/gradle/wrapper/gradle-wrapper.properties index a80b22ce5..a4413138c 100644 --- a/ThemingCodelab/gradle/wrapper/gradle-wrapper.properties +++ b/ThemingCodelab/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME