diff --git a/build.gradle b/build.gradle
index c9e4e026e5..59dc3ab467 100644
--- a/build.gradle
+++ b/build.gradle
@@ -218,7 +218,7 @@ subprojects {
     }
 
     def publishBuild = Boolean.parseBoolean(findProperty('publishBuild') ?: 'false')
-    def autoServiceVersion = publishBuild ? libs.versions.autoService.asProvider().get() : libs.versions.autoService.development.get()
+    def autoServiceVersion = publishBuild ? rootProject.libs.versions.autoService.asProvider().get() : rootProject.libs.versions.autoService.development.get()
 
     project.configurations.all {
         resolutionStrategy.eachDependency {details ->
diff --git a/gradle/check.gradle b/gradle/check.gradle
index 005933a226..008cadad94 100644
--- a/gradle/check.gradle
+++ b/gradle/check.gradle
@@ -75,7 +75,7 @@ def classLoader = plugins['com.github.spotbugs'].class.classLoader
 def SpotBugsEffort = classLoader.findLoadedClass('com.github.spotbugs.snom.Effort')
 def SpotBugsTaskClass = classLoader.findLoadedClass('com.github.spotbugs.snom.SpotBugsTask')
 spotbugs {
-    toolVersion = libs.versions.spotbugs.get()
+    toolVersion = rootProject.libs.versions.spotbugs.get()
     ignoreFailures = false
     effort = SpotBugsEffort.MAX
     excludeFilter = rootProject.file('gradle/codequality/spotbugs_exclude.xml')
@@ -119,7 +119,6 @@ apply plugin: 'pmd'
 pmd {
     consoleOutput = true
     ignoreFailures = false
-    targetJdk = '1.7'
     sourceSets = [sourceSets.main]
     toolVersion = '6.44.0'
     // an annoying hack to get around Gradle defaults
diff --git a/gradle/testing.gradle b/gradle/testing.gradle
index 40f6a008d0..36e2d6e7c6 100644
--- a/gradle/testing.gradle
+++ b/gradle/testing.gradle
@@ -27,7 +27,7 @@ import org.gradle.api.tasks.testing.TestListener
 apply plugin: 'jacoco'
 // configure for test, other *Test are configured below
 jacoco {
-    toolVersion = libs.versions.jacoco.get()
+    toolVersion = rootProject.libs.versions.jacoco.get()
 }
 
 // Resolved to the mockito-core jar so it can be installed as a -javaagent on every Test JVM.
@@ -40,7 +40,7 @@ configurations {
     mockitoAgent
 }
 dependencies {
-    mockitoAgent(libs.mockito) { transitive = false }
+    mockitoAgent(rootProject.libs.mockito) { transitive = false }
 }
 
 // if you add to or modify these testing configurations, make sure to update the CONTRIBUTING.md to include any updates
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index b1b8ef56b4..eddabd2eef 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 81ba9e8812..4a9cee251c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=c72fb9991f6025cbe337d52ba77e531b3faf62bdd3e348fe1ccee9f51c71adb0
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-all.zip
+distributionSha256Sum=a9ecb5ac5c2ca40691e6527724d11d0b43b8c0a52825b77c09899f2a72d2d2bf
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-all.zip
 networkTimeout=10000
 retries=0
 retryBackOffMs=500
diff --git a/gradlew b/gradlew
index b9bb139f79..249efbb032 100755
--- a/gradlew
+++ b/gradlew
@@ -20,7 +20,7 @@
 
 ##############################################################################
 #
-#   Gradle start up script for POSIX generated by Gradle.
+#   gradlew start up script for POSIX generated by Gradle.
 #
 #   Important for running:
 #
@@ -29,7 +29,7 @@
 #       bash, then to run this script, type that shell name before the whole
 #       command line, like:
 #
-#           ksh Gradle
+#           ksh gradlew
 #
 #       Busybox and similar reduced shells will NOT work, because this script
 #       requires all of these POSIX shell features:
diff --git a/gradlew.bat b/gradlew.bat
index aa5f10b069..8508ef684d 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -19,7 +19,7 @@
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
-@rem  Gradle startup script for Windows
+@rem  gradlew startup script for Windows
 @rem
 @rem ##########################################################################
 
@@ -72,7 +72,7 @@ echo location of your Java installation. 1>&2
 
 
 
-@rem Execute Gradle
+@rem Execute gradlew
 @rem endlocal doesn't take effect until after the line is parsed and variables are expanded
 @rem which allows us to clear the local environment before executing the java command
 endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel