From 3f05e4c020388ef15f4cdcd7f0523fde13f26893 Mon Sep 17 00:00:00 2001 From: Matthew Nelson Date: Fri, 30 Aug 2024 10:27:59 -0400 Subject: [PATCH] Use requires transitive declarations for core jpms module-info --- build-logic/src/main/kotlin/-KmpConfigurationExtension.kt | 4 ++-- build.gradle.kts | 2 -- library/base16/src/jvmMain/java9/module-info.java | 5 ++--- library/base32/src/jvmMain/java9/module-info.java | 5 ++--- library/base64/src/jvmMain/java9/module-info.java | 5 ++--- library/core/src/jvmMain/java9/module-info.java | 2 +- 6 files changed, 9 insertions(+), 14 deletions(-) diff --git a/build-logic/src/main/kotlin/-KmpConfigurationExtension.kt b/build-logic/src/main/kotlin/-KmpConfigurationExtension.kt index 4beb9fd..9332725 100644 --- a/build-logic/src/main/kotlin/-KmpConfigurationExtension.kt +++ b/build-logic/src/main/kotlin/-KmpConfigurationExtension.kt @@ -77,7 +77,7 @@ fun KmpConfigurationExtension.configureShared( mingwAll() common { - if (publish) { pluginIds("publication") } + if (publish) pluginIds("publication") sourceSetTest { dependencies { @@ -86,7 +86,7 @@ fun KmpConfigurationExtension.configureShared( } } - if (publish) { kotlin { explicitApi() } } + if (publish) kotlin { explicitApi() } action.execute(this) } diff --git a/build.gradle.kts b/build.gradle.kts index 25c4fac..344fdff 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -22,7 +22,6 @@ plugins { } allprojects { - findProperty("GROUP")?.let { group = it } findProperty("VERSION_NAME")?.let { version = it } findProperty("POM_DESCRIPTION")?.let { description = it.toString() } @@ -30,7 +29,6 @@ allprojects { repositories { mavenCentral() } - } plugins.withType { diff --git a/library/base16/src/jvmMain/java9/module-info.java b/library/base16/src/jvmMain/java9/module-info.java index 6f41f14..c7c5d8d 100644 --- a/library/base16/src/jvmMain/java9/module-info.java +++ b/library/base16/src/jvmMain/java9/module-info.java @@ -1,7 +1,6 @@ -@SuppressWarnings("JavaModuleNaming") +@SuppressWarnings("module") module io.matthewnelson.encoding.base16 { - requires kotlin.stdlib; - requires io.matthewnelson.encoding.core; + requires transitive io.matthewnelson.encoding.core; exports io.matthewnelson.encoding.base16; } diff --git a/library/base32/src/jvmMain/java9/module-info.java b/library/base32/src/jvmMain/java9/module-info.java index 9566956..31086a6 100644 --- a/library/base32/src/jvmMain/java9/module-info.java +++ b/library/base32/src/jvmMain/java9/module-info.java @@ -1,7 +1,6 @@ -@SuppressWarnings("JavaModuleNaming") +@SuppressWarnings("module") module io.matthewnelson.encoding.base32 { - requires kotlin.stdlib; - requires io.matthewnelson.encoding.core; + requires transitive io.matthewnelson.encoding.core; exports io.matthewnelson.encoding.base32; } diff --git a/library/base64/src/jvmMain/java9/module-info.java b/library/base64/src/jvmMain/java9/module-info.java index 0d604ae..515b5bd 100644 --- a/library/base64/src/jvmMain/java9/module-info.java +++ b/library/base64/src/jvmMain/java9/module-info.java @@ -1,7 +1,6 @@ -@SuppressWarnings("JavaModuleNaming") +@SuppressWarnings("module") module io.matthewnelson.encoding.base64 { - requires kotlin.stdlib; - requires io.matthewnelson.encoding.core; + requires transitive io.matthewnelson.encoding.core; exports io.matthewnelson.encoding.base64; } diff --git a/library/core/src/jvmMain/java9/module-info.java b/library/core/src/jvmMain/java9/module-info.java index 15c7ff1..473fae2 100644 --- a/library/core/src/jvmMain/java9/module-info.java +++ b/library/core/src/jvmMain/java9/module-info.java @@ -1,5 +1,5 @@ module io.matthewnelson.encoding.core { - requires kotlin.stdlib; + requires transitive kotlin.stdlib; exports io.matthewnelson.encoding.core; exports io.matthewnelson.encoding.core.util;