Skip to content

Commit b48c7a0

Browse files
committed
feat: add rules for besu 1.4+
Signed-off-by: Jendrik Johannes <jendrik@onepiece.software>
1 parent 0bbaffd commit b48c7a0

2 files changed

Lines changed: 9 additions & 11 deletions

File tree

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ dependencies {
2929
implementation("me.champeau.jmh:jmh-gradle-plugin:0.7.3")
3030
implementation("net.swiftzer.semver:semver:2.1.0")
3131
implementation("org.gradlex:extra-java-module-info:1.14.2")
32-
implementation("org.gradlex:java-module-dependencies:1.12.2")
32+
implementation("org.gradlex:java-module-dependencies:1.13.2")
3333
implementation("org.gradlex:java-module-testing:1.8.1")
3434
implementation("org.gradlex:jvm-dependency-conflict-resolution:2.5")
3535

src/main/kotlin/org.hiero.gradle.base.jpms-modules.gradle.kts

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,12 @@ jvmDependencyConflicts.patch {
5656
addRuntimeOnlyDependency("commons-io:commons-io")
5757
addRuntimeOnlyDependency("org.apache.commons:commons-lang3")
5858
}
59+
module("org.hyperledger.besu:besu-datatypes") {
60+
addCompileOnlyApiDependency("com.fasterxml.jackson.core:jackson-annotations")
61+
}
62+
module("org.hyperledger.besu:besu-evm") {
63+
addCompileOnlyApiDependency("com.fasterxml.jackson.core:jackson-annotations")
64+
}
5965

6066
// Reduce scope of transitively added annotation libraries
6167
val annotationLibrariesCompileTime =
@@ -212,17 +218,9 @@ extraJavaModuleInfo {
212218
module("org.hyperledger.besu:arithmetic", "org.hyperledger.besu.nativelib.arithmetic")
213219
module("org.hyperledger.besu:blake2bf", "org.hyperledger.besu.nativelib.blake2bf")
214220
module("org.hyperledger.besu:bls12-381", "org.hyperledger.besu.nativelib.bls12_381")
215-
module("org.hyperledger.besu:besu-datatypes", "org.hyperledger.besu.datatypes") {
216-
exportAllPackages()
217-
requireAllDefinedDependencies()
218-
requiresStatic("com.fasterxml.jackson.annotation")
219-
}
221+
module("org.hyperledger.besu:besu-datatypes", "org.hyperledger.besu.datatypes")
220222
module("org.hyperledger.besu:besu-native-common", "org.hyperledger.besu.nativelib.common")
221-
module("org.hyperledger.besu:besu-evm", "org.hyperledger.besu.evm") {
222-
exportAllPackages()
223-
requireAllDefinedDependencies()
224-
requiresStatic("com.fasterxml.jackson.annotation")
225-
}
223+
module("org.hyperledger.besu:besu-evm", "org.hyperledger.besu.evm")
226224
module("org.hyperledger.besu:secp256k1", "org.hyperledger.besu.nativelib.secp256k1")
227225
module("org.hyperledger.besu:secp256r1", "org.hyperledger.besu.nativelib.secp256r1")
228226
module("org.hyperledger.besu:gnark", "org.hyperledger.besu.nativelib.gnark")

0 commit comments

Comments
 (0)