From 20285e267d110cfa585676dfd40804a59031598b Mon Sep 17 00:00:00 2001 From: Ryan Kurtz Date: Thu, 2 Jan 2025 16:28:02 -0500 Subject: [PATCH] GP-5226: Fixing Gradle 8.12 build issue. Gradle wrapper now uses Gradle 8.12. --- .../Common/support/gradle/gradle-wrapper.properties | 2 +- gradle/hasPythonPackage.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Ghidra/RuntimeScripts/Common/support/gradle/gradle-wrapper.properties b/Ghidra/RuntimeScripts/Common/support/gradle/gradle-wrapper.properties index 94113f200e..cea7a793a8 100644 --- 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 index d98f29c404..b88c8bb85a 100644 --- 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, "." }