Skip to content

Commit

Permalink
Allow building with java 18 now that gradle supports it (apache#11889)
Browse files Browse the repository at this point in the history
* Allow building with java 18 now that gradle supports it
* update the "generic error" in these scripts
  • Loading branch information
rmuir authored Oct 29, 2022
1 parent e7253f1 commit 8736c18
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ comprehensive documentation, visit:

### Basic steps:

1. Install OpenJDK 17 (exactly this version).
1. Install OpenJDK 17 or 18.
2. Clone Lucene's git repository (or download the source distribution).
3. Run gradle launcher script (`gradlew`).

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ public static void main(String[] args) {

public static void checkVersion() {
int major = Runtime.getRuntime().version().feature();
if (major != 17) {
throw new IllegalStateException("java version be exactly 17, your version: " + major);
if (major < 17 || major > 18) {
throw new IllegalStateException("java version be 17 or 18, your version: " + major);
}
}

Expand Down
2 changes: 1 addition & 1 deletion gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ GRADLE_WRAPPER_JAR="$APP_HOME/gradle/wrapper/gradle-wrapper.jar"
"$JAVACMD" $JAVA_OPTS --source 11 "$APP_HOME/buildSrc/src/main/java/org/apache/lucene/gradle/WrapperDownloader.java" "$GRADLE_WRAPPER_JAR"
WRAPPER_STATUS=$?
if [ "$WRAPPER_STATUS" -eq 1 ]; then
echo "ERROR: Something went wrong. Make sure you're using Java 17."
echo "ERROR: Something went wrong. Make sure you're using Java 17 or 18."
exit $WRAPPER_STATUS
elif [ "$WRAPPER_STATUS" -ne 0 ]; then
exit $WRAPPER_STATUS
Expand Down
2 changes: 1 addition & 1 deletion gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ goto fail

:failWithJvmMessage
@rem https://github.com/apache/lucene/pull/819
echo Error: Something went wrong. Make sure you're using Java 17.
echo Error: Something went wrong. Make sure you're using Java 17 or 18.

:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
Expand Down

0 comments on commit 8736c18

Please sign in to comment.