Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove the need for the uber jar #924

Draft
wants to merge 2 commits into
base: arith-dev
Choose a base branch
from
Draft

Remove the need for the uber jar #924

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1911f3e
Remove the need for the uber jar
fab-10 Aug 12, 2024
7472893
Merge branch 'arith-dev' into feat/issue-923/remove-the-need-for-the-…
powerslider Aug 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 9 additions & 15 deletions arithmetization/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,21 +36,21 @@ apply from: rootProject.file("gradle/trace-files.gradle")
dependencies {
// annotationProcessor generates the file META-INF/services/org.hyperledger.besu.plugin.BesuPlugin
annotationProcessor 'com.google.auto.service:auto-service'
compileOnly "${besuArtifactGroup}:evm"
compileOnly 'com.google.auto.service:auto-service'
compileOnly 'com.google.auto.service:auto-service-annotations'
implementation 'com.google.auto.service:auto-service'
implementation 'com.google.auto.service:auto-service-annotations'

implementation "${besuArtifactGroup}:besu-datatypes"
implementation "${besuArtifactGroup}:evm"
implementation "${besuArtifactGroup}:plugin-api"
implementation "${besuArtifactGroup}:besu-datatypes"
implementation "${besuArtifactGroup}.internal:api:${besuVersion}"
implementation "${besuArtifactGroup}.internal:core:${besuVersion}"
implementation "${besuArtifactGroup}.internal:rlp:${besuVersion}"
implementation "${besuArtifactGroup}.internal:algorithms:${besuVersion}"
implementation "${besuArtifactGroup}.internal:algorithms"
implementation "${besuArtifactGroup}.internal:api"
implementation "${besuArtifactGroup}.internal:core"
implementation "${besuArtifactGroup}.internal:rlp"


implementation 'info.picocli:picocli'

compileOnly 'io.vertx:vertx-core'
implementation 'io.vertx:vertx-core'

implementation 'com.fasterxml.jackson.core:jackson-databind'
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'
Expand All @@ -60,12 +60,6 @@ dependencies {
implementation 'io.tmio:tuweni-toml'
implementation 'org.bouncycastle:bcprov-jdk18on'
implementation 'org.hibernate.validator:hibernate-validator'

testImplementation "${besuArtifactGroup}:evm"
testImplementation "${besuArtifactGroup}:besu-datatypes"
testImplementation "${besuArtifactGroup}.internal:core:${besuVersion}"
testImplementation "${besuArtifactGroup}.internal:rlp:${besuVersion}"
testImplementation "${besuArtifactGroup}.internal:core:${besuVersion}"
}

configurations {
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
releaseVersion=0.3.0-rc2
releaseVersion=0.3.0-rc2-local
besuVersion=24.7-develop-c0029e6
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should also be reverted back.

besuArtifactGroup=io.consensys.linea-besu
distributionIdentifier=linea-tracer
Expand Down
104 changes: 61 additions & 43 deletions gradle/dependency-management.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ repositories {
content { includeGroupByRegex('com\\.splunk\\..*') }
}
mavenCentral()
mavenLocal()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suppose we should remove this before merging?

}

configurations.all {
Expand All @@ -48,80 +49,97 @@ dependencyManagement {
}

dependencies {
dependencySet(group: 'io.tmio', version: '2.4.2') {
entry 'tuweni-bytes'
entry 'tuweni-net'
entry 'tuweni-toml'
entry 'tuweni-units'
// Besu dependencies
dependencySet(group: "${besuArtifactGroup}", version: "${besuVersion}") {
entry "besu-datatypes"
entry "evm"
entry "plugin-api"
}

dependencySet(group: 'org.bouncycastle', version: '1.75') {
entry 'bcpkix-jdk18on'
entry 'bcprov-jdk18on'
entry 'jcajce'
// Besu internal dependencies
dependencySet(group: "${besuArtifactGroup}.internal", version: "${besuVersion}") {
entry "algorithms"
entry "api"
entry "config"
entry "core"
entry "dsl"
entry "eth"
entry "metrics-core"
entry "referencetests"
entry "rlp"
entry "testutil"
entry "trie"
entry "util"
}

dependency 'commons-io:commons-io:2.11.0'

dependency 'com.fasterxml.jackson.core:jackson-databind:2.15.2'
dependency 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.15.2'
dependency 'com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.15.2'

dependency 'commons-io:commons-io:2.11.0'
dependency 'org.apache.commons:commons-lang3:3.13.0'
dependency 'com.google.guava:guava:32.1.2-jre'

// Besu dependencies
dependency 'com.google.auto.service:auto-service:1.0.1'

dependencySet(group: "${besuArtifactGroup}", version: "${besuVersion}") {
entry "besu-datatypes"
entry "evm"
entry "plugin-api"
}
dependency 'com.google.guava:guava:32.1.2-jre'

// Logging dependencies
dependency 'org.slf4j:slf4j-api:2.0.7'
dependencySet(group: 'ch.qos.logback', version: '1.4.9') {
entry 'logback-core'
entry 'logback-classic'
}
dependency 'com.slack.api:slack-api-client:1.32.1'

// auto service
dependency 'com.google.auto.service:auto-service:1.0.1'
dependency 'com.splunk.logging:splunk-library-javalogging:1.11.5'

dependencySet(group: 'info.picocli', version: '4.7.1') {
entry 'picocli'
entry 'picocli-codegen'
}

dependencySet(group: 'org.web3j', version: '4.9.7') {
entry 'abi'
entry 'besu'
entry 'core'
entry 'crypto'
dependencySet(group: 'io.tmio', version: '2.4.2') {
entry 'tuweni-bytes'
entry 'tuweni-net'
entry 'tuweni-toml'
entry 'tuweni-units'
}

dependency 'io.vertx:vertx-core:4.3.8'

dependency 'junit:junit:4.13.2'

dependency 'org.apache.commons:commons-lang3:3.13.0'

dependency 'org.assertj:assertj-core:3.25.1'

dependency 'org.awaitility:awaitility:4.2.0'

dependencySet(group: 'org.bouncycastle', version: '1.75') {
entry 'bcpkix-jdk18on'
entry 'bcprov-jdk18on'
entry 'jcajce'
}

dependency 'org.hibernate.validator:hibernate-validator:8.0.1.Final'

dependency 'org.junit.vintage:junit-vintage-engine:5.10.2'
dependencySet(group: 'org.junit.jupiter', version: '5.10.2') {
entry 'junit-jupiter-api'
entry 'junit-jupiter-engine'
entry 'junit-jupiter-params'
}

dependencySet(group: 'org.mockito', version: '5.12.0') {
entry 'mockito-core'
entry 'mockito-junit-jupiter'
}

dependency 'org.assertj:assertj-core:3.25.1'
dependency 'org.awaitility:awaitility:4.2.0'

dependency 'com.splunk.logging:splunk-library-javalogging:1.11.5'

dependency 'io.vertx:vertx-core:4.3.8'

dependency 'com.slack.api:slack-api-client:1.32.1'

dependency 'org.hibernate.validator:hibernate-validator:8.0.1.Final'
// Logging dependencies
dependency 'org.slf4j:slf4j-api:2.0.7'
dependencySet(group: 'ch.qos.logback', version: '1.4.9') {
entry 'logback-core'
entry 'logback-classic'
}

dependency 'net.java.dev.jna:jna:5.12.1'
dependencySet(group: 'org.web3j', version: '4.9.7') {
entry 'abi'
entry 'besu'
entry 'core'
entry 'crypto'
}
}
}
9 changes: 0 additions & 9 deletions gradle/dist.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import de.undercouch.gradle.tasks.download.Download

/*
* Copyright Consensys Software Inc.
*
Expand Down Expand Up @@ -40,13 +38,6 @@ jar {
'Implementation-Version': calculateVersion()
)
}

from {
configurations.runtimeClasspath.filter( {! (it.name =~ /log4j.*\.jar/ ) && ! (it.name =~ /vertx.*\.jar/ )} )
.collect {it.isDirectory() ? it : zipTree(it) }
}
exclude 'META-INF/*.RSA', 'META-INF/*.SF', 'META-INF/*.DSA'
duplicatesStrategy(DuplicatesStrategy.INCLUDE)
}

// Takes the version, and if -SNAPSHOT is part of it replaces SNAPSHOT
Expand Down
1 change: 0 additions & 1 deletion gradle/versions.gradle
View file
Open in desktop

This file was deleted.

19 changes: 10 additions & 9 deletions reference-tests/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,16 +85,17 @@ dependencies {
testImplementation project(":arithmetization")
testImplementation "${besuArtifactGroup}:besu-datatypes"
testImplementation "${besuArtifactGroup}:evm"
testImplementation "${besuArtifactGroup}.internal:config:${besuVersion}"
testImplementation "${besuArtifactGroup}.internal:core:${besuVersion}"
testImplementation "${besuArtifactGroup}.internal:algorithms:${besuVersion}"
testImplementation "${besuArtifactGroup}.internal:metrics-core:${besuVersion}"
testImplementation "${besuArtifactGroup}.internal:referencetests:${besuVersion}"
testImplementation "${besuArtifactGroup}.internal:rlp:${besuVersion}"
testImplementation "${besuArtifactGroup}.internal:testutil:${besuVersion}"
testImplementation "${besuArtifactGroup}.internal:trie:$besuVersion"
testImplementation "${besuArtifactGroup}.internal:util:${besuVersion}"
testImplementation "${besuArtifactGroup}:plugin-api"
testImplementation "${besuArtifactGroup}.internal:algorithms"
testImplementation "${besuArtifactGroup}.internal:config"
testImplementation "${besuArtifactGroup}.internal:core"
testImplementation "${besuArtifactGroup}.internal:metrics-core"
testImplementation "${besuArtifactGroup}.internal:referencetests"
testImplementation "${besuArtifactGroup}.internal:rlp"
testImplementation "${besuArtifactGroup}.internal:testutil"
testImplementation "${besuArtifactGroup}.internal:trie"
testImplementation "${besuArtifactGroup}.internal:util"


testImplementation 'io.tmio:tuweni-bytes'
testImplementation 'io.tmio:tuweni-units'
Expand Down
Loading