diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 266f8ae..5ff2753 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] tools = "0.10.4" -kotlin = "1.5.31" +kotlin = "1.6.0-M1" atomicfu = "0.16.2" binary-compatibility-validator = "0.7.1" changelog = "1.3.0" @@ -14,11 +14,11 @@ kotlinx-datetime = "0.2.1" kotlinx-html = "0.7.3" kotlinx-knit = "0.2.3" kotlinx-nodejs = "0.0.7" -kotlinx-serialization = "1.3.0-RC" +kotlinx-serialization = "1.3.0" ktor = "1.6.3" xmlutil = "0.83.0" yamlkt = "0.10.2" -jsBom = "0.0.1-pre.243-kotlin-1.5.30" +jsBom = "0.0.1-pre.248-kotlin-1.5.31" [libraries] atomicfu-gradle = { module = "org.jetbrains.kotlinx:atomicfu-gradle-plugin", version.ref = "atomicfu" } diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceCommonPlugin.kt b/src/main/kotlin/ru/mipt/npm/gradle/KScienceCommonPlugin.kt index 70b06c4..1ee4e43 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceCommonPlugin.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/KScienceCommonPlugin.kt @@ -28,12 +28,11 @@ public open class KScienceCommonPlugin : Plugin { configure { explicitApiWarning() - sourceSets["main"].apply { + sourceSets.all { languageSettings.applySettings() } sourceSets["test"].apply { - languageSettings.applySettings() dependencies { implementation(kotlin("test-junit5")) implementation("org.junit.jupiter:junit-jupiter:5.6.1") @@ -69,15 +68,17 @@ public open class KScienceCommonPlugin : Plugin { } } - sourceSets["main"].apply { + sourceSets.all { languageSettings.applySettings() + } + + sourceSets["main"].apply { dependencies { api(project.dependencies.platform("org.jetbrains.kotlin-wrappers:kotlin-wrappers-bom:${KScienceVersions.jsBom}")) } } sourceSets["test"].apply { - languageSettings.applySettings() dependencies { implementation(kotlin("test-js")) } @@ -138,12 +139,8 @@ public open class KScienceCommonPlugin : Plugin { } } - afterEvaluate { - targets.all { - sourceSets.all { - languageSettings.applySettings() - } - } + sourceSets.all { + languageSettings.applySettings() } (tasks.findByName("jsProcessResources") as? Copy)?.apply {