Add module-info.java files for all publications

05nelsonm · Mar 10, 2024 · 9897568 · 9897568
1 parent b14f0c2
commit 9897568
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 7 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
 
 fun KmpConfigurationExtension.configureShared(
+    java9ModuleName: String? = null,
     publish: Boolean = false,
     explicitApi: Boolean = true,
     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/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 gradle-binary-compat = "0.14.0"
-gradle-kmp-configuration = "0.2.0"
+gradle-kmp-configuration = "0.2.1"
 gradle-kotlin = "1.9.23"
 gradle-publish-maven = "0.27.0"
 

diff --git a/library/base16/build.gradle.kts b/library/base16/build.gradle.kts
@@ -19,7 +19,7 @@ plugins {
 }
 
 kmpConfiguration {
-    configureShared(publish = true) {
+    configureShared(java9ModuleName = "io.matthewnelson.encoding.base16", publish = true) {
         common {
             sourceSetMain {
                 dependencies {

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

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

diff --git a/library/base64/src/jvmMain/java9/module-info.java b/library/base64/src/jvmMain/java9/module-info.java
@@ -0,0 +1,6 @@
+module io.matthewnelson.encoding.base64 {
+    requires kotlin.stdlib;
+    requires io.matthewnelson.encoding.core;
+
+    exports io.matthewnelson.encoding.base64;
+}
diff --git a/library/core/build.gradle.kts b/library/core/build.gradle.kts
@@ -19,5 +19,5 @@ plugins {
 }
 
 kmpConfiguration {
-    configureShared(publish = true) {}
+    configureShared(java9ModuleName = "io.matthewnelson.encoding.core", publish = true) {}
 }
diff --git a/library/core/src/jvmMain/java9/module-info.java b/library/core/src/jvmMain/java9/module-info.java
@@ -0,0 +1,6 @@
+module io.matthewnelson.encoding.core {
+    requires kotlin.stdlib;
+
+    exports io.matthewnelson.encoding.core;
+    exports io.matthewnelson.encoding.core.util;
+}