From ed5faa0335efe6de6c623f3623f2e252aaa35f1b Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Tue, 21 Nov 2023 11:22:40 +0300 Subject: [PATCH] kotlin 2.0.0-Beta1 --- gradle/libs.versions.toml | 6 +++--- src/main/kotlin/space/kscience/gradle/KScienceMPPlugin.kt | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 754f7d5..879d05c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] -tools = "0.15.0-kotlin-1.9.20" -kotlin = "1.9.20" +tools = "0.15.0-kotlin-2.0.0-Beta1" +kotlin = "2.0.0-Beta1" # https://github.com/Kotlin/kotlinx-atomicfu atomicfu = "0.22.0" # https://github.com/Kotlin/binary-compatibility-validator @@ -37,7 +37,7 @@ yamlkt = "0.13.0" jsBom = "1.0.0-pre.624" junit = "5.9.3" # https://github.com/JetBrains/compose-multiplatform -compose = "1.5.3" +compose = "1.5.10" # https://mvnrepository.com/artifact/org.slf4j/slf4j-api slf4j = "2.0.9" # https://mvnrepository.com/artifact/ch.qos.logback/logback-classic diff --git a/src/main/kotlin/space/kscience/gradle/KScienceMPPlugin.kt b/src/main/kotlin/space/kscience/gradle/KScienceMPPlugin.kt index 97d8d58..080bfcc 100644 --- a/src/main/kotlin/space/kscience/gradle/KScienceMPPlugin.kt +++ b/src/main/kotlin/space/kscience/gradle/KScienceMPPlugin.kt @@ -4,17 +4,15 @@ import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.kotlin.dsl.apply import org.gradle.kotlin.dsl.configure -import org.gradle.kotlin.dsl.hasPlugin import org.gradle.kotlin.dsl.invoke import org.jetbrains.dokka.gradle.DokkaPlugin import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension -import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinMultiplatformPlugin import space.kscience.gradle.internal.applySettings import space.kscience.gradle.internal.defaultKotlinCommonArgs public open class KScienceMPPlugin : Plugin { override fun apply(project: Project): Unit = project.run { - if (!plugins.hasPlugin(KotlinMultiplatformPlugin::class)) { + if (!plugins.hasPlugin("org.jetbrains.kotlin.multiplatform")) { //apply() for some reason it does not work plugins.apply("org.jetbrains.kotlin.multiplatform") } else {