From 58f0a22bba53d150ee07bf7e24ea11a3ceae1169 Mon Sep 17 00:00:00 2001 From: Jendrik Johannes Date: Thu, 9 Jan 2025 10:36:12 +0100 Subject: [PATCH] build: update Gradle and plugins / formatting Signed-off-by: Jendrik Johannes --- pbj-core/gradle/aggregation/build.gradle.kts | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- pbj-core/gradlew | 3 +-- .../build.gradle.kts | 22 +++++-------------- pbj-core/pbj-compiler/build.gradle.kts | 2 +- .../com/hedera/pbj/compiler/PbjCompiler.java | 2 +- .../hedera/pbj/compiler/PbjCompilerTask.java | 2 +- .../pbj-grpc-helidon-config/build.gradle.kts | 2 +- pbj-core/pbj-grpc-helidon/build.gradle.kts | 2 +- pbj-core/pbj-runtime/build.gradle.kts | 2 +- pbj-core/settings.gradle.kts | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- pbj-integration-tests/gradlew | 3 +-- pbj-integration-tests/settings.gradle.kts | 2 +- 14 files changed, 19 insertions(+), 31 deletions(-) diff --git a/pbj-core/gradle/aggregation/build.gradle.kts b/pbj-core/gradle/aggregation/build.gradle.kts index e811095f..dc9653a1 100644 --- a/pbj-core/gradle/aggregation/build.gradle.kts +++ b/pbj-core/gradle/aggregation/build.gradle.kts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/pbj-core/gradle/wrapper/gradle-wrapper.properties b/pbj-core/gradle/wrapper/gradle-wrapper.properties index e2847c82..cea7a793 100644 --- a/pbj-core/gradle/wrapper/gradle-wrapper.properties +++ b/pbj-core/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/pbj-core/gradlew b/pbj-core/gradlew index f5feea6d..f3b75f3b 100755 --- a/pbj-core/gradlew +++ b/pbj-core/gradlew @@ -86,8 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/pbj-core/hiero-dependency-versions/build.gradle.kts b/pbj-core/hiero-dependency-versions/build.gradle.kts index ba159175..4be27461 100644 --- a/pbj-core/hiero-dependency-versions/build.gradle.kts +++ b/pbj-core/hiero-dependency-versions/build.gradle.kts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -39,15 +39,11 @@ dependencies.constraints { // The libs of this catalog are used to compile but are not bundled. The user will select // helidon, which will have the set of these dependencies that are required. - api("io.helidon.webserver:helidon-webserver:$helidon") { - because("io.helidon.webserver") - } + api("io.helidon.webserver:helidon-webserver:$helidon") { because("io.helidon.webserver") } api("io.helidon.webserver:helidon-webserver-http2:$helidon") { because("io.helidon.webserver.http2") } - api("io.helidon.metrics:helidon-metrics-api:$helidon") { - because("io.helidon.metrics.api") - } + api("io.helidon.metrics:helidon-metrics-api:$helidon") { because("io.helidon.metrics.api") } api("io.helidon.common.features:helidon-common-features-api:$helidon") { because("io.helidon.common.features.api") } @@ -59,9 +55,7 @@ dependencies.constraints { api("io.helidon.config:helidon-config-metadata-processor:$helidon") { because("io.helidon.config.metadata.processor") } - api("io.helidon.codegen:helidon-codegen-apt:$helidon") { - because("io.helidon.codegen.apt") - } + api("io.helidon.codegen:helidon-codegen-apt:$helidon") { because("io.helidon.codegen.apt") } api("io.helidon.builder:helidon-builder-codegen:$helidon") { because("io.helidon.builder.codegen") } @@ -74,9 +68,7 @@ dependencies.constraints { // Testing only api("com.google.guava:guava:33.3.1-jre") { because("com.google.common") } api("com.google.protobuf:protobuf-java:$protobuf") { because("com.google.protobuf") } - api("com.google.protobuf:protobuf-java-util:$protobuf") { - because("com.google.protobuf.util") - } + api("com.google.protobuf:protobuf-java-util:$protobuf") { because("com.google.protobuf.util") } api("org.assertj:assertj-core:3.23.1") { because("org.assertj.core") } api("org.junit.jupiter:junit-jupiter-api:$junit5") { because("org.junit.jupiter.api") } api("org.junit.jupiter:junit-jupiter-engine:$junit5") { because("org.junit.jupiter.engine") } @@ -90,9 +82,7 @@ dependencies.constraints { api("io.helidon.webserver.observe:helidon-webserver-observe-metrics:$helidon") { because("io.helidon.webserver.observe.metrics") } - api("io.helidon.webclient:helidon-webclient:$helidon") { - because("io.helidon.webclient") - } + api("io.helidon.webclient:helidon-webclient:$helidon") { because("io.helidon.webclient") } api("io.helidon.webclient:helidon-webclient-http2:$helidon") { because("io.helidon.webclient.http2") } diff --git a/pbj-core/pbj-compiler/build.gradle.kts b/pbj-core/pbj-compiler/build.gradle.kts index cca76007..8c3c6b70 100644 --- a/pbj-core/pbj-compiler/build.gradle.kts +++ b/pbj-core/pbj-compiler/build.gradle.kts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/pbj-core/pbj-compiler/src/main/java/com/hedera/pbj/compiler/PbjCompiler.java b/pbj-core/pbj-compiler/src/main/java/com/hedera/pbj/compiler/PbjCompiler.java index e29ed6ce..53d73ee3 100644 --- a/pbj-core/pbj-compiler/src/main/java/com/hedera/pbj/compiler/PbjCompiler.java +++ b/pbj-core/pbj-compiler/src/main/java/com/hedera/pbj/compiler/PbjCompiler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/pbj-core/pbj-compiler/src/main/java/com/hedera/pbj/compiler/PbjCompilerTask.java b/pbj-core/pbj-compiler/src/main/java/com/hedera/pbj/compiler/PbjCompilerTask.java index f2f63830..f82e3c74 100644 --- a/pbj-core/pbj-compiler/src/main/java/com/hedera/pbj/compiler/PbjCompilerTask.java +++ b/pbj-core/pbj-compiler/src/main/java/com/hedera/pbj/compiler/PbjCompilerTask.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/pbj-core/pbj-grpc-helidon-config/build.gradle.kts b/pbj-core/pbj-grpc-helidon-config/build.gradle.kts index 48eef90f..3fdfb3ce 100644 --- a/pbj-core/pbj-grpc-helidon-config/build.gradle.kts +++ b/pbj-core/pbj-grpc-helidon-config/build.gradle.kts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/pbj-core/pbj-grpc-helidon/build.gradle.kts b/pbj-core/pbj-grpc-helidon/build.gradle.kts index 623b87ff..b391e497 100644 --- a/pbj-core/pbj-grpc-helidon/build.gradle.kts +++ b/pbj-core/pbj-grpc-helidon/build.gradle.kts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/pbj-core/pbj-runtime/build.gradle.kts b/pbj-core/pbj-runtime/build.gradle.kts index d2591697..89f9a51e 100644 --- a/pbj-core/pbj-runtime/build.gradle.kts +++ b/pbj-core/pbj-runtime/build.gradle.kts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/pbj-core/settings.gradle.kts b/pbj-core/settings.gradle.kts index 77283aca..cce7a338 100644 --- a/pbj-core/settings.gradle.kts +++ b/pbj-core/settings.gradle.kts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/pbj-integration-tests/gradle/wrapper/gradle-wrapper.properties b/pbj-integration-tests/gradle/wrapper/gradle-wrapper.properties index e2847c82..cea7a793 100644 --- a/pbj-integration-tests/gradle/wrapper/gradle-wrapper.properties +++ b/pbj-integration-tests/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/pbj-integration-tests/gradlew b/pbj-integration-tests/gradlew index f5feea6d..f3b75f3b 100755 --- a/pbj-integration-tests/gradlew +++ b/pbj-integration-tests/gradlew @@ -86,8 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/pbj-integration-tests/settings.gradle.kts b/pbj-integration-tests/settings.gradle.kts index 8b6f73e4..59095e24 100644 --- a/pbj-integration-tests/settings.gradle.kts +++ b/pbj-integration-tests/settings.gradle.kts @@ -12,7 +12,7 @@ buildscript { } } -plugins { id("org.hiero.gradle.build") version "0.1.2" } +plugins { id("org.hiero.gradle.build") version "0.2.0" } dependencyResolutionManagement { // To use locally built 'pbj-runtime'