diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 0c172550..577dacd6 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: - java: ['17', '21', '25', '26'] + java: ['21', '25', '26'] steps: - uses: actions/checkout@v7 diff --git a/.travis.yml b/.travis.yml index 76d48128..47a497b2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,6 @@ cache: - $HOME/.m2/ jdk: - - openjdk17 - openjdk21 - openjdk25 diff --git a/build.gradle.kts b/build.gradle.kts index b6133f7d..80077e13 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -80,7 +80,7 @@ java { } tasks.withType().configureEach { - options.release = 17 + options.release = 21 // Gradle compiles in a worker process whenever the toolchain above differs // from the JVM that runs Gradle. That worker does not inherit the @@ -100,7 +100,7 @@ tasks.withType().configureEach { // default: it runs Gradle under Java 21 in every job and selects the test JVM by passing // `-PtestJavaVersion`. // Override with, for example: -// ./gradlew test -PtestJavaVersion=17 +// ./gradlew test -PtestJavaVersion=21 val testJavaVersionProperty = project.findProperty("testJavaVersion") if (testJavaVersionProperty != null && testJavaVersionProperty.toString().isEmpty()) { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 289a4053..bb8af8f5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,7 +2,7 @@ checker-framework = "4.2.2" -google-java-format = "1.28.0" +google-java-format = "1.36.1" jacoco = "0.8.15" diff --git a/settings.gradle.kts b/settings.gradle.kts index a713efeb..82b3373e 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,5 +1,12 @@ -// No explicit check of the Gradle JVM's version is needed here. Gradle 9 requires a JVM between -// 17 and 26 to run, and reports a clear error on an unsupported JVM. +val minimumJavaVersion = JavaVersion.VERSION_21 + +if (JavaVersion.current() < minimumJavaVersion) { + throw GradleException( + "This build requires Gradle to run under Java $minimumJavaVersion or later," + + " but Gradle is running under Java ${JavaVersion.current()}" + + " from ${System.getProperty("java.home")}." + ) +} plugins { // Downloads a JDK if the Java toolchain that build.gradle.kts requests is not installed locally. diff --git a/src/main/java/org/plumelib/lookup/Lookup.java b/src/main/java/org/plumelib/lookup/Lookup.java index 8c423551..ed0e350a 100644 --- a/src/main/java/org/plumelib/lookup/Lookup.java +++ b/src/main/java/org/plumelib/lookup/Lookup.java @@ -56,74 +56,218 @@ * * *
  • Getting help - *
      - *
    • -h --help=boolean. Show detailed help - * information and exit. [default: false] - *
    • -v --verbose=boolean. Print progress - * information. [default: false] - *
    + *
      + *
    • -h + * --help=boolean. Show + * detailed help information and exit. + * [default: false] + *
    • -v + * --verbose=boolean. + * Print progress information. + * [default: false] + *
    * * *