kmm gradle config tidy up

Author: aSemy

buildSrc/src/main/kotlin/buildsrc/config/gradle.kt

@@ -27,36 +27,3 @@ fun IdeaModule.excludeGeneratedGradleDsl(layout: ProjectLayout) {
     )
   )
 }
-
-
-/**
- * `kotlin-js` adds a directory in the root-dir for the Yarn lock.
- * That's a bit annoying. It's a little neater if it's in the
- * gradle dir, next to the version-catalog.
- */
-fun Project.relocateKotlinJsStore() {
-
-  afterEvaluate {
-    rootProject.extensions.findByType<YarnRootExtension>()?.apply {
-      lockFileDirectory = project.rootDir.resolve("gradle/kotlin-js-store")
-    }
-  }
-
-}
-
-fun KotlinTargetContainerWithPresetFunctions.currentHostTarget(
-  targetName: String = "native",
-  configure: KotlinNativeTargetWithHostTests.() -> Unit,
-): KotlinNativeTargetWithHostTests {
-  val hostOs = System.getProperty("os.name")
-  val isMingwX64 = hostOs.startsWith("Windows")
-  val hostTarget = when {
-    hostOs == "Mac OS X" -> macosX64(targetName)
-    hostOs == "Linux"    -> linuxX64(targetName)
-    isMingwX64           -> mingwX64(targetName)
-    else                 -> throw GradleException("Preset for host OS '$hostOs' is undefined")
-  }
-  println("Current host target ${hostTarget.targetName}/${hostTarget.preset?.name}")
-  hostTarget.configure()
-  return hostTarget
-}

buildSrc/src/main/kotlin/buildsrc/config/kmm.kt

@@ -0,0 +1,47 @@
+package buildsrc.config
+
+import org.gradle.api.GradleException
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.findByType
+import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
+import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTargetWithHostTests
+import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnRootExtension
+
+
+/**
+ * `kotlin-js` adds a directory in the root-dir for the Yarn lock.
+ * That's a bit annoying. It's a little neater if it's in the
+ * gradle dir, next to the version-catalog.
+ */
+fun Project.relocateKotlinJsStore() {
+
+  afterEvaluate {
+    rootProject.extensions.findByType<YarnRootExtension>()?.apply {
+      lockFileDirectory = project.rootDir.resolve("gradle/kotlin-js-store")
+    }
+  }
+
+}
+
+
+fun KotlinMultiplatformExtension.currentHostTarget(
+  targetName: String = "native",
+  configure: KotlinNativeTargetWithHostTests.() -> Unit,
+): KotlinNativeTargetWithHostTests {
+  val hostOs = System.getProperty("os.name")
+  val hostTarget = when {
+    hostOs == "Mac OS X"         -> macosX64(targetName)
+    hostOs == "Linux"            -> linuxX64(targetName)
+    hostOs.startsWith("Windows") -> mingwX64(targetName)
+    else                         -> throw GradleException("Preset for host OS '$hostOs' is undefined")
+  }
+
+  println("Current host target ${hostTarget.targetName}/${hostTarget.preset?.name}")
+  hostTarget.configure()
+  return hostTarget
+}
+
+
+fun KotlinMultiplatformExtension.publicationsFromMainHost(): List<String> {
+  return listOf(jvm(), js()).map { it.name } + "kotlinMultiplatform"
+}

buildSrc/src/main/kotlin/buildsrc/convention/kotlin-multiplatform.gradle.kts

@@ -2,6 +2,7 @@ package buildsrc.convention
 
 import buildsrc.config.relocateKotlinJsStore
 
+
 plugins {
   id("buildsrc.convention.subproject")
   kotlin("multiplatform")
@@ -10,3 +11,15 @@ plugins {
 
 
 relocateKotlinJsStore()
+
+
+kotlin {
+  targets.all {
+    compilations.all {
+      kotlinOptions {
+        languageVersion = "1.6"
+        apiVersion = "1.6"
+      }
+    }
+  }
+}

modules/kxs-ts-gen-core/build.gradle.kts

@@ -1,3 +1,6 @@
+import buildsrc.config.publicationsFromMainHost
+
+
 plugins {
   buildsrc.convention.`kotlin-multiplatform`
   buildsrc.convention.`maven-publish`
@@ -8,14 +11,6 @@ plugins {
 val kotlinxSerializationVersion = "1.3.2"
 
 kotlin {
-//  val hostOs = System.getProperty("os.name")
-//  val isMingwX64 = hostOs.startsWith("Windows")
-//  val nativeTarget = when {
-//    hostOs == "Mac OS X" -> macosX64("native")
-//    hostOs == "Linux"    -> linuxX64("native")
-//    isMingwX64           -> mingwX64("native")
-//    else                 -> throw GradleException("Host OS is not supported in Kotlin/Native.")
-//  }
 
 //  js(IR) {
 //    binaries.executable()
@@ -25,19 +20,30 @@ kotlin {
 //      }
 //    }
 //  }
+
   jvm {
     compilations.all {
       kotlinOptions {
         jvmTarget = "11"
-        languageVersion = "1.6"
-        apiVersion = "1.6"
       }
     }
     withJava()
     testRuns["test"].executionTask.configure {
       useJUnitPlatform()
     }
   }
+
+//  publishing {
+//    publications {
+//      matching { it.name in publicationsFromMainHost() }.all {
+//        val targetPublication = this@all
+//        tasks.withType<AbstractPublishToMaven>()
+//          .matching { it.publication == targetPublication }
+//          .configureEach { onlyIf { findProperty("isMainHost") == "true" } }
+//      }
+//    }
+//  }
+
   sourceSets {
 
     all {

settings.gradle.kts

@@ -9,3 +9,8 @@ include(
 )
 
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
+
+dependencyResolutionManagement {
+  @Suppress("UnstableApiUsage") // Central declaration of repositories is an incubating feature
+  repositoriesMode.set(RepositoriesMode.PREFER_SETTINGS)
+}