GP-5226: Fixing Gradle 8.12 build issue. Gradle wrapper now uses Gradle

ryanmkurtz · ryanmkurtz · commit 20285e267d11 · 2025-01-02T16:28:02.000-05:00
8.12.
diff --git a/Ghidra/RuntimeScripts/Common/support/gradle/gradle-wrapper.properties b/Ghidra/RuntimeScripts/Common/support/gradle/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradle/hasPythonPackage.gradle b/gradle/hasPythonPackage.gradle
@@ -54,7 +54,7 @@ task buildPyPackage {
 	
 		File setuptools = project(":Debugger-rmi-trace").findPyDep(".")
 		exec {
-			workingDir { "build/pypkg" }
+			workingDir { file("build/pypkg") }
 			commandLine rootProject.PYTHON3
 			args "-m", "pip", "wheel", "-w", "dist/", "--no-index", "--no-deps", "-f", setuptools, "."
 		}

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ task buildPyPackage {`
`54`	`54`
`55`	`55`	`File setuptools = project(":Debugger-rmi-trace").findPyDep(".")`
`56`	`56`	`exec {`
`57`		`- workingDir { "build/pypkg" }`
	`57`	`+ workingDir { file("build/pypkg") }`
`58`	`58`	`commandLine rootProject.PYTHON3`
`59`	`59`	`args "-m", "pip", "wheel", "-w", "dist/", "--no-index", "--no-deps", "-f", setuptools, "."`
`60`	`60`	`}`