diff --git a/extensions.gradle b/extensions.gradle index 4b54bd9526c..7cc0fcefac7 100644 --- a/extensions.gradle +++ b/extensions.gradle @@ -19,12 +19,12 @@ allprojects { } releaseMode = (project.hasProperty('RELEASE_MODE') && project.property('RELEASE_MODE') == "true") || System.getenv('RELEASE_MODE') == "true" - String compilerPluginVersionFromProperties = (String) project.properties["compose.kotlinCompilerPluginVersion"] - String compilerPluginVersionFromLibrariesVersions = libs.versions.compose.kotlin.get() - composePluginKotlinVersion = compilerPluginVersionFromProperties - if (compilerPluginVersionFromProperties == null) { - composePluginKotlinVersion = compilerPluginVersionFromLibrariesVersions - } +// String compilerPluginVersionFromProperties = (String) project.properties["compose.kotlinCompilerPluginVersion"] +// String compilerPluginVersionFromLibrariesVersions = libs.versions.compose.kotlin.get() +// composePluginKotlinVersion = compilerPluginVersionFromProperties +// if (compilerPluginVersionFromProperties == null) { +// composePluginKotlinVersion = compilerPluginVersionFromLibrariesVersions +// } mppProjectWithSerializationPresetPath = "${rootProject.projectDir.absolutePath}/mppProjectWithSerialization.gradle" mppProjectWithSerializationAndComposePresetPath = "${rootProject.projectDir.absolutePath}/mppProjectWithSerializationAndCompose.gradle" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 13f4e9fd57e..60a4a41d3b3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,13 +1,13 @@ [versions] kt = "1.9.20-Beta2" -compose-kotlin = "1.5.2.1-Beta2" +#compose-kotlin = "1.5.10-beta02" kt-serialization = "1.6.0" kt-coroutines = "1.7.3" kslog = "1.2.1" -jb-compose = "1.5.1" +jb-compose = "1.5.10-beta02" jb-exposed = "0.44.0" jb-dokka = "1.9.0" diff --git a/mppProjectWithSerializationAndCompose.gradle b/mppProjectWithSerializationAndCompose.gradle index 485e1b9b449..7bafc1d7ca2 100644 --- a/mppProjectWithSerializationAndCompose.gradle +++ b/mppProjectWithSerializationAndCompose.gradle @@ -75,8 +75,8 @@ java { } -compose { - if (composePluginKotlinVersion != null && !composePluginKotlinVersion.isEmpty()) { - kotlinCompilerPlugin.set(composePluginKotlinVersion) - } -} +//compose { +// if (composePluginKotlinVersion != null && !composePluginKotlinVersion.isEmpty()) { +// kotlinCompilerPlugin.set(composePluginKotlinVersion) +// } +//}