diff --git a/CHANGELOG.md b/CHANGELOG.md index a46c808..144034a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,11 +10,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Add development mode for fullstack. ### Changed +- Kotlin 1.9.20 +- Remove publishing defaults for Space and GitHub. Now publishing repositories is configured quasi-manually. Property keys for username and tokens are generated automatically. - All publishing targets are enabled by default. Introduce `publishing.targets` variable to regulate what is added to the module. ### Deprecated ### Removed +- Unnecessary `dependsOn` for native dependencies. - Groovy gradle dependency notation. ### Fixed diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0a7ccc2..f7c5f1c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -tools = "0.14.11-kotlin-1.9.20-Beta" +tools = "0.15.0-kotlin-1.9.20-Beta" kotlin = "1.9.20-Beta" # https://github.com/Kotlin/kotlinx-atomicfu atomicfu = "0.22.0" diff --git a/src/main/kotlin/space/kscience/gradle/KScienceExtension.kt b/src/main/kotlin/space/kscience/gradle/KScienceExtension.kt index b362595..3680e50 100644 --- a/src/main/kotlin/space/kscience/gradle/KScienceExtension.kt +++ b/src/main/kotlin/space/kscience/gradle/KScienceExtension.kt @@ -503,8 +503,7 @@ public open class KScienceMppExtension(project: Project) : KScienceExtension(pro val nativeConfiguration = KScienceNativeConfiguration(this).apply(block) pluginManager.withPlugin("org.jetbrains.kotlin.multiplatform") { configure { - val nativeTargets: List = - nativeConfiguration.targets.values.map { nativeTarget -> + nativeConfiguration.targets.values.forEach { nativeTarget -> when (nativeTarget.preset) { KotlinNativePreset.linuxX64 -> linuxX64( nativeTarget.targetName, @@ -540,42 +539,9 @@ public open class KScienceMppExtension(project: Project) : KScienceExtension(pro nativeTarget.targetName, nativeTarget.targetConfiguration ) - -// else -> { -// logger.error("Native preset ${nativeTarget.preset} not recognised.") -// null -// } } } - sourceSets { - val commonMain by getting - val commonTest by getting - - val nativeMain by creating { - dependsOn(commonMain) - } - - val nativeTest by creating { - //should NOT depend on nativeMain because automatic dependency by plugin - dependsOn(commonTest) - } - - configure(nativeTargets) { - - compilations["main"]?.apply { - configure(kotlinSourceSets) { - dependsOn(nativeMain) - } - } - - compilations["test"]?.apply { - configure(kotlinSourceSets) { - dependsOn(nativeTest) - } - } - } - } } } }