Skip to content

Commit 07e22c0

Browse files
authored
Merge pull request #495 from dnestoro/dnestoro/RelaxGraalVMVersionCheck
Relax GraalVM version check for dev versions
2 parents d6eedb6 + e6c0810 commit 07e22c0

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

common/utils/src/main/java/org/graalvm/buildtools/utils/NativeImageUtils.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,8 @@ public static void checkVersion(String requiredVersion, String versionToCheck) {
122122
if (versionToCheck.contains("GraalVM Runtime Environment")) {
123123
return; // later than 22.3.1 (e.g., GraalVM for JDK 17 / GraalVM for JDK 20)
124124
}
125-
if (versionToCheck.startsWith("GraalVM dev") || versionToCheck.startsWith("native-image dev")) {
125+
if ((versionToCheck.startsWith("native-image") && versionToCheck.contains("dev")) ||
126+
versionToCheck.startsWith("GraalVM dev")) { /* For GraalVM 22.3 and earlier */
126127
return;
127128
}
128129
Matcher requiredMatcher = requiredVersionPattern.matcher(requiredVersion);

docs/src/docs/asciidoc/index.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ If you are using alternative build systems, see <<alternative-build-systems.adoc
2121

2222
=== Release 0.9.26
2323

24+
* Relax GraalVM version check for dev versions
25+
2426
==== Gradle plugin
2527

2628
* Fix compatibility with Gradle 8.3

0 commit comments

Comments
 (0)