From 6d13c519bb3163fc09d7838df06fead7647fe97b Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 15 Nov 2024 19:13:25 -0600 Subject: [PATCH] chore(java): Full java 17 only (#1211) * chore(java): Full jaa 17 only * chore(java): Full jaa 17 only * chore(java): Full jaa 17 only --- .github/workflows/build.yml | 1 - .github/workflows/pr.yml | 1 - .github/workflows/release.yml | 1 - gradle.properties | 2 +- gradle/kotlin-test.gradle | 2 +- gradle/kotlin.gradle | 4 ++-- 6 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d8d750cae..ad41d8d69 100644 --- 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 index fc8fbc422..35f70d4d0 100644 --- 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 index 12980ca3d..2dbced05f 100644 --- 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 index 5ff48f304..c4b4d8b3d 100644 --- 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 index 98bd3b531..7eebfafe7 100644 --- 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 index b6b79fce6..09f613b23 100644 --- 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" } }