Skip to content

Commit 76a4fe5

Browse files
authored
build(deps): bump org.hiero.gradle.build to 0.6.0 / Gradle to 9.1 (#2519)
Signed-off-by: Jendrik Johannes <jendrik.johannes@gmail.com>
1 parent e173d84 commit 76a4fe5

File tree

8 files changed

+16
-35
lines changed

8 files changed

+16
-35
lines changed

examples/settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: Apache-2.0
2-
plugins { id("org.hiero.gradle.build") version "0.5.0" }
2+
plugins { id("org.hiero.gradle.build") version "0.6.0" }
33

44
@Suppress("UnstableApiUsage") dependencyResolutionManagement { repositories.mavenCentral() }
55

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Need increased heap for running Gradle itself, or SonarQube will run the JVM out of metaspace
1+
# SPDX-License-Identifier: Apache-2.0
22
org.gradle.jvmargs=-Xmx6144m -Dfile.encoding=UTF-8
33

44
# Enable Build Caching and parallelization (through Configuration Cache)

gradle/aggregation/build.gradle.kts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,4 @@
11
// SPDX-License-Identifier: Apache-2.0
2-
plugins {
3-
id("org.hiero.gradle.feature.publish-maven-central-aggregation")
4-
id("org.hiero.gradle.report.code-coverage")
5-
id("org.hiero.gradle.check.spotless")
6-
id("org.hiero.gradle.check.spotless-kotlin")
7-
}
8-
92
dependencies {
103
published(project(":sdk"))
114
published(project(":sdk-full"))

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
# SPDX-License-Identifier: Apache-2.0
2-
32
distributionBase=GRADLE_USER_HOME
43
distributionPath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
65
networkTimeout=10000
76
validateDistributionUrl=true
87
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@ case "$( uname )" in #(
114114
NONSTOP* ) nonstop=true ;;
115115
esac
116116

117-
CLASSPATH="\\\"\\\""
118117

119118

120119
# Determine the Java command to use to start the JVM.
@@ -172,7 +171,6 @@ fi
172171
# For Cygwin or MSYS, switch paths to Windows format before running java
173172
if "$cygwin" || "$msys" ; then
174173
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
175-
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
176174

177175
JAVACMD=$( cygpath --unix "$JAVACMD" )
178176

@@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
212210

213211
set -- \
214212
"-Dorg.gradle.appname=$APP_BASE_NAME" \
215-
-classpath "$CLASSPATH" \
216213
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
217214
"$@"
218215

gradlew.bat

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,10 @@ goto fail
7070
:execute
7171
@rem Setup the command line
7272

73-
set CLASSPATH=
7473

7574

7675
@rem Execute Gradle
77-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
76+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
7877

7978
:end
8079
@rem End local scope for the variables with windows NT shell
Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,4 @@
11
// SPDX-License-Identifier: Apache-2.0
2-
plugins {
3-
id("org.hiero.gradle.base.lifecycle")
4-
id("org.hiero.gradle.base.jpms-modules")
5-
id("org.hiero.gradle.check.spotless")
6-
id("org.hiero.gradle.check.spotless-kotlin")
7-
}
8-
92
group = "org.hiero"
103

114
val bouncycastle = "1.80"
@@ -22,7 +15,7 @@ dependencies {
2215
dependencies.constraints {
2316
api("com.esaulpaugh:headlong:13.3.1") { because("com.esaulpaugh.headlong") }
2417
api("com.google.code.findbugs:jsr305:3.0.2") { because("java.annotation") }
25-
api("com.google.code.gson:gson:2.13.1") { because("com.google.gson") }
18+
api("com.google.code.gson:gson:2.13.2") { because("com.google.gson") }
2619
api("com.google.protobuf:protobuf-java:$protobuf") { because("com.google.protobuf") }
2720
api("com.google.protobuf:protobuf-javalite:$protobuf") { because("com.google.protobuf") }
2821
api("io.grpc:grpc-api:$grpc") { because("io.grpc") }
@@ -36,20 +29,14 @@ dependencies.constraints {
3629
api("org.bouncycastle:bcpkix-jdk18on:$bouncycastle") { because("org.bouncycastle.pkix") }
3730
api("org.bouncycastle:bcprov-jdk18on:$bouncycastle") { because("org.bouncycastle.provider") }
3831
api("org.slf4j:slf4j-api:$slf4j") { because("org.slf4j") }
39-
api("org.slf4j:slf4j-simple:$slf4j") { because("org.slf4j.simple") }
40-
// Temporary workaround, remove when a new version of spring-boot-dependencies is released
41-
api("org.apache.tomcat.embed:tomcat-embed-core:10.1.44") {
42-
because("Temporary fix for vulnerability: SNYK-JAVA-ORGAPACHETOMCATEMBED-11799152")
43-
}
4432

4533
// Testing
4634
api("com.fasterxml.jackson.core:jackson-core:2.19.2") { because("com.fasterxml.jackson.core") }
4735
api("com.google.guava:guava:33.4.8-android") { because("com.google.common") }
48-
api("io.github.cdimascio:java-dotenv:5.3.1") { because("java.dotenv") }
4936
api("io.github.json-snapshot:json-snapshot:1.0.17") { because("json.snapshot") }
5037
api("org.apache.commons:commons-lang3:3.18.0") { because("org.apache.commons.lang3") }
51-
api("org.assertj:assertj-core:3.27.3") { because("org.assertj.core") }
52-
api("org.junit.jupiter:junit-jupiter-api:5.12.2") { because("org.junit.jupiter.api") }
38+
api("org.assertj:assertj-core:3.27.4") { because("org.assertj.core") }
39+
api("org.junit.jupiter:junit-jupiter-api:5.13.4") { because("org.junit.jupiter.api") }
5340
api("org.mockito:mockito-core:$mockito") { because("org.mockito") }
5441
api("org.mockito:mockito-junit-jupiter:$mockito") { because("org.mockito.junit.jupiter") }
5542

@@ -58,6 +45,12 @@ dependencies.constraints {
5845

5946
api("com.thetransactioncompany:jsonrpc2-server:2.0")
6047

61-
// Examples
62-
api("org.jetbrains.kotlin:kotlin-stdlib:2.1.21") { because("kotlin.stdlib") }
48+
tasks.checkVersionConsistency {
49+
// Versions of additional tools that are not part of the product or test module paths
50+
excludes.add("com.google.protobuf:protoc")
51+
excludes.add("io.grpc:protoc-gen-grpc-java")
52+
// Versions that are not used but published as constraints for users
53+
excludes.add("io.grpc:grpc-netty")
54+
excludes.add("io.grpc:grpc-okhttp")
55+
}
6356
}

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: Apache-2.0
2-
plugins { id("org.hiero.gradle.build") version "0.5.0" }
2+
plugins { id("org.hiero.gradle.build") version "0.6.0" }
33

44
rootProject.name = "hedera-sdk-java"
55

0 commit comments

Comments
 (0)