From 274cf6d9568ee1d3c534f673bfae48d5c458f084 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 3 Dec 2024 14:03:39 +0000 Subject: [PATCH 1/4] Update kotlin --- ui/PreviewScreenshot/app/build.gradle.kts | 2 +- ui/PreviewScreenshot/gradle/libs.versions.toml | 2 +- ui/espresso/AccessibilitySample/build.gradle | 2 +- ui/espresso/BasicSample/build.gradle | 2 +- ui/espresso/EspressoDeviceSample/build.gradle | 2 +- ui/espresso/FragmentScenarioSample/build.gradle | 2 +- ui/espresso/ScreenshotSample/build.gradle | 2 +- unit/BasicNativeAndroidTest/build.gradle | 2 +- unit/BasicSample-kotlinApp/build.gradle | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ui/PreviewScreenshot/app/build.gradle.kts b/ui/PreviewScreenshot/app/build.gradle.kts index 32497ca2..077cfcfe 100644 --- a/ui/PreviewScreenshot/app/build.gradle.kts +++ b/ui/PreviewScreenshot/app/build.gradle.kts @@ -57,7 +57,7 @@ android { compose = true } composeOptions { - kotlinCompilerExtensionVersion = "1.5.13" + kotlinCompilerExtensionVersion = "1.5.15" } experimentalProperties["android.experimental.enableScreenshotTest"] = true diff --git a/ui/PreviewScreenshot/gradle/libs.versions.toml b/ui/PreviewScreenshot/gradle/libs.versions.toml index c6b55a64..89aabc0b 100644 --- a/ui/PreviewScreenshot/gradle/libs.versions.toml +++ b/ui/PreviewScreenshot/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] agp = "8.5.0-beta01" -kotlin = "1.9.23" +kotlin = "2.1.0" coreKtx = "1.13.1" junit = "4.13.2" junitVersion = "1.1.5" diff --git a/ui/espresso/AccessibilitySample/build.gradle b/ui/espresso/AccessibilitySample/build.gradle index 7d67bb02..8f90f32c 100644 --- a/ui/espresso/AccessibilitySample/build.gradle +++ b/ui/espresso/AccessibilitySample/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlinVersion = "1.9.22" + ext.kotlinVersion = "2.1.0" ext.agpVersion = "8.5.0" repositories { // Insert local test repo here diff --git a/ui/espresso/BasicSample/build.gradle b/ui/espresso/BasicSample/build.gradle index 817618f6..0879b129 100644 --- a/ui/espresso/BasicSample/build.gradle +++ b/ui/espresso/BasicSample/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlinVersion = "1.9.22" + ext.kotlinVersion = "2.1.0" ext.agpVersion = "8.5.0" repositories { // Insert local test repo here diff --git a/ui/espresso/EspressoDeviceSample/build.gradle b/ui/espresso/EspressoDeviceSample/build.gradle index eb45cb2d..adcd0216 100644 --- a/ui/espresso/EspressoDeviceSample/build.gradle +++ b/ui/espresso/EspressoDeviceSample/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlinVersion = "1.9.22" + ext.kotlinVersion = "2.1.0" ext.agpVersion = "8.5.0" repositories { // Insert local test repo here diff --git a/ui/espresso/FragmentScenarioSample/build.gradle b/ui/espresso/FragmentScenarioSample/build.gradle index c2a028ac..1fc3ccb9 100644 --- a/ui/espresso/FragmentScenarioSample/build.gradle +++ b/ui/espresso/FragmentScenarioSample/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlinVersion = "1.9.22" + ext.kotlinVersion = "2.1.0" ext.agpVersion = "8.5.0" repositories { google() diff --git a/ui/espresso/ScreenshotSample/build.gradle b/ui/espresso/ScreenshotSample/build.gradle index d2d1f745..96529c17 100644 --- a/ui/espresso/ScreenshotSample/build.gradle +++ b/ui/espresso/ScreenshotSample/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { ext.agpVersion = "8.5.0" - ext.kotlinVersion = "1.9.22" + ext.kotlinVersion = "2.1.0" ext.androidxCoreVersion = "1.9.0" ext.buildToolsVersion = "32.0.0" ext.androidxCompatVersion = "1.5.1" diff --git a/unit/BasicNativeAndroidTest/build.gradle b/unit/BasicNativeAndroidTest/build.gradle index ada2e810..b0edf596 100644 --- a/unit/BasicNativeAndroidTest/build.gradle +++ b/unit/BasicNativeAndroidTest/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { ext.agpVersion = "8.1.1" - ext.kotlinVersion = "1.7.10" + ext.kotlinVersion = "2.1.0" ext.androidxCoreVersion = "1.9.0" ext.buildToolsVersion = "32.0.0" ext.androidxCompatVersion = "1.5.1" diff --git a/unit/BasicSample-kotlinApp/build.gradle b/unit/BasicSample-kotlinApp/build.gradle index 683dc0b5..41bd7c75 100644 --- a/unit/BasicSample-kotlinApp/build.gradle +++ b/unit/BasicSample-kotlinApp/build.gradle @@ -1,6 +1,6 @@ buildscript { ext { - kotlinVersion = "1.3.61" + kotlinVersion = "2.1.0" } repositories { google() From 0975e67bdc2a6a2dd321b0b33e9edf2ba453db77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Alc=C3=A9rreca?= Date: Tue, 3 Dec 2024 15:43:20 +0100 Subject: [PATCH 2/4] Removes kotlinCompilerExtensionVersion --- ui/PreviewScreenshot/app/build.gradle.kts | 3 --- 1 file changed, 3 deletions(-) diff --git a/ui/PreviewScreenshot/app/build.gradle.kts b/ui/PreviewScreenshot/app/build.gradle.kts index 077cfcfe..ad27e129 100644 --- a/ui/PreviewScreenshot/app/build.gradle.kts +++ b/ui/PreviewScreenshot/app/build.gradle.kts @@ -56,9 +56,6 @@ android { buildFeatures { compose = true } - composeOptions { - kotlinCompilerExtensionVersion = "1.5.15" - } experimentalProperties["android.experimental.enableScreenshotTest"] = true From b3182befbf696cffd1db80a6577ce00d7abede05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Alc=C3=A9rreca?= Date: Tue, 3 Dec 2024 16:02:26 +0100 Subject: [PATCH 3/4] Update libs.versions.toml --- ui/PreviewScreenshot/gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/PreviewScreenshot/gradle/libs.versions.toml b/ui/PreviewScreenshot/gradle/libs.versions.toml index 89aabc0b..f5b15782 100644 --- a/ui/PreviewScreenshot/gradle/libs.versions.toml +++ b/ui/PreviewScreenshot/gradle/libs.versions.toml @@ -30,4 +30,4 @@ androidx-material3 = { group = "androidx.compose.material3", name = "material3" android-application = { id = "com.android.application", version.ref = "agp" } jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } screenshot = { id = "com.android.compose.screenshot", version.ref = "screenshot"} - +compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } From 498d702343cc95a4b4195c9898874e0f9a4176d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Alc=C3=A9rreca?= Date: Tue, 3 Dec 2024 16:02:56 +0100 Subject: [PATCH 4/4] Adds Compose compiler to screenshot testing project --- ui/PreviewScreenshot/app/build.gradle.kts | 1 + 1 file changed, 1 insertion(+) diff --git a/ui/PreviewScreenshot/app/build.gradle.kts b/ui/PreviewScreenshot/app/build.gradle.kts index ad27e129..4db1c281 100644 --- a/ui/PreviewScreenshot/app/build.gradle.kts +++ b/ui/PreviewScreenshot/app/build.gradle.kts @@ -18,6 +18,7 @@ plugins { alias(libs.plugins.android.application) alias(libs.plugins.jetbrains.kotlin.android) alias(libs.plugins.screenshot) + alias(libs.plugins.compose.compiler) } android {