From 629d7c7a82320f8f7f58fe49d2f9c7235cc00220 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Mon, 3 Jun 2024 22:21:56 +0600 Subject: [PATCH] temporal project in upgrade --- build.gradle | 9 --------- gradle/libs.versions.toml | 8 ++++---- mppJvmJsAndroidProject.gradle | 10 ---------- mppJvmJsLinuxMingwProject.gradle | 10 ---------- 4 files changed, 4 insertions(+), 33 deletions(-) diff --git a/build.gradle b/build.gradle index b92716dd4da..74f08770aa2 100644 --- a/build.gradle +++ b/build.gradle @@ -29,15 +29,6 @@ allprojects { maven { url "https://maven.pkg.jetbrains.space/public/p/compose/dev" } maven { url "https://nexus.inmo.dev/repository/maven-releases/" } } - - // temporal crutch until legacy tests will be stabled or legacy target will be removed - if (it != rootProject.findProject("docs")) { - tasks.whenTaskAdded { task -> - if(task.name == "jsLegacyBrowserTest" || task.name == "jsLegacyNodeTest") { - task.enabled = false - } - } - } } apply from: "./extensions.gradle" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 17fbedf5385..aac3c6a36df 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] kt = "2.0.0" -kt-serialization = "1.6.3" +kt-serialization = "1.7.0-RC" kt-coroutines = "1.8.1" kslog = "1.3.4" @@ -21,17 +21,17 @@ koin = "3.5.6" okio = "3.9.0" -ksp = "1.9.23-1.0.20" +ksp = "2.0.0-1.0.21" kotlin-poet = "1.16.0" versions = "0.51.0" -android-gradle = "8.2.0" +android-gradle = "8.2.2" dexcount = "4.0.0" android-coreKtx = "1.13.1" android-recyclerView = "1.3.2" -android-appCompat = "1.6.1" +android-appCompat = "1.7.0" android-fragment = "1.7.1" android-espresso = "3.5.1" android-test = "1.1.5" diff --git a/mppJvmJsAndroidProject.gradle b/mppJvmJsAndroidProject.gradle index cd44ed45771..e08c7cc2f86 100644 --- a/mppJvmJsAndroidProject.gradle +++ b/mppJvmJsAndroidProject.gradle @@ -57,16 +57,6 @@ kotlin { implementation libs.android.espresso } } - mingwX64Test { - dependencies { - implementation kotlin('test-junit') - } - } - linuxX64Test { - dependencies { - implementation kotlin('test-junit') - } - } androidMain.dependsOn jvmMain } diff --git a/mppJvmJsLinuxMingwProject.gradle b/mppJvmJsLinuxMingwProject.gradle index d6c35289014..b6355513b6f 100644 --- a/mppJvmJsLinuxMingwProject.gradle +++ b/mppJvmJsLinuxMingwProject.gradle @@ -43,16 +43,6 @@ kotlin { implementation kotlin('test-js') } } - mingwX64Test { - dependencies { - implementation kotlin('test-junit') - } - } - linuxX64Test { - dependencies { - implementation kotlin('test-junit') - } - } nativeMain.dependsOn commonMain linuxX64Main.dependsOn nativeMain