From 083abe18f0066885ed7dfadaff1dfd4bb6a24fee Mon Sep 17 00:00:00 2001 From: Pavel Shishkin Date: Mon, 4 Nov 2024 15:58:27 +0100 Subject: [PATCH] update versions --- .../composable-test-cases/build.gradle.kts | 12 ++++++++++++ .../composable-test-cases/buildSrc/build.gradle.kts | 4 ++-- .../composable-test-cases/gradle.properties | 6 +++--- .../composable-test-cases/gradle/libs.versions.toml | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- 5 files changed, 19 insertions(+), 7 deletions(-) diff --git a/compose/integrations/composable-test-cases/build.gradle.kts b/compose/integrations/composable-test-cases/build.gradle.kts index cd2e43ac91..ce7c1bf408 100644 --- a/compose/integrations/composable-test-cases/build.gradle.kts +++ b/compose/integrations/composable-test-cases/build.gradle.kts @@ -23,6 +23,18 @@ allprojects { tasks.withType>().configureEach { kotlinOptions.freeCompilerArgs += "-Xpartial-linkage=disable" } + //non-depracated? +// tasks.withType>() { +// compilerOptions { +// freeCompilerArgs.add("-Xklib-enable-signature-clash-checks=false") +// } +// } +// +// tasks.withType>() { +// compilerOptions { +// freeCompilerArgs.add("-Xpartial-linkage=disable") +// } +// } } disableYarnLockMismatchReport() } diff --git a/compose/integrations/composable-test-cases/buildSrc/build.gradle.kts b/compose/integrations/composable-test-cases/buildSrc/build.gradle.kts index befa51343d..652c92c380 100644 --- a/compose/integrations/composable-test-cases/buildSrc/build.gradle.kts +++ b/compose/integrations/composable-test-cases/buildSrc/build.gradle.kts @@ -10,8 +10,8 @@ plugins { java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } dependencies { diff --git a/compose/integrations/composable-test-cases/gradle.properties b/compose/integrations/composable-test-cases/gradle.properties index a0599e1337..33bc1c5639 100644 --- a/compose/integrations/composable-test-cases/gradle.properties +++ b/compose/integrations/composable-test-cases/gradle.properties @@ -1,11 +1,11 @@ org.gradle.jvmargs=-Xmx4096M -XX:MaxMetaspaceSize=512m kotlin.code.style=official android.useAndroidX=true -kotlin.version=2.0.20 -agp.version=7.3.0 +kotlin.version=2.1.0-RC +agp.version=8.2.2 # a version of compose libraries. In this project the only dependency is compose-runtime. -compose.version=1.6.10-rc01 +compose.version=1.7.0 # a group id for compose-runtime. Keep it as a parameter to easily change it on CI. compose.runtime.groupId=org.jetbrains.compose.runtime diff --git a/compose/integrations/composable-test-cases/gradle/libs.versions.toml b/compose/integrations/composable-test-cases/gradle/libs.versions.toml index 1c8bef8632..54ff8e10e8 100644 --- a/compose/integrations/composable-test-cases/gradle/libs.versions.toml +++ b/compose/integrations/composable-test-cases/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -kotlin="2.0.20" +kotlin="2.1.0-RC" [plugins] composeCompiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } diff --git a/compose/integrations/composable-test-cases/gradle/wrapper/gradle-wrapper.properties b/compose/integrations/composable-test-cases/gradle/wrapper/gradle-wrapper.properties index ae04661ee7..48c0a02ca4 100644 --- a/compose/integrations/composable-test-cases/gradle/wrapper/gradle-wrapper.properties +++ b/compose/integrations/composable-test-cases/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists