Universal native configuration

CHANGELOG.md

@@ -10,11 +10,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add `-Xjdk-release` key
 
 ### Changed
-- Kotlin 1.7.10
+- Kotlin 1.7.20-Beta
 - Versions update
 - Project group changed to `space.kscience`
 
 ### Deprecated
+- FX configuration
 
 ### Removed
 

gradle/libs.versions.toml

@@ -1,19 +1,19 @@
 [versions]
-tools = "0.12.0-kotlin-1.7.20-Beta"
+tools = "0.12.1-kotlin-1.7.20-Beta"
 kotlin = "1.7.20-Beta"
 atomicfu = "0.18.2"
 binary-compatibility-validator = "0.10.1"
 changelog = "1.3.1"
-dokka = "1.7.0"
+dokka = "1.7.10"
-kotlin-jupyter = "0.11.0-125"
+kotlin-jupyter = "0.11.0-142"
 kotlinx-benchmark = "0.4.4"
 kotlinx-cli = "0.3.5"
-kotlinx-coroutines = "1.6.3"
+kotlinx-coroutines = "1.6.4"
 kotlinx-datetime = "0.4.0"
 kotlinx-html = "0.7.5"
 kotlinx-knit = "0.4.0"
 kotlinx-nodejs = "0.0.7"
-kotlinx-serialization = "1.3.3"
+kotlinx-serialization = "1.4.0-RC"
 ktor = "2.0.3"
 xmlutil = "0.84.2"
 yamlkt = "0.12.0"

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/kotlin/space/kscience/gradle/KScienceCommonPlugin.kt

@@ -4,7 +4,5 @@ import org.gradle.api.Plugin
 import org.gradle.api.Project
 
 public open class KScienceCommonPlugin : Plugin<Project> {
-    override fun apply(project: Project): Unit = project.configureKScience(
+    override fun apply(project: Project): Unit = project.configureKScience()
-        KotlinVersion(1, 7, 10)
-    )
 }

src/main/kotlin/space/kscience/gradle/KScienceExtension.kt

@@ -9,6 +9,8 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinJsProjectExtension
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
+import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsTargetDsl
+import org.jetbrains.kotlin.gradle.targets.jvm.KotlinJvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.jetbrains.kotlinx.jupyter.api.plugin.tasks.JupyterApiResourcesTask
 import space.kscience.gradle.internal.defaultPlatform
@@ -43,7 +45,8 @@ public enum class DependencySourceSet(public val setName: String, public val suf
 }
 
 
-public class KScienceExtension(public val project: Project) {
+public open class KScienceExtension(public val project: Project) {
+
     /**
      * Use coroutines-core with default version or [version]
      */
@@ -90,6 +93,7 @@ public class KScienceExtension(public val project: Project) {
     /**
      * Add platform-specific JavaFX dependencies with given list of [FXModule]s
      */
+    @Deprecated("Use manual FX configuration")
     public fun useFx(
         vararg modules: FXModule,
         configuration: DependencyConfiguration = DependencyConfiguration.COMPILE_ONLY,
@@ -123,14 +127,6 @@ public class KScienceExtension(public val project: Project) {
         dependencyConfiguration = configuration
     )
 
-    /**
-     * Apply jupyter plugin
-     */
-    @Deprecated("Use jupyterLibrary")
-    public fun useJupyter() {
-        project.plugins.apply("org.jetbrains.kotlin.jupyter.api")
-    }
-
     /**
      * Apply jupyter plugin and add entry point for the jupyter library.
      * If left empty applies a plugin without declaring library producers
@@ -185,8 +181,76 @@ public class KScienceExtension(public val project: Project) {
     }
 }
 
-internal fun Project.registerKScienceExtension() {
+public enum class KotlinNativePreset {
-    if (extensions.findByType<KScienceExtension>() == null) {
+    linuxX64,
-        extensions.add("kscience", KScienceExtension(this))
+    mingwX64,
+    macosX64,
+    iosX64,
+    iosArm64
+}
+
+public data class KScienceNativeTarget(
+    val preset: KotlinNativePreset,
+    val targetName: String = preset.name,
+    val targetConfiguration: KotlinNativeTarget.() -> Unit = { },
+) {
+    public companion object {
+        public val linuxX64: KScienceNativeTarget = KScienceNativeTarget(KotlinNativePreset.linuxX64)
+        public val mingwX64: KScienceNativeTarget = KScienceNativeTarget(KotlinNativePreset.mingwX64)
+        public val macosX64: KScienceNativeTarget = KScienceNativeTarget(KotlinNativePreset.macosX64)
+        public val iosX64: KScienceNativeTarget = KScienceNativeTarget(KotlinNativePreset.iosX64)
+        public val iosArm64: KScienceNativeTarget = KScienceNativeTarget(KotlinNativePreset.iosArm64)
+    }
+}
+
+public class KScienceNativeConfiguration {
+    internal var targets: MutableMap<KotlinNativePreset, KScienceNativeTarget> = listOf(
+        KScienceNativeTarget.linuxX64,
+        KScienceNativeTarget.mingwX64,
+        KScienceNativeTarget.macosX64,
+        KScienceNativeTarget.iosX64,
+        KScienceNativeTarget.iosArm64,
+    ).associateBy { it.preset }.toMutableMap()
+
+    public fun targets(vararg target: KScienceNativeTarget) {
+        targets = target.associateBy { it.preset }.toMutableMap()
+    }
+
+    public fun target(target: KScienceNativeTarget) {
+        targets[target.preset] = target
+    }
+}
+
+public open class KScienceMppExtension(project: Project) : KScienceExtension(project) {
+    internal var jvmConfiguration: ((KotlinJvmTarget) -> Unit)? = { }
+
+    /**
+     * Custom configuration for JVM target. If null - disable JVM target
+     */
+    public fun jvm(block: KotlinJvmTarget.() -> Unit) {
+        jvmConfiguration = block
+    }
+
+    internal var jsConfiguration: ((KotlinJsTargetDsl) -> Unit)? = { }
+
+    /**
+     * Custom configuration for JS target. If null - disable JS target
+     */
+    public fun js(block: KotlinJsTargetDsl.() -> Unit) {
+        jsConfiguration = block
+    }
+
+    internal var nativeConfiguration: KScienceNativeConfiguration? = null
+
+    public fun native(block: KScienceNativeConfiguration.() -> Unit = {}) {
+        nativeConfiguration = KScienceNativeConfiguration().apply(block)
+    }
+}
+
+
+internal inline fun <reified T : KScienceExtension> Project.registerKScienceExtension(constructor: (Project) -> T): T {
+    extensions.findByType<T>()?.let { return it }
+    return constructor(this).also {
+        extensions.add("kscience", it)
     }
 }

src/main/kotlin/space/kscience/gradle/KScienceNativePlugin.kt

@@ -2,8 +2,7 @@ package space.kscience.gradle
 
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import org.gradle.kotlin.dsl.*
+import org.gradle.kotlin.dsl.hasPlugin
-import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 
 public class KScienceNativePlugin : Plugin<Project> {
     override fun apply(project: Project): Unit = project.run {
@@ -13,47 +12,14 @@ public class KScienceNativePlugin : Plugin<Project> {
             plugins.apply("org.jetbrains.kotlin.multiplatform")
         }
 
+        registerKScienceExtension(::KScienceMppExtension).apply {
+            native()
+        }
+
         if (!plugins.hasPlugin(KScienceCommonPlugin::class)) {
-            logger.info("KScience plugin is not resolved. Adding it automatically")
+            configureKScience()
-            apply<KScienceCommonPlugin>()
+        } else {
-        }
+            error("KScience native plugin must be applied instead of common")
-
-        configure<KotlinMultiplatformExtension> {
-            val nativeTargets = setOf(
-                linuxX64(),
-                mingwX64(),
-                macosX64(),
-                iosX64(),
-                iosArm64()
-            )
-
-            sourceSets {
-                val commonMain = findByName("commonMain")!!
-                val commonTest = findByName("commonTest")!!
-
-                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)
-                        }
-                    }
-                }
-            }
         }
     }
 }

src/main/kotlin/space/kscience/gradle/commonConfigurations.kt

@@ -9,23 +9,30 @@ import org.jetbrains.dokka.gradle.DokkaPlugin
 import org.jetbrains.kotlin.gradle.dsl.KotlinJsProjectExtension
 import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
+import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTargetWithHostTests
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import space.kscience.gradle.internal.applyRepos
 import space.kscience.gradle.internal.applySettings
 import space.kscience.gradle.internal.fromJsDependencies
 
 
-private val defaultJvmArgs: List<String> = listOf("-Xjvm-default=all", "-Xlambdas=indy", "-Xjdk-release=${KScienceVersions.JVM_TARGET}")
+private val defaultKotlinJvmArgs: List<String> =
+    listOf("-Xjvm-default=all", "-Xlambdas=indy", "-Xjdk-release=${KScienceVersions.JVM_TARGET}")
+
+private fun resolveKotlinVersion():KotlinVersion {
+    val (major, minor, patch) = KScienceVersions.kotlinVersion.split(".", "-")
+    return KotlinVersion(major.toInt(),minor.toInt(),patch.toInt())
+}
 
 public fun Project.configureKScience(
-    kotlinVersion: KotlinVersion,
+    kotlinVersion: KotlinVersion = resolveKotlinVersion(),
 ) {
-    //Common configuration
-    registerKScienceExtension()
     repositories.applyRepos()
 
     //Configuration for K-JVM plugin
     pluginManager.withPlugin("org.jetbrains.kotlin.jvm") {
+        registerKScienceExtension(::KScienceExtension)
+
         //logger.info("Applying KScience configuration for JVM project")
         configure<KotlinJvmProjectExtension> {
             sourceSets.all {
@@ -44,7 +51,7 @@ public fun Project.configureKScience(
         tasks.withType<KotlinCompile> {
             kotlinOptions {
                 jvmTarget = KScienceVersions.JVM_TARGET.toString()
-                freeCompilerArgs = freeCompilerArgs + defaultJvmArgs
+                freeCompilerArgs = freeCompilerArgs + defaultKotlinJvmArgs
             }
         }
 
@@ -58,6 +65,8 @@ public fun Project.configureKScience(
     }
 
     pluginManager.withPlugin("org.jetbrains.kotlin.js") {
+        registerKScienceExtension(::KScienceExtension)
+
         //logger.info("Applying KScience configuration for JS project")
         configure<KotlinJsProjectExtension> {
             js(IR) {
@@ -96,16 +105,22 @@ public fun Project.configureKScience(
     }
 
     pluginManager.withPlugin("org.jetbrains.kotlin.multiplatform") {
+        val configuration = registerKScienceExtension(::KScienceMppExtension)
+
         configure<KotlinMultiplatformExtension> {
+            configuration.jvmConfiguration?.let { jvmConfiguration ->
                 jvm {
                     compilations.all {
                         kotlinOptions {
                             jvmTarget = KScienceVersions.JVM_TARGET.toString()
-                        freeCompilerArgs = freeCompilerArgs + defaultJvmArgs
+                            freeCompilerArgs = freeCompilerArgs + defaultKotlinJvmArgs
                         }
                     }
+                    jvmConfiguration(this)
+                }
             }
 
+            configuration.jsConfiguration?.let { jsConfiguration ->
                 js(IR) {
                     browser {
                         commonWebpackConfig {
@@ -114,6 +129,8 @@ public fun Project.configureKScience(
                             }
                         }
                     }
+                    jsConfiguration(this)
+                }
             }
 
             sourceSets {
@@ -141,6 +158,45 @@ public fun Project.configureKScience(
                         implementation(kotlin("test-js"))
                     }
                 }
+
+                configuration.nativeConfiguration?.let { nativeConfiguration ->
+                    val nativeTargets: List<KotlinNativeTargetWithHostTests> = nativeConfiguration.targets.values.mapNotNull { nativeTarget ->
+                        when (nativeTarget.preset) {
+                            KotlinNativePreset.linuxX64 -> linuxX64(nativeTarget.targetName, nativeTarget.targetConfiguration)
+                            KotlinNativePreset.mingwX64 -> linuxX64(nativeTarget.targetName, nativeTarget.targetConfiguration)
+                            KotlinNativePreset.macosX64 -> linuxX64(nativeTarget.targetName, nativeTarget.targetConfiguration)
+                            KotlinNativePreset.iosX64 -> linuxX64(nativeTarget.targetName, nativeTarget.targetConfiguration)
+                            KotlinNativePreset.iosArm64 -> linuxX64(nativeTarget.targetName, nativeTarget.targetConfiguration)
+                            else -> {
+                                logger.error("Native preset ${nativeTarget.preset} not recognised.")
+                                null
+                            }
+                        }
+                    }
+
+                    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)
+                            }
+                        }
+                    }
+                }
             }
 
             sourceSets.all {