Add JPMS support via Multi-Release Jar

KotlinCrypto · Mar 18, 2024 · b90e1ab · b90e1ab
1 parent ff04c4e
commit b90e1ab
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 6 deletions.
diff --git a/build-logic/src/main/kotlin/-KmpConfigurationExtension.kt b/build-logic/src/main/kotlin/-KmpConfigurationExtension.kt
@@ -13,23 +13,26 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
+import io.matthewnelson.kmp.configuration.ExperimentalKmpConfigurationApi
 import io.matthewnelson.kmp.configuration.extension.KmpConfigurationExtension
 import io.matthewnelson.kmp.configuration.extension.container.target.KmpConfigurationContainerDsl
 import org.gradle.api.Action
 import org.gradle.api.JavaVersion
 import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 
 fun KmpConfigurationExtension.configureShared(
+    java9ModuleName: String? = null,
     publish: Boolean = false,
     action: Action<KmpConfigurationContainerDsl>
 ) {
     configure {
         jvm {
-            target { withJava() }
-
             kotlinJvmTarget = JavaVersion.VERSION_1_8
             compileSourceCompatibility = JavaVersion.VERSION_1_8
             compileTargetCompatibility = JavaVersion.VERSION_1_8
+
+            @OptIn(ExperimentalKmpConfigurationApi::class)
+            java9MultiReleaseModuleInfo(java9ModuleName)
         }
 
         js()

diff --git a/library/common/build.gradle.kts b/library/common/build.gradle.kts
@@ -18,5 +18,5 @@ plugins {
 }
 
 kmpConfiguration {
-    configureShared(publish = true) {}
+    configureShared(java9ModuleName = "org.kotlincrypto.core", publish = true) {}
 }
diff --git a/library/common/src/jvmMain/java9/module-info.java b/library/common/src/jvmMain/java9/module-info.java
@@ -0,0 +1,5 @@
+module org.kotlincrypto.core {
+    requires kotlin.stdlib;
+
+    exports org.kotlincrypto.core;
+}
diff --git a/library/digest/build.gradle.kts b/library/digest/build.gradle.kts
@@ -18,7 +18,7 @@ plugins {
 }
 
 kmpConfiguration {
-    configureShared(publish = true) {
+    configureShared(java9ModuleName = "org.kotlincrypto.core.digest", publish = true) {
         common {
             sourceSetMain {
                 dependencies {

diff --git a/library/digest/src/jvmMain/java9/module-info.java b/library/digest/src/jvmMain/java9/module-info.java
@@ -0,0 +1,7 @@
+module org.kotlincrypto.core.digest {
+    requires kotlin.stdlib;
+    requires org.kotlincrypto.core;
+
+    exports org.kotlincrypto.core.digest;
+    exports org.kotlincrypto.core.digest.internal;
+}
diff --git a/library/mac/build.gradle.kts b/library/mac/build.gradle.kts
@@ -18,7 +18,7 @@ plugins {
 }
 
 kmpConfiguration {
-    configureShared(publish = true) {
+    configureShared(java9ModuleName = "org.kotlincrypto.core.mac", publish = true) {
         common {
             sourceSetMain {
                 dependencies {

diff --git a/library/mac/src/jvmMain/java9/module-info.java b/library/mac/src/jvmMain/java9/module-info.java
@@ -0,0 +1,6 @@
+module org.kotlincrypto.core.mac {
+    requires kotlin.stdlib;
+    requires org.kotlincrypto.core;
+
+    exports org.kotlincrypto.core.mac;
+}
diff --git a/library/xof/build.gradle.kts b/library/xof/build.gradle.kts
@@ -18,7 +18,7 @@ plugins {
 }
 
 kmpConfiguration {
-    configureShared(publish = true) {
+    configureShared(java9ModuleName = "org.kotlincrypto.core.xof", publish = true) {
         common {
             sourceSetMain {
                 dependencies {

diff --git a/library/xof/src/jvmMain/java9/module-info.java b/library/xof/src/jvmMain/java9/module-info.java
@@ -0,0 +1,7 @@
+module org.kotlincrypto.core.xof {
+    requires kotlin.stdlib;
+    requires org.kotlincrypto.core;
+    requires org.kotlincrypto.endians;
+
+    exports org.kotlincrypto.core.xof;
+}