Use unique moduleName parameters (#19)

KotlinCrypto · Aug 30, 2024 · d41e283 · d41e283
1 parent 2082f77
commit d41e283
Show file tree

Hide file tree

Showing 6 changed files with 162 additions and 161 deletions.
diff --git a/.kotlin-js-store/yarn.lock b/.kotlin-js-store/yarn.lock
diff --git a/build-logic/src/main/kotlin/-KmpConfigurationExtension.kt b/build-logic/src/main/kotlin/-KmpConfigurationExtension.kt
@@ -23,17 +23,24 @@ import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 fun KmpConfigurationExtension.configureShared(
     java9ModuleName: String? = null,
     publish: Boolean = false,
-    explicitApi: Boolean = true,
     action: Action<KmpConfigurationContainerDsl>
 ) {
+    if (publish) {
+        require(!java9ModuleName.isNullOrBlank()) { "publications must specify a module-info name" }
+    }
+
     configure {
+        options {
+            useUniqueModuleNames = true
+        }
+
         jvm {
             kotlinJvmTarget = JavaVersion.VERSION_1_8
             compileSourceCompatibility = JavaVersion.VERSION_1_8
             compileTargetCompatibility = JavaVersion.VERSION_1_8
 
             @OptIn(ExperimentalKmpConfigurationApi::class)
-            java9MultiReleaseModuleInfo(java9ModuleName)
+            java9ModuleInfoName = java9ModuleName
         }
 
         js {
@@ -67,9 +74,7 @@ fun KmpConfigurationExtension.configureShared(
         mingwAll()
 
         common {
-            if (publish) {
-                pluginIds("publication")
-            }
+            if (publish) pluginIds("publication")
 
             sourceSetTest {
                 dependencies {
@@ -78,11 +83,7 @@ fun KmpConfigurationExtension.configureShared(
             }
         }
 
-        if (explicitApi) {
-            kotlin {
-                explicitApi()
-            }
-        }
+        if (publish) kotlin { explicitApi() }
 
         action.execute(this)
     }

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -13,44 +13,28 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
-import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin
-import org.jetbrains.kotlin.gradle.targets.js.npm.tasks.KotlinNpmInstallTask
 import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnPlugin
 import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnRootExtension
 
 plugins {
-    alias(libs.plugins.multiplatform) apply(false)
-    alias(libs.plugins.binaryCompat)
+    alias(libs.plugins.binary.compat)
+    alias(libs.plugins.kotlin.multiplatform) apply(false)
 }
 
 allprojects {
-
     findProperty("GROUP")?.let { group = it }
     findProperty("VERSION_NAME")?.let { version = it }
     findProperty("POM_DESCRIPTION")?.let { description = it.toString() }
 
     repositories {
         mavenCentral()
     }
-
 }
 
 plugins.withType<YarnPlugin> {
     the<YarnRootExtension>().lockFileDirectory = rootDir.resolve(".kotlin-js-store")
 }
 
-plugins.withType<NodeJsRootPlugin> {
-    the<NodeJsRootExtension>().apply {
-        nodeVersion = "21.0.0-v8-canary202309167e82ab1fa2"
-        nodeDownloadBaseUrl = "https://nodejs.org/download/v8-canary"
-    }
-
-    tasks.withType<KotlinNpmInstallTask>().configureEach {
-        args.add("--ignore-engines")
-    }
-}
-
 apiValidation {
     if (findProperty("CHECK_PUBLICATION") != null) {
         ignoredProjects.add("check-publication")

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,18 +1,20 @@
 [versions]
-binaryCompat = "0.14.0"
-configuration = "0.2.1"
-coroutines = "1.8.0"
-kotlin = "1.9.23"
-publish = "0.27.0"
+gradle-binary-compat = "0.14.0"
+gradle-kmp-configuration = "0.3.2"
+gradle-kotlin = "1.9.24"
+gradle-publish-maven = "0.29.0"
+
+# tests
+kotlinx-coroutines = "1.8.1"
 
 [libraries]
-gradle-kmp-configuration = { module = "io.matthewnelson:gradle-kmp-configuration-plugin", version.ref = "configuration" }
-gradle-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
-gradle-maven-publish = { module = "com.vanniktech:gradle-maven-publish-plugin", version.ref = "publish" }
+gradle-kmp-configuration = { module = "io.matthewnelson:gradle-kmp-configuration-plugin", version.ref = "gradle-kmp-configuration" }
+gradle-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "gradle-kotlin" }
+gradle-maven-publish = { module = "com.vanniktech:gradle-maven-publish-plugin", version.ref = "gradle-publish-maven" }
 
-# Tests
-kotlin-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
+# tests
+kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinx-coroutines" }
 
 [plugins]
-binaryCompat = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "binaryCompat" }
-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
+binary-compat = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "gradle-binary-compat" }
+kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "gradle-kotlin" }
diff --git a/secure-random/build.gradle.kts b/secure-random/build.gradle.kts
@@ -22,13 +22,13 @@ kmpConfiguration {
         linuxX64 {
             sourceSetTest {
                 dependencies {
-                    implementation(libs.kotlin.coroutines.test)
+                    implementation(libs.kotlinx.coroutines.test)
                 }
             }
         }
 
         kotlin {
-            sourceSets {
+            with(sourceSets) {
                 val linuxMain = findByName("linuxMain")
                 val androidNativeMain = findByName("androidNativeMain")
 

diff --git a/tools/check-publication/build.gradle.kts b/tools/check-publication/build.gradle.kts
@@ -35,7 +35,7 @@ repositories {
 }
 
 kmpConfiguration {
-    configureShared(explicitApi = false) {
+    configureShared {
         common {
             sourceSetMain {
                 dependencies {