chore(java11): Target Java 11 (#975)

spinnaker · Oct 7, 2020 · 02ccd05 · 02ccd05
1 parent d8c0b31
commit 02ccd05
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 26 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,11 +16,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      # Install Java 8 for cross-compilation support. Setting it up before
-      # Java 11 means it comes later in $PATH (because of how setup-java works)
-      - uses: actions/setup-java@v1
-        with:
-          java-version: 8
       - uses: actions/setup-java@v1
         with:
           java-version: 11
@@ -31,4 +26,4 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
       - name: Build
-        run: ./gradlew -PenableCrossCompilerPlugin=true build --stacktrace
+        run: ./gradlew build --stacktrace
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -10,11 +10,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    # Install Java 8 for cross-compilation support. Setting it up before
-    # Java 11 means it comes later in $PATH (because of how setup-java works)
-    - uses: actions/setup-java@v1
-      with:
-        java-version: 8
     - uses: actions/setup-java@v1
       with:
         java-version: 11
@@ -25,4 +20,4 @@ jobs:
         restore-keys: |
           ${{ runner.os }}-gradle-
     - name: Build
-      run: ./gradlew -PenableCrossCompilerPlugin=true build
+      run: ./gradlew build
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -15,11 +15,6 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - run: git fetch --prune --unshallow
-      # Install Java 8 for cross-compilation support. Setting it up before
-      # Java 11 means it comes later in $PATH (because of how setup-java works)
-      - uses: actions/setup-java@v1
-        with:
-          java-version: 8
       - uses: actions/setup-java@v1
         with:
           java-version: 11
@@ -45,7 +40,7 @@ jobs:
           BINTRAY_API_KEY: ${{ secrets.BINTRAY_API_KEY }}
           RELEASE_VERSION: ${{ steps.release_info.outputs.RELEASE_VERSION }}
         run: |
-          ./gradlew -PenableCrossCompilerPlugin=true --info -Pversion="${RELEASE_VERSION}" -PbintrayUser="${BINTRAY_USER}" -PbintrayKey="${BINTRAY_API_KEY}" publish
+          ./gradlew --info -Pversion="${RELEASE_VERSION}" -PbintrayUser="${BINTRAY_USER}" -PbintrayKey="${BINTRAY_API_KEY}" publish
       - name: Create release
         if: steps.release_info.outputs.SKIP_RELEASE == 'false'
         uses: actions/create-release@v1

diff --git a/Dockerfile.compile b/Dockerfile.compile
@@ -1,11 +1,8 @@
 FROM alpine:3.11
 RUN apk add --update \
     openjdk11 \
-    openjdk8 \
     && rm -rf /var/cache/apk
 LABEL maintainer="sig-platform@spinnaker.io"
-ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk
-ENV JDK_18 /usr/lib/jvm/java-1.8-openjdk
 ENV GRADLE_USER_HOME /workspace/.gradle
 ENV GRADLE_OPTS -Xmx4g
-CMD ./gradlew --no-daemon -PenableCrossCompilerPlugin=true front50-web:installDist -x test
+CMD ./gradlew --no-daemon front50-web:installDist -x test
diff --git a/front50-api-tck/front50-api-tck.gradle b/front50-api-tck/front50-api-tck.gradle
@@ -24,6 +24,6 @@ test {
 compileTestKotlin {
   kotlinOptions {
     languageVersion = "1.4"
-    jvmTarget = "1.8"
+    jvmTarget = "11"
   }
 }
diff --git a/front50-gcs/src/main/java/com/netflix/spinnaker/front50/config/GcsConfig.java b/front50-gcs/src/main/java/com/netflix/spinnaker/front50/config/GcsConfig.java
@@ -35,7 +35,6 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.Collections;
-import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -66,7 +65,7 @@ public GcsStorageService defaultGoogleCloudStorageService(
 
   private GcsStorageService googleCloudStorageService(
       Storage storage, String dataFilename, GcsProperties gcsProperties) {
-    ExecutorService executor =
+    var executor =
         Executors.newCachedThreadPool(
             new ThreadFactoryBuilder()
                 .setNameFormat(GcsStorageService.class.getName() + "-%s")

diff --git a/gradle.properties b/gradle.properties
@@ -3,6 +3,7 @@ includeProviders=azure,gcs,oracle,redis,s3,swift,sql
 korkVersion=7.76.3
 org.gradle.parallel=true
 spinnakerGradleVersion=8.9.0
+targetJava11=true
 
 # To enable a composite reference to a project, set the
 #  project property `'<projectName>Composite=true'`.

diff --git a/gradle/kotlin.gradle b/gradle/kotlin.gradle
@@ -20,6 +20,6 @@ apply plugin: "kotlin-spring"
 compileKotlin {
   kotlinOptions {
     languageVersion = "1.3"
-    jvmTarget = "1.8"
+    jvmTarget = "11"
   }
 }