Skip to content

Fix UpdateGradleWrapper emitting malformed CLASSPATH for Gradle 8.14+ #7565

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

Closed
timtebeek wants to merge 1 commit into from
Closed

Fix UpdateGradleWrapper emitting malformed CLASSPATH for Gradle 8.14+ #7565

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion .../rewrite/gradle-wrapper/unix/665958e3.txt → .../rewrite/gradle-wrapper/unix/47c95633.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ case "$( uname )" in #(
NONSTOP* ) nonstop=true ;;
esac

CLASSPATH="\\\"\\\""
CLASSPATH=


# Determine the Java command to use to start the JVM.
Expand Down
2 changes: 1 addition & 1 deletion .../rewrite/gradle-wrapper/unix/b67a59d5.txt → .../rewrite/gradle-wrapper/unix/8e765725.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ case "$( uname )" in #(
NONSTOP* ) nonstop=true ;;
esac

CLASSPATH="\\\"\\\""
CLASSPATH=


# Determine the Java command to use to start the JVM.
Expand Down
44 changes: 22 additions & 22 deletions rewrite-gradle/src/main/resources/META-INF/rewrite/gradle-wrapper/versions.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,29 +42,29 @@ version,gradlew,gradlewBat
9.1.0-rc-3,e5083bb6,9af86e4b
9.1.0-rc-2,e5083bb6,9af86e4b
9.1.0-rc-1,e5083bb6,9af86e4b
9.0.0,665958e3,a43e7a0f
9.0.0-rc-4,665958e3,a43e7a0f
9.0.0-rc-3,665958e3,a43e7a0f
9.0.0-rc-2,665958e3,a43e7a0f
9.0.0-rc-1,665958e3,a43e7a0f
9.0.0-milestone-9,665958e3,a43e7a0f
9.0.0-milestone-8,665958e3,a43e7a0f
9.0.0-milestone-10,665958e3,a43e7a0f
9.0-milestone-2,665958e3,a43e7a0f
9.0.0,47c95633,a43e7a0f
9.0.0-rc-4,47c95633,a43e7a0f
9.0.0-rc-3,47c95633,a43e7a0f
9.0.0-rc-2,47c95633,a43e7a0f
9.0.0-rc-1,47c95633,a43e7a0f
9.0.0-milestone-9,47c95633,a43e7a0f
9.0.0-milestone-8,47c95633,a43e7a0f
9.0.0-milestone-10,47c95633,a43e7a0f
9.0-milestone-2,47c95633,a43e7a0f
9.0-milestone-1,611e634e,5e608638
9.0-milestone-6,665958e3,a43e7a0f
9.0-milestone-5,665958e3,a43e7a0f
9.0-milestone-4,665958e3,a43e7a0f
9.0-milestone-3,665958e3,a43e7a0f
9.0-milestone-7,665958e3,a43e7a0f
8.14.4,b67a59d5,a43e7a0f
8.14.3,b67a59d5,a43e7a0f
8.14.2,b67a59d5,a43e7a0f
8.14.1,b67a59d5,a43e7a0f
8.14,b67a59d5,a43e7a0f
8.14-rc-3,b67a59d5,a43e7a0f
8.14-rc-2,b67a59d5,a43e7a0f
8.14-rc-1,b67a59d5,a43e7a0f
9.0-milestone-6,47c95633,a43e7a0f
9.0-milestone-5,47c95633,a43e7a0f
9.0-milestone-4,47c95633,a43e7a0f
9.0-milestone-3,47c95633,a43e7a0f
9.0-milestone-7,47c95633,a43e7a0f
8.14.4,8e765725,a43e7a0f
8.14.3,8e765725,a43e7a0f
8.14.2,8e765725,a43e7a0f
8.14.1,8e765725,a43e7a0f
8.14,8e765725,a43e7a0f
8.14-rc-3,8e765725,a43e7a0f
8.14-rc-2,8e765725,a43e7a0f
8.14-rc-1,8e765725,a43e7a0f
8.14-milestone-5,611e634e,5e608638
8.14-milestone-7,611e634e,5e608638
8.14-milestone-8,611e634e,5e608638
Expand Down
7 changes: 3 additions & 4 deletions ...e-gradle/src/test/java/org/openrewrite/gradle/internal/GradleWrapperScriptDownloader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,15 +209,15 @@ private static Map<String, String> unixBindings(String gradleVersion) {
binding.put("entryPointArgs", "-jar \"$APP_HOME/gradle/wrapper/gradle-wrapper.jar\"");
binding.put("mainClassName", "");
} else if (current.compareTo(GRADLE_9_0_M_2) >= 0) {
binding.put("classpath", "\"\\\\\\\"\\\\\\\"\"");
binding.put("classpath", "");
binding.put("entryPointArgs", "-jar \"$APP_HOME/gradle/wrapper/gradle-wrapper.jar\"");
binding.put("mainClassName", "");
} else if (current.compareTo(GRADLE_9_0_M_1) >= 0) {
binding.put("classpath", "$APP_HOME/gradle/wrapper/gradle-wrapper.jar");
binding.put("entryPointArgs", "");
binding.put("mainClassName", "org.gradle.wrapper.GradleWrapperMain");
} else if (current.compareTo(GRADLE_8_14_RC_1) >= 0) {
binding.put("classpath", "\"\\\\\\\\\\\"\\\\\\\\\\\"\"");
binding.put("classpath", "");
binding.put("entryPointArgs", "-jar \"$APP_HOME/gradle/wrapper/gradle-wrapper.jar\"");
binding.put("mainClassName", "");
} else if (current.compareTo(GRADLE_1_0_M_8) >= 0) {
Expand Down Expand Up @@ -281,8 +281,7 @@ private static Map<String, String> defaultBindings() {
private static String renderTemplate(String source, Map<String, String> bindings, String lineSeparator) throws IOException, ClassNotFoundException {
SimpleTemplateEngine engine = new SimpleTemplateEngine();
return engine.createTemplate(source).make(new HashMap<>(bindings)).toString()
.replaceAll("\\R", lineSeparator)
.replace("CLASSPATH=\"\\\\\\\\\\\"\\\\\\\\\\\"", "CLASSPATH=\"\\\\\\\"\\\\\\\"");
.replaceAll("\\R", lineSeparator);
}

private static String hash(String text) {
Expand Down
2 changes: 1 addition & 1 deletion rewrite-gradle/src/test/resources/org/openrewrite/gradle/gradlew-8.14
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ case "$( uname )" in #(
NONSTOP* ) nonstop=true ;;
esac

CLASSPATH="\\\"\\\""
CLASSPATH=


# Determine the Java command to use to start the JVM.
Expand Down
Loading
⚡