Skip to content

Commit

Permalink
Merge pull request #81 from hyperledger/upgradeGradle8.7
Browse files Browse the repository at this point in the history
Upgrade gradle to 8.7
  • Loading branch information
gtebrean authored May 21, 2024
2 parents 1478206 + 9a3504f commit bc408ad
Show file tree
Hide file tree
Showing 25 changed files with 249 additions and 188 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [4.11.4]() (Upcoming)
# [4.12.0]() (Upcoming)

### Bug Fixes

Expand All @@ -15,7 +15,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline

### BREAKING CHANGES

*
* Upgrade gradle to 8.7 and remove Consensys Repo dependency [#81](https://github.com/hyperledger/web3j-unit/pull/81)

# [4.11.3](https://github.com/hyperledger/web3j-unit/releases/tag/v4.11.3) (2024-05-01)

Expand Down
14 changes: 7 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ plugins {
id 'idea'
id 'jacoco'
id 'com.jfrog.bintray' version '1.8.4'
id 'com.diffplug.gradle.spotless' version '4.5.1'
id 'io.codearte.nexus-staging' version '0.21.1'
id 'com.diffplug.spotless' version '6.25.0'
id 'io.codearte.nexus-staging' version '0.30.0'
id 'de.marcphilipp.nexus-publish' version '0.4.0'
id 'org.jetbrains.kotlin.jvm' version '1.8.10'
id 'org.jetbrains.kotlin.jvm' version '1.9.24'
id 'de.undercouch.download' version '4.1.2'
}

Expand All @@ -15,10 +15,10 @@ description 'Web3j-unit extension'

ext {
web3jVersion = version
kotlinLoggingVersion = '1.6.24'
logbackVersion = '1.4.14'
mockitoKotlinVersion = '1.8.10'
testContainersVersion = '1.19.7'
kotlinLoggingVersion = '3.0.5'
logbackVersion = '1.5.6'
mockitoKotlinVersion = '1.9.24'
testContainersVersion = '1.19.8'
besuPluginVersion = '24.1.1'
besuInternalVersion = '24.1.1'
besuInternalCryptoVersion = '23.1.3'
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
kotlin.code.style=official
group=org.web3j
version=4.11.4-SNAPSHOT
version=4.12.0-SNAPSHOT
4 changes: 3 additions & 1 deletion gradle/jacoco/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ task jacocoRootTestReport(type: org.gradle.testing.jacoco.tasks.JacocoReport) {
getAdditionalSourceDirs().from(subprojects.sourceSets.main.allSource.srcDirs)
getClassDirectories().from(subprojects.sourceSets.main.output)
getExecutionData().from(subprojects.jacocoTestReport.executionData)
reports { xml.enabled = true }
reports {
xml.required.set(true)
}

doFirst {
getExecutionData().from(executionData.findAll { it.exists() })
Expand Down
2 changes: 1 addition & 1 deletion gradle/junit/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ext {
junitVersion = '5.5.2'
junitVersion = '5.9.3'
}

dependencies {
Expand Down
6 changes: 3 additions & 3 deletions gradle/spotless/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

apply plugin: 'com.diffplug.gradle.spotless'
apply plugin: 'com.diffplug.spotless'
apply plugin: "de.undercouch.download"

task downloadJavaLicense(type: Download) {
Expand All @@ -26,7 +26,7 @@ spotless {
exclude '**/build/install/**'
}
removeUnusedImports()
googleJavaFormat("1.7").aosp()
googleJavaFormat("1.17.0").aosp()
importOrder 'java', '', 'org.web3j', '\\#'
trimTrailingWhitespace()
endWithNewline()
Expand All @@ -39,7 +39,7 @@ spotless {
exclude '**/.gradle/**'
exclude '**/build/install/**'
}
ktlint('0.31.0')
ktlint('0.49.1')
trimTrailingWhitespace()
endWithNewline()
licenseHeaderFile "$rootDir/gradle/spotless/java.license"
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
7 changes: 4 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#Mon Sep 23 12:08:44 BST 2019
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit bc408ad

Please sign in to comment.