Skip to content

Commit

Permalink
Merge pull request #72 from web3j/bump_to_4.10.0
Browse files Browse the repository at this point in the history
Update to Web3J 4.10.0
  • Loading branch information
gtebrean authored May 16, 2023
2 parents 23e7b79 + 041ca65 commit f591d91
Show file tree
Hide file tree
Showing 9 changed files with 23 additions and 23 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v1
with:
java-version: 11
java-version: 17
- name: Cache Gradle packages
uses: actions/cache@v2
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
steps:
- uses: actions/checkout@v2
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v1
with:
java-version: 11
java-version: 17
- name: Cache Gradle packages
uses: actions/cache@v2
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ jobs:
propagate_failure: true
trigger_workflow: true
wait_workflow: true
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v1
with:
java-version: 11
java-version: 17
- name: Cache Gradle packages
uses: actions/cache@v2
with:
Expand Down
8 changes: 4 additions & 4 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -34,24 +34,24 @@ Add the relevant dependency to your project:
Maven
-----

Java 8:
Java 17:

.. code-block:: xml
<dependency>
<groupId>org.web3j</groupId>
<artifactId>quorum</artifactId>
<version>4.8.4</version>
<version>4.10.0</version>
</dependency>
Gradle
------

Java 8:
Java 17:

.. code-block:: groovy
compile ('org.web3j:quorum:4.8.4')
compile ('org.web3j:quorum:4.10.0')
Run Quorum
Expand Down
16 changes: 8 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ plugins {
id 'java'
id 'idea'
id 'jacoco'
id "com.diffplug.gradle.spotless" version "3.25.0"
id 'com.diffplug.gradle.spotless' version '4.5.1'
id 'io.codearte.nexus-staging' version '0.21.1'
id "de.marcphilipp.nexus-publish" version "0.4.0"
id 'org.jetbrains.kotlin.jvm' version '1.3.60'
id 'org.unbroken-dome.test-sets' version '2.2.0'
id "de.undercouch.download" version "4.0.0"
id 'de.marcphilipp.nexus-publish' version '0.4.0'
id 'org.jetbrains.kotlin.jvm' version '1.6.21'
id 'org.unbroken-dome.test-sets' version '4.0.0'
id 'de.undercouch.download' version '4.0.0'
}


Expand Down Expand Up @@ -63,12 +63,12 @@ tasks.withType(Test) {

compileKotlin {
kotlinOptions {
jvmTarget = "1.8"
jvmTarget = "17"
}
}
compileTestKotlin {
kotlinOptions {
jvmTarget = "1.8"
jvmTarget = "17"
}
}
testSets {
Expand All @@ -77,4 +77,4 @@ testSets {
}
}
integrationTest.mustRunAfter test
compileIntegrationTestKotlin { kotlinOptions.jvmTarget = '1.8' }
compileIntegrationTestKotlin { kotlinOptions.jvmTarget = '17' }
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
group=org.web3j
version=4.9.5-SNAPSHOT
version=4.10.0
jacksonKotlinVersion=2.9.0
logbackVersion=1.2.3
junitVersion=5.5.2
Expand Down
2 changes: 1 addition & 1 deletion gradle/jacoco/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ task jacocoRootTestReport(type: org.gradle.testing.jacoco.tasks.JacocoReport) {
}

jacoco {
toolVersion = "0.8.4"
toolVersion = "0.8.10"
}

4 changes: 2 additions & 2 deletions gradle/java/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apply plugin: 'java'

sourceCompatibility = 1.8
targetCompatibility = 1.8
sourceCompatibility = 17
targetCompatibility = 17

compileJava {
options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit f591d91

Please sign in to comment.