For #45: Support new Doclet API and upgrade to Java 17.

mozilla-mobile · Nov 22, 2021 · 86a279d · 86a279d
1 parent 5e48565
commit 86a279d
Show file tree

Hide file tree

Showing 12 changed files with 754 additions and 446 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -16,10 +16,11 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
+    - name: Set up JDK 17
+      uses: actions/setup-java@main
       with:
-        java-version: 1.8
+        java-version: 17
+        distribution: 'adopt'
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Build with Gradle

diff --git a/apidoc-plugin/build.gradle b/apidoc-plugin/build.gradle
@@ -34,6 +34,12 @@ switch (JavaVersion.current()) {
     case JavaVersion.VERSION_1_9:
     case JavaVersion.VERSION_1_10:
     case JavaVersion.VERSION_11:
+    case JavaVersion.VERSION_12:
+    case JavaVersion.VERSION_13:
+    case JavaVersion.VERSION_14:
+    case JavaVersion.VERSION_15:
+    case JavaVersion.VERSION_16:
+    case JavaVersion.VERSION_17:
     case JavaVersion.VERSION_HIGHER:
         javadocExecutable = "${System.properties['java.home']}/bin/javadoc"
         break