chore(deps): Bump gradle-wrapper from 9.1.0 to 9.5.0 in /pbj-integration-tests

pbj-core/gradle/wrapper/gradle-wrapper.properties

@@ -1,8 +1,9 @@
-# SPDX-License-Identifier: Apache-2.0
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
 networkTimeout=10000
+retries=0
+retryBackOffMs=500
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

pbj-core/pbj-compiler/src/main/java/com/hedera/pbj/compiler/PbjCompilerTask.java

@@ -9,6 +9,7 @@
 import org.gradle.api.internal.file.FileOperations;
 import org.gradle.api.provider.Property;
 import org.gradle.api.provider.SetProperty;
+import org.gradle.api.tasks.CacheableTask;
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.InputFiles;
 import org.gradle.api.tasks.Internal;
@@ -20,6 +21,7 @@
 import org.gradle.api.tasks.TaskAction;
 
 /** Gradle Task that generates java src code from protobuf proto schema files. */
+@CacheableTask
 public abstract class PbjCompilerTask extends SourceTask {
 
     /**

pbj-core/settings.gradle.kts

@@ -1,29 +1,9 @@
 // SPDX-License-Identifier: Apache-2.0
-import org.gradlex.javamodule.moduleinfo.ExtraJavaModuleInfoPluginExtension
-import org.gradlex.jvm.dependency.conflict.resolution.JvmDependencyConflictsExtension
-
-plugins { id("org.hiero.gradle.build") version "0.6.3" }
+plugins { id("org.hiero.gradle.build") version "0.7.7" }
 
 javaModules {
     directory(".") {
         group = "com.hedera.pbj"
         module("pbj-compiler") // no 'module-info.java'
     }
 }
-
-// The patch rules below can be removed once "org.hiero.gradle.build" contains the following update:
-// https://github.com/hiero-ledger/hiero-gradle-conventions/issues/444
-@Suppress("UnstableApiUsage")
-gradle.lifecycle.beforeProject {
-    plugins.withId("org.hiero.gradle.base.jpms-modules") {
-        configure<JvmDependencyConflictsExtension> {
-            patch.module("io.prometheus:simpleclient") {
-                addRuntimeOnlyDependency("io.prometheus:simpleclient_tracer_common")
-            }
-        }
-        configure<ExtraJavaModuleInfoPluginExtension> {
-            module("io.micrometer:micrometer-registry-otlp", "micrometer.registry.otlp")
-            module("io.opentelemetry.proto:opentelemetry-proto", "io.opentelemetry.proto")
-        }
-    }
-}

pbj-integration-tests/build.gradle.kts

@@ -26,6 +26,7 @@ jvmDependencyConflicts.consistentResolution {
 
 javaModuleDependencies {
     moduleNameToGA.put("com.hedera.pbj.integration.tests", "com.hedera.pbj:pbj-integration-tests")
+    moduleNameToGA.put("com.hedera.pbj.grpc.common", "com.hedera.pbj:pbj-grpc-common")
 }
 
 mainModuleInfo {
@@ -71,10 +72,7 @@ configurations.testRuntimeClasspath {
 }
 
 // IMPROVE: Test code should not have a direct dependency to 'com.hedera.pbj.compiler'
-dependencies {
-    jmhImplementation("com.hedera.pbj:pbj-grpc-common")
-    testImplementation("com.hedera.pbj:pbj-compiler") { isTransitive = false }
-}
+dependencies { testImplementation("com.hedera.pbj:pbj-compiler") { isTransitive = false } }
 
 dependencyAnalysis { issues { all { onAny { exclude("com.hedera.pbj:pbj-compiler") } } } }
 

pbj-integration-tests/gradle/wrapper/gradle-wrapper.properties

@@ -1,8 +1,9 @@
-# SPDX-License-Identifier: Apache-2.0
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
 networkTimeout=10000
+retries=0
+retryBackOffMs=500
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

pbj-integration-tests/settings.gradle.kts

@@ -3,7 +3,7 @@ pluginManagement {
     includeBuild("../pbj-core") // use locally built 'pbj-core' (Gradle plugin)
 }
 
-plugins { id("org.hiero.gradle.build") version "0.6.3" }
+plugins { id("org.hiero.gradle.build") version "0.7.7" }
 
 dependencyResolutionManagement {
     // To use locally built 'pbj-runtime'