Add JPMS support via Multi-Release jar (#62)

05nelsonm · Mar 12, 2024 · fc8f8a8 · fc8f8a8
1 parent b17fe6e
commit fc8f8a8
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -165,7 +165,7 @@ dependencies {
 [badge-license]: https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat
 
 <!-- TAG_DEPENDENCIES -->
-[badge-kotlin]: https://img.shields.io/badge/kotlin-1.9.22-blue.svg?logo=kotlin
+[badge-kotlin]: https://img.shields.io/badge/kotlin-1.9.23-blue.svg?logo=kotlin
 
 <!-- TAG_PLATFORMS -->
 [badge-platform-android]: http://img.shields.io/badge/-android-6EDB8D.svg?style=flat

diff --git a/build-logic/src/main/kotlin/-KmpConfigurationExtension.kt b/build-logic/src/main/kotlin/-KmpConfigurationExtension.kt
@@ -13,12 +13,14 @@
  * 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,
     action: Action<KmpConfigurationContainerDsl>
 ) {
@@ -27,6 +29,9 @@ fun KmpConfigurationExtension.configureShared(
             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
@@ -2,12 +2,12 @@
 androidx-test-core = "1.5.0"
 androidx-test-runner = "1.5.2"
 
-encoding = "2.1.0"
+encoding = "2.2.0"
 
 gradle-android = "8.1.4"
 gradle-binary-compat = "0.14.0"
-gradle-kmp-configuration = "0.2.0"
-gradle-kotlin = "1.9.22"
+gradle-kmp-configuration = "0.2.1"
+gradle-kotlin = "1.9.23"
 gradle-publish-maven = "0.27.0"
 
 kotlincrypto-hash = "0.4.0"

diff --git a/library/file/build.gradle.kts b/library/file/build.gradle.kts
@@ -20,7 +20,7 @@ plugins {
 private val testConfig = TestConfigInject()
 
 kmpConfiguration {
-    configureShared(publish = true) {
+    configureShared(java9ModuleName = "io.matthewnelson.kmp.file", publish = true) {
         common {
             sourceSetTest {
                 kotlin.srcDir(testConfig.testConfigSrcDir)

diff --git a/library/file/src/jvmMain/java9/module-info.java b/library/file/src/jvmMain/java9/module-info.java
@@ -0,0 +1,5 @@
+module io.matthewnelson.kmp.file {
+    requires kotlin.stdlib;
+
+    exports io.matthewnelson.kmp.file;
+}