Skip to content

Commit

Permalink
Use requires transitive declarations for core jpms module-info
Browse files Browse the repository at this point in the history
  • Loading branch information
05nelsonm committed Aug 30, 2024
1 parent 2522117 commit 3f05e4c
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 14 deletions.
4 changes: 2 additions & 2 deletions build-logic/src/main/kotlin/-KmpConfigurationExtension.kt
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ fun KmpConfigurationExtension.configureShared(
mingwAll()

common {
if (publish) { pluginIds("publication") }
if (publish) pluginIds("publication")

sourceSetTest {
dependencies {
Expand All @@ -86,7 +86,7 @@ fun KmpConfigurationExtension.configureShared(
}
}

if (publish) { kotlin { explicitApi() } }
if (publish) kotlin { explicitApi() }

action.execute(this)
}
Expand Down
2 changes: 0 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,13 @@ plugins {
}

allprojects {

findProperty("GROUP")?.let { group = it }
findProperty("VERSION_NAME")?.let { version = it }
findProperty("POM_DESCRIPTION")?.let { description = it.toString() }

repositories {
mavenCentral()
}

}

plugins.withType<YarnPlugin> {
Expand Down
5 changes: 2 additions & 3 deletions library/base16/src/jvmMain/java9/module-info.java
Original file line number Diff line number Diff line change
@@ -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;
}
5 changes: 2 additions & 3 deletions library/base32/src/jvmMain/java9/module-info.java
Original file line number Diff line number Diff line change
@@ -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;
}
5 changes: 2 additions & 3 deletions library/base64/src/jvmMain/java9/module-info.java
Original file line number Diff line number Diff line change
@@ -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;
}
2 changes: 1 addition & 1 deletion library/core/src/jvmMain/java9/module-info.java
Original file line number Diff line number Diff line change
@@ -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;
Expand Down

0 comments on commit 3f05e4c

Please sign in to comment.