chore(java): Full java 17 only (spinnaker#1211)

* chore(java): Full jaa 17 only * chore(java): Full jaa 17 only * chore(java): Full jaa 17 only
armory-io · Nov 16, 2024 · 6d13c51 · 6d13c51
1 parent 27db630
commit 6d13c51
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 7 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -19,7 +19,6 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           java-version: |
-            11
             17
           distribution: 'zulu'
           cache: 'gradle'

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -13,7 +13,6 @@ jobs:
     - uses: actions/setup-java@v4
       with:
         java-version: |
-          11
           17
         distribution: 'zulu'
         cache: 'gradle'

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -38,7 +38,6 @@ jobs:
       - uses: actions/setup-java@v4
         with:
           java-version: |
-            11
             17
           distribution: 'zulu'
           cache: 'gradle'

diff --git a/gradle.properties b/gradle.properties
@@ -1,7 +1,7 @@
 kotlinVersion=1.6.21
 org.gradle.parallel=true
 spinnakerGradleVersion=8.32.1
-targetJava17=false
+targetJava17=true
 includeRuntimes=actuator,core,eureka,retrofit,secrets-aws,secrets-gcp,stackdriver,swagger,tomcat,web
 
 org.gradle.jvmargs=-Xmx2g -Xms2g
diff --git a/gradle/kotlin-test.gradle b/gradle/kotlin-test.gradle
@@ -38,6 +38,6 @@ dependencies {
 compileTestKotlin {
   kotlinOptions {
     languageVersion = "1.6"
-    jvmTarget = "11"
+    jvmTarget = "17"
   }
 }
diff --git a/gradle/kotlin.gradle b/gradle/kotlin.gradle
@@ -40,14 +40,14 @@ dependencies {
 compileKotlin {
   kotlinOptions {
     languageVersion = "1.6"
-    jvmTarget = "11"
+    jvmTarget = "17"
   }
 }
 
 compileTestKotlin {
   kotlinOptions {
     languageVersion = "1.6"
-    jvmTarget = "11"
+    jvmTarget = "17"
   }
 }