Skip to content

Commit 98b2762

Browse files
gtebreangtebrean
committed
update gradle and java
1 parent 027aa41 commit 98b2762

File tree

20 files changed

+102
-38
lines changed

20 files changed

+102
-38
lines changed

‎abi/build.gradle

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
1+
plugins {
2+
id 'java-library'
3+
}
14

25
description 'Ethereum Application Binary Interface (ABI) for working with smart contracts'
36

47
dependencies {
5-
compile project(':utils')
8+
api project(':utils')
69
}
10+
11+
tasks.named("spotlessJava").configure { dependsOn("spotlessGroovyGradle","compileJava","compileTestJava","javadoc") }
12+
tasks.named("spotlessKotlin").configure { dependsOn("compileJava","spotlessJava", "spotlessGroovyGradle","compileTestJava","processTestResources","javadoc") }

‎besu/build.gradle

+8-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1-
1+
plugins {
2+
id 'java-library'
3+
}
24
description 'Besu JSON-RPC API'
35

46
dependencies {
5-
compile project(':eea')
6-
testCompile project(path: ':core', configuration: 'testArtifacts')
7+
api project(':eea')
8+
testImplementation project(path: ':core', configuration: 'testArtifacts')
79
}
10+
11+
tasks.named("spotlessJava").configure { dependsOn("spotlessGroovyGradle","compileJava","compileTestJava","javadoc") }
12+
tasks.named("spotlessKotlin").configure { dependsOn("compileJava","spotlessJava", "spotlessGroovyGradle","compileTestJava","processTestResources","javadoc") }

‎build.gradle

+7-4
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ plugins {
1212

1313

1414
ext {
15-
bouncycastleVersion = '1.70'
15+
bouncycastleVersion = '1.73'
1616
jacksonVersion = '2.14.2'
1717
javaPoetVersion = '1.7.0'
1818
kotlinVersion = '1.3.72'
@@ -24,7 +24,7 @@ ext {
2424
javaWebSocketVersion = '1.5.3'
2525
picocliVersion = '3.0.0'
2626
// test dependencies
27-
equalsverifierVersion = '3.5.5'
27+
equalsverifierVersion = '3.14.1'
2828
junitVersion = '5.5.2'
2929
web3jUnitVersion = '4.9.7'
3030
junitBenchmarkVersion = '0.7.2'
@@ -71,8 +71,8 @@ allprojects {
7171
}
7272

7373
dependencies {
74-
testCompile "org.junit.jupiter:junit-jupiter:$junitVersion"
75-
testCompile "org.mockito:mockito-junit-jupiter:$mockitoJunitVersion"
74+
testImplementation "org.junit.jupiter:junit-jupiter:$junitVersion"
75+
testImplementation "org.mockito:mockito-junit-jupiter:$mockitoJunitVersion"
7676

7777
configurations.all {
7878
resolutionStrategy {
@@ -96,3 +96,6 @@ allprojects {
9696
configure(subprojects.findAll { it.name != 'integration-tests' }) {
9797
apply from: "$rootDir/gradle/jacoco/build.gradle"
9898
}
99+
100+
tasks.named("spotlessJava").configure { dependsOn("spotlessGroovyGradle") }
101+
tasks.named("spotlessKotlin").configure { dependsOn("spotlessJava", "spotlessGroovyGradle") }

‎codegen/build.gradle

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
description 'web3j project code generators'
22

33
dependencies {
4-
compile project(':core'),
4+
implementation project(':core'),
55
"com.squareup:kotlinpoet:$kotlinPoetVersion",
66
"com.squareup:javapoet:$javaPoetVersion",
77
"info.picocli:picocli:$picocliVersion"
8-
testCompile project(':core').sourceSets.test.output,
8+
testImplementation project(':core').sourceSets.test.output,
99
"ch.qos.logback:logback-core:$logbackVersion",
1010
"ch.qos.logback:logback-classic:$logbackVersion"
1111
implementation("org.junit.platform:junit-platform-launcher:$junitPlatformLauncherVersion")
@@ -37,3 +37,6 @@ file("src/test/resources/solidity").listFiles().each { File file ->
3737
test.dependsOn generateTask
3838
}
3939
}
40+
41+
tasks.named("spotlessJava").configure { dependsOn("spotlessGroovyGradle","compileJava","compileTestJava","javadoc") }
42+
tasks.named("spotlessKotlin").configure { dependsOn("compileJava","spotlessJava", "spotlessGroovyGradle","compileTestJava","processTestResources","javadoc") }

‎contracts/build.gradle

+4-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
description 'web3j support for Ethereum Improvement Proposals (EIP\'s)'
33

44
dependencies {
5-
compile project(':core')
6-
testCompile project(path: ':core', configuration: 'testArtifacts')
5+
implementation project(':core')
6+
testImplementation project(path: ':core', configuration: 'testArtifacts')
77
}
8+
tasks.named("spotlessJava").configure { dependsOn("compileJava","javadoc","processResources","spotlessGroovyGradle") }
9+
tasks.named("spotlessKotlin").configure { dependsOn("compileJava","javadoc","processResources","spotlessJava","spotlessGroovyGradle") }

‎core/build.gradle

+9-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
import java.text.SimpleDateFormat
22

3-
apply plugin: 'org.ajoberstar.git-publish'
3+
plugins {
4+
id 'java-library'
5+
id 'org.ajoberstar.git-publish'
6+
}
47

58

69
description 'web3j is a lightweight Java library for integration with Ethereum clients'
710

811
dependencies {
9-
compile project(':abi'),
12+
api project(':abi'),
1013
project(':crypto'),
1114
project(':tuples'),
1215
"com.github.jnr:jnr-unixsocket:$jnr_unixsocketVersion",
@@ -16,7 +19,7 @@ dependencies {
1619
"org.java-websocket:Java-WebSocket:$javaWebSocketVersion",
1720
"com.fasterxml.jackson.core:jackson-databind:$jacksonVersion",
1821
"org.slf4j:slf4j-api:$slf4jVersion"
19-
testCompile project(path: ':crypto', configuration: 'testArtifacts'),
22+
testImplementation project(path: ':crypto', configuration: 'testArtifacts'),
2023
"nl.jqno.equalsverifier:equalsverifier:$equalsverifierVersion",
2124
"ch.qos.logback:logback-classic:$logbackVersion"
2225
}
@@ -78,3 +81,6 @@ classes { dependsOn createProperties }
7881
configurations { testArtifacts.extendsFrom testRuntime }
7982

8083
artifacts { testArtifacts testsJar }
84+
85+
tasks.named("spotlessJava").configure { dependsOn("compileJava", "compileTestJava", "processResources", "processTestResources", "spotlessGroovyGradle","javadoc") }
86+
tasks.named("spotlessKotlin").configure { dependsOn("compileJava", "compileTestJava", "processResources", "processTestResources","spotlessJava","spotlessGroovyGradle","javadoc") }

‎crypto/build.gradle

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1+
plugins {
2+
id 'java-library'
3+
}
14

25
description 'web3j Ethereum crypto library'
36

47
dependencies {
5-
compile project(':abi'),
8+
api project(':abi'),
69
project(':rlp'),
710
project(':utils'),
811
"org.slf4j:slf4j-api:$slf4jVersion",
@@ -12,3 +15,6 @@ dependencies {
1215
configurations { testArtifacts.extendsFrom testRuntime }
1316

1417
artifacts { testArtifacts testsJar }
18+
19+
tasks.named("spotlessJava").configure { dependsOn("spotlessGroovyGradle","compileJava","compileTestJava","javadoc") }
20+
tasks.named("spotlessKotlin").configure { dependsOn("compileJava","spotlessJava", "spotlessGroovyGradle","compileTestJava","processTestResources","javadoc") }

‎eea/build.gradle

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
1+
plugins {
2+
id 'java-library'
3+
}
14

25
description 'EEA JSON-RPC API'
36

47
dependencies {
5-
compile project(':core')
6-
testCompile project(path: ':core', configuration: 'testArtifacts')
8+
api project(':core')
9+
testImplementation project(path: ':core', configuration: 'testArtifacts')
710
}
11+
12+
tasks.named("spotlessJava").configure { dependsOn("spotlessGroovyGradle","compileJava","compileTestJava","javadoc") }
13+
tasks.named("spotlessKotlin").configure { dependsOn("compileJava","spotlessJava", "spotlessGroovyGradle","compileTestJava","processTestResources","javadoc") }

‎geth/build.gradle

+5-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
description 'Geth JSON-RPC API'
33

44
dependencies {
5-
compile project(':core')
6-
testCompile project(path: ':core', configuration: 'testArtifacts')
5+
implementation project(':core')
6+
testImplementation project(path: ':core', configuration: 'testArtifacts')
77
}
8+
9+
tasks.named("spotlessJava").configure { dependsOn("spotlessGroovyGradle","compileJava","compileTestJava","javadoc") }
10+
tasks.named("spotlessKotlin").configure { dependsOn("compileJava","spotlessJava", "spotlessGroovyGradle","compileTestJava","processTestResources","javadoc") }

‎gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
group=org.web3j
2-
version=4.9.8-SNAPSHOT
2+
version=4.9.81-SNAPSHOT

‎gradle/jacoco/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ task jacocoRootTestReport(type: org.gradle.testing.jacoco.tasks.JacocoReport) {
2626
}
2727

2828
jacoco {
29-
toolVersion = "0.8.4"
29+
toolVersion = "0.8.10"
3030
}
3131

‎gradle/java/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apply plugin: 'java'
22

3-
sourceCompatibility = 1.8
4-
targetCompatibility = 1.8
3+
sourceCompatibility = 17
4+
targetCompatibility = 17
55

66
compileJava {
77
options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"

‎gradle/publish/build.gradle

+7-7
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,10 @@ nexusStaging {
8282
}
8383

8484

85-
signing {
86-
sign publishing.publications.maven
87-
def signingKey = new File("$rootDir/web3j.asc")
88-
if (signingKey.exists()) {
89-
useInMemoryPgpKeys(signingKey.getText('UTF-8'), System.getenv('GPG_PASSPHRASE'))
90-
}
91-
}
85+
//signing {
86+
// sign publishing.publications.maven
87+
// def signingKey = new File("$rootDir/web3j.asc")
88+
// if (signingKey.exists()) {
89+
// useInMemoryPgpKeys(signingKey.getText('UTF-8'), System.getenv('GPG_PASSPHRASE'))
90+
// }
91+
//}

‎gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.3-all.zip
2+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
33
distributionBase=GRADLE_USER_HOME
44
distributionPath=wrapper/dists
55
zipStorePath=wrapper/dists

‎hosted-providers/build.gradle

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11

22
description 'web3j customisations for working with hosted web3 providers (Infura.io & Nodesmith.io)'
33

4-
dependencies { compile project(':core') }
4+
dependencies { implementation project(':core') }
5+
6+
tasks.named("spotlessJava").configure { dependsOn("spotlessGroovyGradle","compileJava","compileTestJava","javadoc") }
7+
tasks.named("spotlessKotlin").configure { dependsOn("compileJava","spotlessJava", "spotlessGroovyGradle","compileTestJava","processTestResources","javadoc") }

‎integration-tests/build.gradle

+4-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ext {
1717
def withoutAbi = { exclude group: 'org.web3j', module: 'abi' }
1818

1919
dependencies {
20-
testCompile project(':core'),
20+
testImplementation project(':core'),
2121
project(':besu'),
2222
project(':parity'),
2323
project(':geth'),
@@ -70,3 +70,6 @@ test {
7070
compileTestJava {
7171
dependsOn project(':codegen').getTasksByName("testClasses", false)
7272
}
73+
74+
tasks.named("spotlessJava").configure { dependsOn("spotlessGroovyGradle") }
75+
tasks.named("spotlessKotlin").configure { dependsOn("spotlessJava", "spotlessGroovyGradle") }

‎parity/build.gradle

+5-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22
description 'Parity JSON-RPC API'
33

44
dependencies {
5-
compile project(':core')
6-
testCompile project(path: ':core', configuration: 'testArtifacts'),
5+
implementation project(':core')
6+
testImplementation project(path: ':core', configuration: 'testArtifacts'),
77
"nl.jqno.equalsverifier:equalsverifier:$equalsverifierVersion"
88
}
9+
10+
tasks.named("spotlessJava").configure { dependsOn("spotlessGroovyGradle","compileJava","compileTestJava","javadoc") }
11+
tasks.named("spotlessKotlin").configure { dependsOn("compileJava","spotlessJava", "spotlessGroovyGradle","compileTestJava","processTestResources","javadoc") }

‎rlp/build.gradle

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1+
plugins {
2+
id 'java-library'
3+
}
14

25
description 'Ethereum Recursive Length Prefix (RLP) encoding for serializing objects'
36

4-
dependencies { compile project(':utils') }
7+
dependencies { api project(':utils') }
8+
9+
tasks.named("spotlessJava").configure { dependsOn("spotlessGroovyGradle","compileJava","compileTestJava","javadoc") }
10+
tasks.named("spotlessKotlin").configure { dependsOn("compileJava","spotlessJava", "spotlessGroovyGradle","compileTestJava","processTestResources","javadoc") }

‎tuples/build.gradle

+3
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11

22
description 'Simple Java tuples library'
3+
4+
tasks.named("spotlessJava").configure { dependsOn("spotlessGroovyGradle","compileJava","compileTestJava","javadoc") }
5+
tasks.named("spotlessKotlin").configure { dependsOn("compileJava","spotlessJava", "spotlessGroovyGradle","compileTestJava","processTestResources","javadoc") }

‎utils/build.gradle

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1+
plugins {
2+
id 'java-library'
3+
}
14

25
description 'Minimal set of web3j utility classes'
36

4-
dependencies { compile "org.bouncycastle:bcprov-jdk15on:$bouncycastleVersion" }
7+
dependencies { api "org.bouncycastle:bcprov-jdk18on:$bouncycastleVersion" }
8+
9+
tasks.named("spotlessJava").configure { dependsOn("spotlessGroovyGradle","compileJava","compileTestJava","javadoc") }
10+
tasks.named("spotlessKotlin").configure { dependsOn("compileJava","spotlessJava", "spotlessGroovyGradle","compileTestJava","processTestResources","javadoc") }

0 commit comments

Comments
 (0)