From 3fecc5fad3f457bd23c293e07aed53716c8145c7 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Fri, 24 May 2024 15:50:26 +0600 Subject: [PATCH] trying to update to new compose --- .gitignore | 1 + android/pickers/build.gradle | 1 + android/smalltextfield/build.gradle | 1 + common/compose/build.gradle | 1 + coroutines/compose/build.gradle | 1 + defaultAndroidSettings.gradle | 1 + gradle/libs.versions.toml | 5 +++-- mppJvmJsAndroidLinuxMingwLinuxArm64Project.gradle | 1 - mppJvmJsAndroidProject.gradle | 1 - mppJvmJsLinuxMingwLinuxArm64Project.gradle | 1 - mppJvmJsLinuxMingwProject.gradle | 1 - mppProjectWithSerializationAndCompose.gradle | 8 -------- 12 files changed, 9 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 1d2d1b0e7ff..6c97217ff69 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ .idea +.kotlin out/* *.iml target diff --git a/android/pickers/build.gradle b/android/pickers/build.gradle index c96f8bbeb52..d926ab4bbd9 100644 --- a/android/pickers/build.gradle +++ b/android/pickers/build.gradle @@ -3,6 +3,7 @@ plugins { id "org.jetbrains.kotlin.plugin.serialization" id "com.android.library" alias(libs.plugins.jb.compose) + alias(libs.plugins.kt.jb.compose) } apply from: "$mppProjectWithSerializationAndComposePresetPath" diff --git a/android/smalltextfield/build.gradle b/android/smalltextfield/build.gradle index 43d40ccd762..523f3758844 100644 --- a/android/smalltextfield/build.gradle +++ b/android/smalltextfield/build.gradle @@ -3,6 +3,7 @@ plugins { id "org.jetbrains.kotlin.plugin.serialization" id "com.android.library" alias(libs.plugins.jb.compose) + alias(libs.plugins.kt.jb.compose) } apply from: "$mppProjectWithSerializationAndComposePresetPath" diff --git a/common/compose/build.gradle b/common/compose/build.gradle index 9b26194b637..22616d2da3f 100644 --- a/common/compose/build.gradle +++ b/common/compose/build.gradle @@ -3,6 +3,7 @@ plugins { id "org.jetbrains.kotlin.plugin.serialization" id "com.android.library" alias(libs.plugins.jb.compose) + alias(libs.plugins.kt.jb.compose) } apply from: "$mppComposeJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath" diff --git a/coroutines/compose/build.gradle b/coroutines/compose/build.gradle index fe1537c3ab1..e68a126b5ba 100644 --- a/coroutines/compose/build.gradle +++ b/coroutines/compose/build.gradle @@ -3,6 +3,7 @@ plugins { id "org.jetbrains.kotlin.plugin.serialization" id "com.android.library" alias(libs.plugins.jb.compose) + alias(libs.plugins.kt.jb.compose) } apply from: "$mppComposeJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath" diff --git a/defaultAndroidSettings.gradle b/defaultAndroidSettings.gradle index f2170660397..c3f41ef8580 100644 --- a/defaultAndroidSettings.gradle +++ b/defaultAndroidSettings.gradle @@ -6,6 +6,7 @@ android { defaultConfig { minSdkVersion libs.versions.android.props.minSdk.get().toInteger() + compileSdkVersion libs.versions.android.props.compileSdk.get().toInteger() targetSdkVersion libs.versions.android.props.compileSdk.get().toInteger() versionCode "${android_code_version}".toInteger() versionName "$version" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 84313b0b175..17fbedf5385 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,12 +1,12 @@ [versions] -kt = "1.9.23" +kt = "2.0.0" kt-serialization = "1.6.3" kt-coroutines = "1.8.1" kslog = "1.3.4" -jb-compose = "1.6.2" +jb-compose = "1.6.10" jb-exposed = "0.50.1" jb-dokka = "1.9.20" @@ -113,5 +113,6 @@ buildscript-android-dexcount = { module = "com.getkeepsafe.dexcount:dexcount-gra [plugins] jb-compose = { id = "org.jetbrains.compose", version.ref = "jb-compose" } +kt-jb-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kt" } versions = { id = "com.github.ben-manes.versions", version.ref = "versions" } diff --git a/mppJvmJsAndroidLinuxMingwLinuxArm64Project.gradle b/mppJvmJsAndroidLinuxMingwLinuxArm64Project.gradle index f70a1d5d842..2987a6a3d78 100644 --- a/mppJvmJsAndroidLinuxMingwLinuxArm64Project.gradle +++ b/mppJvmJsAndroidLinuxMingwLinuxArm64Project.gradle @@ -57,7 +57,6 @@ kotlin { jsTest { dependencies { implementation kotlin('test-js') - implementation kotlin('test-junit') } } nativeMain.dependsOn commonMain diff --git a/mppJvmJsAndroidProject.gradle b/mppJvmJsAndroidProject.gradle index cf44b62ce38..cd44ed45771 100644 --- a/mppJvmJsAndroidProject.gradle +++ b/mppJvmJsAndroidProject.gradle @@ -48,7 +48,6 @@ kotlin { jsTest { dependencies { implementation kotlin('test-js') - implementation kotlin('test-junit') } } androidUnitTest { diff --git a/mppJvmJsLinuxMingwLinuxArm64Project.gradle b/mppJvmJsLinuxMingwLinuxArm64Project.gradle index 622393cf7e6..27cba3db2e0 100644 --- a/mppJvmJsLinuxMingwLinuxArm64Project.gradle +++ b/mppJvmJsLinuxMingwLinuxArm64Project.gradle @@ -42,7 +42,6 @@ kotlin { jsTest { dependencies { implementation kotlin('test-js') - implementation kotlin('test-junit') } } diff --git a/mppJvmJsLinuxMingwProject.gradle b/mppJvmJsLinuxMingwProject.gradle index b16cba2f6df..d6c35289014 100644 --- a/mppJvmJsLinuxMingwProject.gradle +++ b/mppJvmJsLinuxMingwProject.gradle @@ -41,7 +41,6 @@ kotlin { jsTest { dependencies { implementation kotlin('test-js') - implementation kotlin('test-junit') } } mingwX64Test { diff --git a/mppProjectWithSerializationAndCompose.gradle b/mppProjectWithSerializationAndCompose.gradle index 31bc1e0a5dc..31308474059 100644 --- a/mppProjectWithSerializationAndCompose.gradle +++ b/mppProjectWithSerializationAndCompose.gradle @@ -58,7 +58,6 @@ kotlin { jsTest { dependencies { implementation kotlin('test-js') - implementation kotlin('test-junit') } } androidUnitTest { @@ -69,13 +68,6 @@ kotlin { implementation compose.uiTest } } - androidInstrumentedTest { - dependencies { - implementation kotlin('test-junit') - implementation libs.android.test.junit - implementation libs.android.espresso - } - } } }