diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f5f9a47..ed95f64 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -72,10 +72,10 @@ xmlutil = "0.86.2" # https://github.com/Him188/yamlkt yamlkt = "0.13.0" # https://github.com/JetBrains/kotlin-wrappers -jsBom = "1.0.0-pre.648" +jsBom = "1.0.0-pre.732" junit = "5.9.3" # https://github.com/JetBrains/compose-multiplatform -compose = "1.6.10-beta01" +compose = "1.6.2" # 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/KScienceExtension.kt b/src/main/kotlin/space/kscience/gradle/KScienceExtension.kt index efcab46..12112d8 100644 --- a/src/main/kotlin/space/kscience/gradle/KScienceExtension.kt +++ b/src/main/kotlin/space/kscience/gradle/KScienceExtension.kt @@ -9,6 +9,7 @@ import org.gradle.api.tasks.testing.Test import org.gradle.jvm.toolchain.JavaLanguageVersion import org.gradle.kotlin.dsl.* import org.gradle.language.jvm.tasks.ProcessResources +import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi import org.jetbrains.kotlin.gradle.dsl.KotlinJsProjectExtension import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension @@ -359,6 +360,7 @@ public open class KScienceMppExtension(project: Project) : KScienceExtension(pro project.pluginManager.withPlugin("org.jetbrains.kotlin.multiplatform") { project.configure { jvm { + @OptIn(ExperimentalKotlinGradlePluginApi::class) compilerOptions{ freeCompilerArgs.addAll(defaultKotlinJvmArgs) } diff --git a/src/main/kotlin/space/kscience/gradle/KScienceMPPlugin.kt b/src/main/kotlin/space/kscience/gradle/KScienceMPPlugin.kt index ada39c6..90ab1f2 100644 --- a/src/main/kotlin/space/kscience/gradle/KScienceMPPlugin.kt +++ b/src/main/kotlin/space/kscience/gradle/KScienceMPPlugin.kt @@ -6,11 +6,13 @@ import org.gradle.kotlin.dsl.apply import org.gradle.kotlin.dsl.configure import org.gradle.kotlin.dsl.invoke import org.jetbrains.dokka.gradle.DokkaPlugin +import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension 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("org.jetbrains.kotlin.multiplatform")) { //apply() for some reason it does not work @@ -38,7 +40,7 @@ public open class KScienceMPPlugin : Plugin { languageSettings.applySettings() } } - + @OptIn(ExperimentalKotlinGradlePluginApi::class) compilerOptions{ freeCompilerArgs.addAll(defaultKotlinCommonArgs) } diff --git a/src/main/kotlin/space/kscience/gradle/KScienceProjectPlugin.kt b/src/main/kotlin/space/kscience/gradle/KScienceProjectPlugin.kt index a613654..fdb73f1 100644 --- a/src/main/kotlin/space/kscience/gradle/KScienceProjectPlugin.kt +++ b/src/main/kotlin/space/kscience/gradle/KScienceProjectPlugin.kt @@ -91,7 +91,7 @@ public open class KScienceProjectPlugin : Plugin { repositories { mavenCentral() maven("https://repo.kotlin.link") - maven("https://maven.pkg.jetbrains.space/spc/p/sci/dev") + google() } // Workaround for https://github.com/gradle/gradle/issues/15568