Skip to content

jextract plugin: prefer gradlew over global gradle #644

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ktoso merged 1 commit into from
Mar 25, 2026
Merged

jextract plugin: prefer gradlew over global gradle #644

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions Plugins/JExtractSwiftPlugin/JExtractSwiftPlugin.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,10 +187,14 @@ struct JExtractSwiftBuildToolPlugin: SwiftJavaPluginProtocol, BuildToolPlugin {
gradlewEnvironment[GradleUserHome] = gradleUserHomePath
log("Forward environment: \(gradlewEnvironment)")

let gradleExecutable =
findExecutable(name: "gradle") // try using installed 'gradle' if available in PATH
?? swiftJavaDirectory.appending(path: "gradlew") // fallback to calling ./gradlew if gradle is not installed
log("Detected 'gradle' executable (or gradlew fallback): \(gradleExecutable)")
let gradlewURL = swiftJavaDirectory.appending(path: "gradlew")
let gradleExecutable: URL
if FileManager.default.isExecutableFile(atPath: gradlewURL.path(percentEncoded: false)) {
gradleExecutable = gradlewURL // prefer the wrapper to ensure the correct Gradle version is used
} else {
gradleExecutable = findExecutable(name: "gradle") ?? gradlewURL // fallback to system gradle
}
log("Detected gradle executable: \(gradleExecutable)")

let javaHome = URL(filePath: findJavaHome())
let javacPath =
Expand Down
Loading