Skip to content
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

Jump to bottom

Relax GraalVM version check for dev versions #495

Merged
merged 6 commits into from
Sep 4, 2023
Merged

Relax GraalVM version check for dev versions #495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c007469
Relax GraalVM version check for dev versions
dnestoro Sep 1, 2023
35e221b
Remove unused import
dnestoro Sep 1, 2023
da3e79c
Update common/utils/src/main/java/org/graalvm/buildtools/utils/Native…
dnestoro Sep 1, 2023
6995f0a
Refactor
dnestoro Sep 1, 2023
da89d9d
Remove unnecessary characters in dev version check
dnestoro Sep 4, 2023
e6c0810
Update changelog
dnestoro Sep 4, 2023
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
3 changes: 2 additions & 1 deletion common/utils/src/main/java/org/graalvm/buildtools/utils/NativeImageUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,8 @@ public static void checkVersion(String requiredVersion, String versionToCheck) {
if (versionToCheck.contains("GraalVM Runtime Environment")) {
return; // later than 22.3.1 (e.g., GraalVM for JDK 17 / GraalVM for JDK 20)
}
if (versionToCheck.startsWith("GraalVM dev") || versionToCheck.startsWith("native-image dev")) {
if ((versionToCheck.startsWith("native-image") && versionToCheck.contains("dev")) ||
versionToCheck.startsWith("GraalVM dev")) { /* For GraalVM 22.3 and earlier */
return;
}
Matcher requiredMatcher = requiredVersionPattern.matcher(requiredVersion);
Expand Down
2 changes: 2 additions & 0 deletions docs/src/docs/asciidoc/index.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ If you are using alternative build systems, see <<alternative-build-systems.adoc

=== Release 0.9.26

* Relax GraalVM version check for dev versions

==== Gradle plugin

* Fix compatibility with Gradle 8.3
Expand Down
Loading