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

.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

.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

.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

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 echo-web:installDist -x test
+CMD ./gradlew --no-daemon echo-web:installDist -x test

echo-notifications/src/test/groovy/com/netflix/spinnaker/echo/notification/GoogleCloudBuildNotificationSpec.groovy

@@ -31,10 +31,10 @@ class GoogleCloudBuildNotificationSpec extends Specification {
   RetrySupport retrySupport = new RetrySupport()
   ObjectMapper objectMapper = EchoObjectMapper.getInstance()
 
-  final String ACCOUNT_NAME = "my-account"
-  final String BUILD_ID = "1a9ea355-eb3d-4148-b81b-875d07ea118b"
-  final String BUILD_STATUS = "QUEUED"
-  final String PAYLOAD = objectMapper.writeValueAsString([
+  String ACCOUNT_NAME = "my-account"
+  String BUILD_ID = "1a9ea355-eb3d-4148-b81b-875d07ea118b"
+  String BUILD_STATUS = "QUEUED"
+  String PAYLOAD = objectMapper.writeValueAsString([
     "key": "value"
   ])
 

echo-pubsub-core/src/main/java/com/netflix/spinnaker/echo/pubsub/GoogleCloudBuildEventCreator.java

@@ -36,7 +36,7 @@ public class GoogleCloudBuildEventCreator implements EventCreator {
   public Event createEvent(MessageDescription description) {
     log.debug("Processing pubsub event with payload {}", description.getMessagePayload());
 
-    Event event = new Event();
+    var event = new Event();
     Map<String, Object> content = new HashMap<>();
     content.put("messageDescription", description);
 

echo-pubsub-core/src/test/groovy/com/netflix/spinnaker/echo/pubsub/GoogleCloudBuildEventCreatorSpec.groovy

@@ -22,10 +22,10 @@ import spock.lang.Specification
 import spock.lang.Subject
 
 class GoogleCloudBuildEventCreatorSpec extends Specification {
-  final String ACCOUNT_NAME = "my-account"
-  final String BUILD_ID = "1a9ea355-eb3d-4148-b81b-875d07ea118b"
-  final String BUILD_STATUS = "QUEUED"
-  final String PAYLOAD = "test payload"
+  String ACCOUNT_NAME = "my-account"
+  String BUILD_ID = "1a9ea355-eb3d-4148-b81b-875d07ea118b"
+  String BUILD_STATUS = "QUEUED"
+  String PAYLOAD = "test payload"
 
   @Subject
   GoogleCloudBuildEventCreator eventCreator = new GoogleCloudBuildEventCreator()

gradle.properties

@@ -3,6 +3,7 @@ korkVersion=7.76.3
 kotlinVersion=1.4.0
 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'`.

gradle/kotlin.gradle

@@ -19,14 +19,14 @@ apply plugin: "kotlin"
 compileKotlin {
   kotlinOptions {
     languageVersion = "1.4"
-    jvmTarget = "1.8"
+    jvmTarget = "11"
   }
 }
 
 compileTestKotlin {
   kotlinOptions {
     languageVersion = "1.4"
-    jvmTarget = "1.8"
+    jvmTarget = "11"
   }
 }