Don't support Java 8

plume-lib · Sep 8, 2023 · 69be376 · 69be376
1 parent 4057706
commit 69be376
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 16 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -9,7 +9,7 @@ jobs:
 
     strategy:
       matrix:
-        java: [ '11', '17', '19' ]
+        java: [ '11', '17', '20' ]
 
     steps:
     - uses: actions/checkout@v4

diff --git a/.travis.yml b/.travis.yml
@@ -11,7 +11,7 @@ cache:
     - $HOME/.m2/
 
 jdk:
-  - oraclejdk8
+  - oraclejdk17
 
 script: ./gradlew build javadoc && ./gradlew requireJavadoc
 

diff --git a/build.gradle b/build.gradle
@@ -29,13 +29,8 @@ application {
   mainClass = 'org.plumelib.lookup.Lookup'
 }
 
-if (JavaVersion.current().compareTo(org.gradle.api.JavaVersion.VERSION_20) < 0) {
-  sourceCompatibility = 1.8
-  targetCompatibility = 1.8
-} else {
-  sourceCompatibility = 11
-  targetCompatibility = 11
-}
+sourceCompatibility = 11
+targetCompatibility = 11
 
 
 spotless {
@@ -71,7 +66,6 @@ tasks.withType(JavaCompile).configureEach {
   // "-processing" avoids javac warning "No processor claimed any of these annotations".
   options.compilerArgs << '-Xlint:all,-processing' << '-Werror'
   options.errorprone {
-    enabled = JavaVersion.current() != JavaVersion.VERSION_1_8
     disable('ReferenceEquality') // Use Interning Checker instead.
   }
 }
@@ -120,9 +114,7 @@ if (project.hasProperty('cfLocal')) {
 javadoc {
   options.addStringOption('Xwerror', '-Xdoclint:all')
   options.addStringOption('private', '-quiet')
-  if (JavaVersion.current().compareTo(org.gradle.api.JavaVersion.VERSION_1_9) >= 0) {
-    options.addStringOption('source', '8')
-  }
+  options.addStringOption('source', '11')
   doLast {
     ant.replaceregexp(match:"@import url\\('resources/fonts/dejavu.css'\\);\\s*", replace:'',
     flags:'g', byline:true) {
@@ -137,9 +129,7 @@ task javadocWeb(type: Javadoc) {
   source = sourceSets.main.allJava
   destinationDir = file("/cse/web/research/plumelib/${project.name}/api")
   classpath = project.sourceSets.main.compileClasspath
-  if (JavaVersion.current().compareTo(org.gradle.api.JavaVersion.VERSION_1_9) >= 0) {
-    options.addStringOption('source', '8')
-  }
+  options.addStringOption('source', '11')
   doLast {
     ant.replaceregexp(match:"@import url\\('resources/fonts/dejavu.css'\\);\\s*", replace:'',
     flags:'g', byline:true) {