From a4a659e9fc8dd1739d5116df4066211c5a3d793c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 11 Jan 2024 09:05:38 +0000 Subject: [PATCH 1/3] Update Kotlin Dependencies to v1.9.22 --- AccessibilityCodelab/build.gradle | 2 +- AdaptiveUICodelab/build.gradle | 2 +- AdvancedStateAndSideEffectsCodelab/build.gradle | 2 +- AnimationCodelab/build.gradle | 2 +- BasicLayoutsCodelab/build.gradle | 2 +- BasicStateCodelab/build.gradle | 2 +- BasicsCodelab/build.gradle.kts | 2 +- MigrationCodelab/build.gradle | 2 +- NavigationCodelab/build.gradle | 2 +- TestingCodelab/build.gradle | 2 +- ThemingCodelab/build.gradle | 2 +- ThemingCodelabM2/build.gradle | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/AccessibilityCodelab/build.gradle b/AccessibilityCodelab/build.gradle index 4b78e705a..d84331708 100644 --- a/AccessibilityCodelab/build.gradle +++ b/AccessibilityCodelab/build.gradle @@ -22,7 +22,7 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:8.2.1' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22" } } diff --git a/AdaptiveUICodelab/build.gradle b/AdaptiveUICodelab/build.gradle index a89d515b9..93a5b98f0 100644 --- a/AdaptiveUICodelab/build.gradle +++ b/AdaptiveUICodelab/build.gradle @@ -20,7 +20,7 @@ buildscript { } dependencies { classpath "com.android.tools.build:gradle:8.2.1" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22" } } diff --git a/AdvancedStateAndSideEffectsCodelab/build.gradle b/AdvancedStateAndSideEffectsCodelab/build.gradle index d1579082e..9359a02d0 100644 --- a/AdvancedStateAndSideEffectsCodelab/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/build.gradle @@ -21,7 +21,7 @@ buildscript { } dependencies { classpath "com.android.tools.build:gradle:8.2.1" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22" classpath "com.google.dagger:hilt-android-gradle-plugin:2.50" } } diff --git a/AnimationCodelab/build.gradle b/AnimationCodelab/build.gradle index 434e8b20b..57073b0b6 100644 --- a/AnimationCodelab/build.gradle +++ b/AnimationCodelab/build.gradle @@ -21,7 +21,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:8.2.1' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22" } } diff --git a/BasicLayoutsCodelab/build.gradle b/BasicLayoutsCodelab/build.gradle index 66a6cdc25..60941e05d 100644 --- a/BasicLayoutsCodelab/build.gradle +++ b/BasicLayoutsCodelab/build.gradle @@ -21,7 +21,7 @@ buildscript { } dependencies { classpath "com.android.tools.build:gradle:8.2.1" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22" } } diff --git a/BasicStateCodelab/build.gradle b/BasicStateCodelab/build.gradle index a421e2d7d..fc25c17fe 100644 --- a/BasicStateCodelab/build.gradle +++ b/BasicStateCodelab/build.gradle @@ -21,7 +21,7 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:8.2.1' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22" } } diff --git a/BasicsCodelab/build.gradle.kts b/BasicsCodelab/build.gradle.kts index dd9f9f17f..d8eb0027e 100644 --- a/BasicsCodelab/build.gradle.kts +++ b/BasicsCodelab/build.gradle.kts @@ -17,5 +17,5 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { id("com.android.application") version "8.2.1" apply false - id("org.jetbrains.kotlin.android") version "1.9.21" apply false + id("org.jetbrains.kotlin.android") version "1.9.22" apply false } diff --git a/MigrationCodelab/build.gradle b/MigrationCodelab/build.gradle index 7f3774f6b..b4325a247 100644 --- a/MigrationCodelab/build.gradle +++ b/MigrationCodelab/build.gradle @@ -22,7 +22,7 @@ buildscript { dependencies { classpath "com.android.tools.build:gradle:8.2.1" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22" classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.7.6" } } diff --git a/NavigationCodelab/build.gradle b/NavigationCodelab/build.gradle index 34a23caa2..3a3e0477c 100644 --- a/NavigationCodelab/build.gradle +++ b/NavigationCodelab/build.gradle @@ -22,7 +22,7 @@ buildscript { dependencies { classpath "com.android.tools.build:gradle:8.2.1" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22" } } diff --git a/TestingCodelab/build.gradle b/TestingCodelab/build.gradle index 65e6c0940..dec718b2c 100644 --- a/TestingCodelab/build.gradle +++ b/TestingCodelab/build.gradle @@ -22,7 +22,7 @@ buildscript { dependencies { classpath "com.android.tools.build:gradle:8.2.1" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22" } } diff --git a/ThemingCodelab/build.gradle b/ThemingCodelab/build.gradle index 81c205e20..93f159953 100644 --- a/ThemingCodelab/build.gradle +++ b/ThemingCodelab/build.gradle @@ -22,7 +22,7 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:8.2.1' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22" } } diff --git a/ThemingCodelabM2/build.gradle b/ThemingCodelabM2/build.gradle index 70824c26e..e440cb408 100644 --- a/ThemingCodelabM2/build.gradle +++ b/ThemingCodelabM2/build.gradle @@ -21,7 +21,7 @@ buildscript { } dependencies { classpath "com.android.tools.build:gradle:8.2.1" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22" } } From b0538b7e6118080039787295084256a6d601d6c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Mlynari=C4=8D?= Date: Thu, 11 Jan 2024 10:13:27 +0100 Subject: [PATCH 2/3] Update compose compiler --- AccessibilityCodelab/app/build.gradle | 2 +- AdaptiveUICodelab/app/build.gradle | 2 +- AdvancedStateAndSideEffectsCodelab/app/build.gradle | 2 +- BasicLayoutsCodelab/app/build.gradle | 2 +- MigrationCodelab/app/build.gradle | 2 +- NavigationCodelab/app/build.gradle | 2 +- TestingCodelab/app/build.gradle | 2 +- ThemingCodelab/app/build.gradle | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/AccessibilityCodelab/app/build.gradle b/AccessibilityCodelab/app/build.gradle index 1c1c479af..e44132af6 100644 --- a/AccessibilityCodelab/app/build.gradle +++ b/AccessibilityCodelab/app/build.gradle @@ -80,7 +80,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion '1.5.7' + kotlinCompilerExtensionVersion '1.5.8' } packagingOptions { diff --git a/AdaptiveUICodelab/app/build.gradle b/AdaptiveUICodelab/app/build.gradle index 2a304321b..67571cf3e 100644 --- a/AdaptiveUICodelab/app/build.gradle +++ b/AdaptiveUICodelab/app/build.gradle @@ -53,7 +53,7 @@ android { compose true } composeOptions { - kotlinCompilerExtensionVersion '1.5.7' + kotlinCompilerExtensionVersion '1.5.8' } packagingOptions { resources { diff --git a/AdvancedStateAndSideEffectsCodelab/app/build.gradle b/AdvancedStateAndSideEffectsCodelab/app/build.gradle index 6a198209f..84a009dad 100644 --- a/AdvancedStateAndSideEffectsCodelab/app/build.gradle +++ b/AdvancedStateAndSideEffectsCodelab/app/build.gradle @@ -84,7 +84,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion '1.5.7' + kotlinCompilerExtensionVersion '1.5.8' } packagingOptions { diff --git a/BasicLayoutsCodelab/app/build.gradle b/BasicLayoutsCodelab/app/build.gradle index 1a208140f..e04088d79 100644 --- a/BasicLayoutsCodelab/app/build.gradle +++ b/BasicLayoutsCodelab/app/build.gradle @@ -53,7 +53,7 @@ android { compose true } composeOptions { - kotlinCompilerExtensionVersion '1.5.7' + kotlinCompilerExtensionVersion '1.5.8' } packagingOptions { resources { diff --git a/MigrationCodelab/app/build.gradle b/MigrationCodelab/app/build.gradle index 50546ecc7..58a29de81 100644 --- a/MigrationCodelab/app/build.gradle +++ b/MigrationCodelab/app/build.gradle @@ -50,7 +50,7 @@ android { compose true } composeOptions { - kotlinCompilerExtensionVersion '1.5.7' + kotlinCompilerExtensionVersion '1.5.8' } packagingOptions { // Multiple dependency bring these files in. Exclude them to enable diff --git a/NavigationCodelab/app/build.gradle b/NavigationCodelab/app/build.gradle index 1b94e4b07..aed79e461 100644 --- a/NavigationCodelab/app/build.gradle +++ b/NavigationCodelab/app/build.gradle @@ -69,7 +69,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion '1.5.7' + kotlinCompilerExtensionVersion '1.5.8' } packagingOptions { diff --git a/TestingCodelab/app/build.gradle b/TestingCodelab/app/build.gradle index 17ce6f511..12890dc74 100644 --- a/TestingCodelab/app/build.gradle +++ b/TestingCodelab/app/build.gradle @@ -76,7 +76,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion '1.5.7' + kotlinCompilerExtensionVersion '1.5.8' } packagingOptions { diff --git a/ThemingCodelab/app/build.gradle b/ThemingCodelab/app/build.gradle index 48ce60930..8bec1e639 100644 --- a/ThemingCodelab/app/build.gradle +++ b/ThemingCodelab/app/build.gradle @@ -80,7 +80,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion '1.5.7' + kotlinCompilerExtensionVersion '1.5.8' } packagingOptions { From 6d9eb1db385918a8e1806cb021d88674b08ffad7 Mon Sep 17 00:00:00 2001 From: Ben Trengrove Date: Thu, 25 Jan 2024 08:19:20 +1100 Subject: [PATCH 3/3] Update compiler version --- AnimationCodelab/finished/build.gradle | 2 +- AnimationCodelab/start/build.gradle | 2 +- BasicStateCodelab/app/build.gradle.kts | 2 +- BasicsCodelab/app/build.gradle.kts | 2 +- ThemingCodelabM2/app/build.gradle | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/AnimationCodelab/finished/build.gradle b/AnimationCodelab/finished/build.gradle index 42e20fa44..06b100e0d 100644 --- a/AnimationCodelab/finished/build.gradle +++ b/AnimationCodelab/finished/build.gradle @@ -40,7 +40,7 @@ android { jvmTarget = '1.8' } composeOptions { - kotlinCompilerExtensionVersion '1.5.7' + kotlinCompilerExtensionVersion '1.5.8' } } diff --git a/AnimationCodelab/start/build.gradle b/AnimationCodelab/start/build.gradle index 42e20fa44..06b100e0d 100644 --- a/AnimationCodelab/start/build.gradle +++ b/AnimationCodelab/start/build.gradle @@ -40,7 +40,7 @@ android { jvmTarget = '1.8' } composeOptions { - kotlinCompilerExtensionVersion '1.5.7' + kotlinCompilerExtensionVersion '1.5.8' } } diff --git a/BasicStateCodelab/app/build.gradle.kts b/BasicStateCodelab/app/build.gradle.kts index 3bf30791e..10bbe88c4 100644 --- a/BasicStateCodelab/app/build.gradle.kts +++ b/BasicStateCodelab/app/build.gradle.kts @@ -56,7 +56,7 @@ android { compose = true } composeOptions { - kotlinCompilerExtensionVersion = "1.5.7" + kotlinCompilerExtensionVersion = "1.5.8" } packaging { resources { diff --git a/BasicsCodelab/app/build.gradle.kts b/BasicsCodelab/app/build.gradle.kts index b64b417d1..b465aa406 100644 --- a/BasicsCodelab/app/build.gradle.kts +++ b/BasicsCodelab/app/build.gradle.kts @@ -56,7 +56,7 @@ android { compose = true } composeOptions { - kotlinCompilerExtensionVersion = "1.5.7" + kotlinCompilerExtensionVersion = "1.5.8" } packaging { resources { diff --git a/ThemingCodelabM2/app/build.gradle b/ThemingCodelabM2/app/build.gradle index cf16fd752..621a55b08 100644 --- a/ThemingCodelabM2/app/build.gradle +++ b/ThemingCodelabM2/app/build.gradle @@ -41,7 +41,7 @@ android { compose true } composeOptions { - kotlinCompilerExtensionVersion '1.5.7' + kotlinCompilerExtensionVersion '1.5.8' } }