Skip to content

Commit 1ca8859

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

2 files changed

Lines changed: 21 additions & 15 deletions

File tree

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

Lines changed: 17 additions & 9 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 =
@@ -192,8 +198,8 @@ extraJavaModuleInfo {
192198
exportAllPackages()
193199
requires("org.connid.framework") // this is missing in POM
194200
}
195-
module("io.tmio:tuweni-units", "tuweni.units")
196-
module("io.tmio:tuweni-bytes", "tuweni.bytes")
201+
module("io.consensys.tuweni:tuweni-bytes", "tuweni.bytes")
202+
module("io.consensys.tuweni:tuweni-units", "tuweni.units")
197203
module("net.i2p.crypto:eddsa", "net.i2p.crypto.eddsa")
198204
module("io.minio:minio", "io.minio") {
199205
exportAllPackages()
@@ -202,21 +208,23 @@ extraJavaModuleInfo {
202208
requiresStatic("com.github.spotbugs.annotations")
203209
}
204210
module("org.antlr:antlr4-runtime", "org.antlr.antlr4.runtime")
205-
module("org.hyperledger.besu.internal:algorithms", "org.hyperledger.besu.internal.crypto")
206-
module("org.hyperledger.besu.internal:rlp", "org.hyperledger.besu.internal.rlp")
211+
module(
212+
"org.hyperledger.besu.internal:besu-crypto-algorithms",
213+
"org.hyperledger.besu.internal.crypto",
214+
)
215+
module("org.hyperledger.besu.internal:besu-ethereum-rlp", "org.hyperledger.besu.internal.rlp")
216+
module("org.hyperledger.besu.internal:besu-util", "org.hyperledger.besu.internal.util")
217+
module("org.hyperledger.besu:boringssl", "org.hyperledger.besu.nativelib.boringssl")
207218
module("org.hyperledger.besu:arithmetic", "org.hyperledger.besu.nativelib.arithmetic")
208219
module("org.hyperledger.besu:blake2bf", "org.hyperledger.besu.nativelib.blake2bf")
209220
module("org.hyperledger.besu:bls12-381", "org.hyperledger.besu.nativelib.bls12_381")
210221
module("org.hyperledger.besu:besu-datatypes", "org.hyperledger.besu.datatypes")
211222
module("org.hyperledger.besu:besu-native-common", "org.hyperledger.besu.nativelib.common")
212-
module("org.hyperledger.besu:evm", "org.hyperledger.besu.evm") {
213-
exportAllPackages()
214-
requireAllDefinedDependencies()
215-
requiresStatic("com.fasterxml.jackson.annotation")
216-
}
223+
module("org.hyperledger.besu:besu-evm", "org.hyperledger.besu.evm")
217224
module("org.hyperledger.besu:secp256k1", "org.hyperledger.besu.nativelib.secp256k1")
218225
module("org.hyperledger.besu:secp256r1", "org.hyperledger.besu.nativelib.secp256r1")
219226
module("org.hyperledger.besu:gnark", "org.hyperledger.besu.nativelib.gnark")
227+
module("io.vertx:vertx-core", "io.vertx.core")
220228
module("com.goterl:resource-loader", "com.goterl.resourceloader")
221229
module("com.goterl:lazysodium-java", "com.goterl.lazysodium")
222230
// 'io.consensys.protocols' replaces 'tech.pegasys' in org.hyperledger.besu:evm:25.x

src/test/kotlin/org/hiero/gradle/test/JpmsPatchTest.kt

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class JpmsPatchTest {
1313
val p = GradleProject().withMinimalStructure()
1414
val versionPatching =
1515
"""
16-
configurations.all { attributes.attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, 21) }
16+
configurations.all { attributes.attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, 25) }
1717
dependencies.components.withModule("com.goterl:resource-loader") { this.status = "release" }
1818
dependencies.components.withModule("com.goterl:lazysodium-java") { this.status = "release" }
1919
dependencies.components.all { if(listOf("alpha", "beta", "rc", "cr", ".m").any { id.version.lowercase().contains(it) }) status = "integration" }
@@ -30,21 +30,19 @@ class JpmsPatchTest {
3030
val modules = extraJavaModuleInfo.moduleSpecs.get().values.map { it.identifier }
3131
dependencies {
3232
api(platform("io.netty:netty-bom:latest.release"))
33-
api(platform("org.hyperledger.besu:bom:24.+")) // Keep Besu on 24 versions, updating to 25 requires changes to module coordinates
3433
}
3534
dependencies.constraints {
3635
modules.forEach {
37-
if (!it.startsWith("org.hyperledger.besu") && !it.startsWith("com.squareup.okhttp3")) {
38-
api("${'$'}it:latest.release")
39-
}
36+
api("${'$'}it:latest.release")
4037
}
4138
api("com.squareup.okhttp3:okhttp:4.+!!") // Keep okhttp on 4.x as this is currently only used transitively
39+
api("io.vertx:vertx-core:4.+!!") // Keep vertx-core on 4.x as this is currently only used transitively
4240
api("org.jetbrains:annotations:latest.release")
4341
api("org.mockito:mockito-core:latest.release")
4442
api("org.mockito:mockito-junit-jupiter:latest.release")
4543
api("com.google.guava:guava:latest.release")
4644
}
47-
"""
45+
"""
4846
.trimIndent()
4947
)
5048
p.moduleBuildFile(

0 commit comments

Comments
 (0)