From 49be4274791ac2173d5c08fa7d1700fc48640a31 Mon Sep 17 00:00:00 2001 From: Matthew Nelson Date: Mon, 18 Mar 2024 19:46:48 -0400 Subject: [PATCH] Use keyword `transitive` when requiring modules (#60) --- README.md | 2 +- gradle/libs.versions.toml | 2 +- library/md/src/jvmMain/java9/module-info.java | 3 +-- library/sha1/src/jvmMain/java9/module-info.java | 3 +-- library/sha2/src/jvmMain/java9/module-info.java | 3 +-- library/sha3/src/jvmMain/java9/module-info.java | 5 ++--- 6 files changed, 7 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 1b70a0c..7791cbe 100644 --- a/README.md +++ b/README.md @@ -147,7 +147,7 @@ dependencies { [badge-kotlin]: https://img.shields.io/badge/kotlin-1.9.23-blue.svg?logo=kotlin -[badge-core]: https://img.shields.io/badge/kotlincrypto.core-0.5.0-blue.svg +[badge-core]: https://img.shields.io/badge/kotlincrypto.core-0.5.1-blue.svg [badge-endians]: https://img.shields.io/badge/kotlincrypto.endians-0.3.0-blue.svg [badge-sponges]: https://img.shields.io/badge/kotlincrypto.sponges-0.3.0-blue.svg diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 98c3b85..9a8fd1c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,7 @@ androidxTestRunner = "1.5.2" binaryCompat = "0.14.0" bouncyCastle = "1.73" configuration = "0.2.1" -cryptoCore = "0.5.0" +cryptoCore = "0.5.1" encoding = "2.2.1" endians = "0.3.0" kotlin = "1.9.23" diff --git a/library/md/src/jvmMain/java9/module-info.java b/library/md/src/jvmMain/java9/module-info.java index b9d7701..0420225 100644 --- a/library/md/src/jvmMain/java9/module-info.java +++ b/library/md/src/jvmMain/java9/module-info.java @@ -1,7 +1,6 @@ module org.kotlincrypto.hash.md { requires kotlin.stdlib; - requires org.kotlincrypto.core; - requires org.kotlincrypto.core.digest; + requires transitive org.kotlincrypto.core.digest; exports org.kotlincrypto.hash.md; } diff --git a/library/sha1/src/jvmMain/java9/module-info.java b/library/sha1/src/jvmMain/java9/module-info.java index ec5e05d..7bc3969 100644 --- a/library/sha1/src/jvmMain/java9/module-info.java +++ b/library/sha1/src/jvmMain/java9/module-info.java @@ -1,8 +1,7 @@ @SuppressWarnings("JavaModuleNaming") module org.kotlincrypto.hash.sha1 { requires kotlin.stdlib; - requires org.kotlincrypto.core; - requires org.kotlincrypto.core.digest; + requires transitive org.kotlincrypto.core.digest; exports org.kotlincrypto.hash.sha1; } diff --git a/library/sha2/src/jvmMain/java9/module-info.java b/library/sha2/src/jvmMain/java9/module-info.java index a6a9903..55cc0dc 100644 --- a/library/sha2/src/jvmMain/java9/module-info.java +++ b/library/sha2/src/jvmMain/java9/module-info.java @@ -1,8 +1,7 @@ @SuppressWarnings("JavaModuleNaming") module org.kotlincrypto.hash.sha2 { requires kotlin.stdlib; - requires org.kotlincrypto.core; - requires org.kotlincrypto.core.digest; + requires transitive org.kotlincrypto.core.digest; exports org.kotlincrypto.hash.sha2; } diff --git a/library/sha3/src/jvmMain/java9/module-info.java b/library/sha3/src/jvmMain/java9/module-info.java index b00dd88..c956071 100644 --- a/library/sha3/src/jvmMain/java9/module-info.java +++ b/library/sha3/src/jvmMain/java9/module-info.java @@ -1,9 +1,8 @@ @SuppressWarnings("JavaModuleNaming") module org.kotlincrypto.hash.sha3 { requires kotlin.stdlib; - requires org.kotlincrypto.core; - requires org.kotlincrypto.core.digest; - requires org.kotlincrypto.core.xof; + requires transitive org.kotlincrypto.core.digest; + requires transitive org.kotlincrypto.core.xof; requires org.kotlincrypto.endians; requires org.kotlincrypto.sponges.keccak;