Merge branch 'main' into renovate/main-all

android · Sep 5, 2024 · 90b742a · 90b742a
2 parents e42cb38 + 20410d8
commit 90b742a
Show file tree

Hide file tree

Showing 14 changed files with 25 additions and 25 deletions.
diff --git a/AccessibilityCodelab/build.gradle b/AccessibilityCodelab/build.gradle
@@ -22,13 +22,13 @@ buildscript {
 
     dependencies {
         classpath 'com.android.tools.build:gradle:8.6.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20"
     }
 }
 
 plugins {
     id 'com.diffplug.spotless' version '6.25.0'
-    id 'org.jetbrains.kotlin.plugin.compose' version "2.0.0" apply false
+    id 'org.jetbrains.kotlin.plugin.compose' version "2.0.20" apply false
 }
 
 subprojects {

diff --git a/AdaptiveUiCodelab/gradle/libs.versions.toml b/AdaptiveUiCodelab/gradle/libs.versions.toml
@@ -6,7 +6,7 @@ activityCompose = "1.9.2"
 espressoCore = "3.6.1"
 junit = "4.13.2"
 junitVersion = "1.2.1"
-kotlin = "2.0.0"
+kotlin = "2.0.20"
 kotlinxCoroutinesAndroid = "1.8.1"
 lifecycle = "2.8.5"
 window = "1.3.0"

diff --git a/AdvancedStateAndSideEffectsCodelab/build.gradle b/AdvancedStateAndSideEffectsCodelab/build.gradle
@@ -21,9 +21,9 @@ buildscript {
     }
     dependencies {
         classpath "com.android.tools.build:gradle:8.6.0"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20"
         classpath "com.google.dagger:hilt-android-gradle-plugin:2.52"
-        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0"
+        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20"
     }
 }
 

diff --git a/AnimationCodelab/build.gradle b/AnimationCodelab/build.gradle
@@ -21,8 +21,8 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:8.6.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
-        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20"
+        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20"
     }
 }
 

diff --git a/BasicLayoutsCodelab/build.gradle b/BasicLayoutsCodelab/build.gradle
@@ -21,8 +21,8 @@ buildscript {
     }
     dependencies {
         classpath "com.android.tools.build:gradle:8.6.0"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
-        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20"
+        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20"
     }
 }
 

diff --git a/BasicStateCodelab/build.gradle b/BasicStateCodelab/build.gradle
@@ -21,8 +21,8 @@ buildscript {
 
     dependencies {
         classpath 'com.android.tools.build:gradle:8.6.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
-        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20"
+        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20"
     }
 }
 

diff --git a/BasicsCodelab/build.gradle.kts b/BasicsCodelab/build.gradle.kts
@@ -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.6.0" apply false
-    id("org.jetbrains.kotlin.android") version "2.0.0" apply false
-    id("org.jetbrains.kotlin.plugin.compose") version "2.0.0" 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
 }
diff --git a/MigrationCodelab/build.gradle b/MigrationCodelab/build.gradle
@@ -22,9 +22,9 @@ buildscript {
 
     dependencies {
         classpath "com.android.tools.build:gradle:8.6.0"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20"
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.8.0"
-        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0"
+        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20"
     }
 }
 

diff --git a/NavigationCodelab/app/build.gradle b/NavigationCodelab/app/build.gradle
@@ -70,7 +70,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion '1.5.14'
+        kotlinCompilerExtensionVersion '1.5.15'
     }
 
     packagingOptions {

diff --git a/NavigationCodelab/build.gradle b/NavigationCodelab/build.gradle
@@ -22,8 +22,8 @@ buildscript {
 
     dependencies {
         classpath "com.android.tools.build:gradle:8.6.0"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
-        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20"
+        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20"
     }
 }
 

diff --git a/PerformanceCodelab/gradle/libs.versions.toml b/PerformanceCodelab/gradle/libs.versions.toml
@@ -6,7 +6,7 @@ kotlinx-datetime = "0.6.0"
 lifecycle-viewmodel-compose = "2.8.5"
 material-icons-core = "1.7.0"
 media3 = "1.4.1"
-org-jetbrains-kotlin-android = "2.0.0"
+org-jetbrains-kotlin-android = "2.0.20"
 core-ktx = "1.13.1"
 junit = "4.13.2"
 androidx-test-ext-junit = "1.2.1"

diff --git a/TestingCodelab/build.gradle b/TestingCodelab/build.gradle
@@ -22,8 +22,8 @@ buildscript {
 
     dependencies {
         classpath "com.android.tools.build:gradle:8.6.0"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
-        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20"
+        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20"
     }
 }
 

diff --git a/ThemingCodelab/build.gradle b/ThemingCodelab/build.gradle
@@ -22,8 +22,8 @@ buildscript {
 
     dependencies {
         classpath 'com.android.tools.build:gradle:8.6.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
-        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20"
+        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20"
     }
 }
 

diff --git a/ThemingCodelabM2/build.gradle b/ThemingCodelabM2/build.gradle
@@ -21,8 +21,8 @@ buildscript {
     }
     dependencies {
         classpath "com.android.tools.build:gradle:8.6.0"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"
-        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.0"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20"
+        classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20"
     }
 }