fix(build.gradle.kts, workflows): rewind java version -> 11

navikt · Oct 19, 2022 · bd8f56f · bd8f56f
1 parent 7bb8dea
commit bd8f56f
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/.github/workflows/build-master.yml b/.github/workflows/build-master.yml
@@ -12,10 +12,10 @@ jobs:
       - name: Checkout latest code
         uses: actions/checkout@v3
 
-      - name: Set up JDK 17
+      - name: Set up JDK 11
         uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 11
           distribution: 'zulu'
           cache: 'gradle'
 

diff --git a/.github/workflows/dokka.yml b/.github/workflows/dokka.yml
@@ -14,10 +14,10 @@ jobs:
       - name: Checkout latest code
         uses: actions/checkout@v3
 
-      - name: Set up JDK 17
+      - name: Set up JDK 11
         uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 11
           distribution: 'zulu'
           cache: 'gradle'
 

diff --git a/.github/workflows/manual_testing.yml b/.github/workflows/manual_testing.yml
@@ -15,10 +15,10 @@ jobs:
         with:
           ref: add-arm64-architecture
 
-      - name: Set up JDK 17
+      - name: Set up JDK 11
         uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 11
           distribution: 'zulu'
           cache: 'gradle'
 

diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
@@ -15,10 +15,10 @@ jobs:
       - name: Checkout latest code
         uses: actions/checkout@v3
 
-      - name: Set up JDK 17
+      - name: Set up JDK 11
         uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 11
           distribution: 'zulu'
           cache: 'gradle'
 

diff --git a/.github/workflows/test-pull-requests.yml b/.github/workflows/test-pull-requests.yml
@@ -9,10 +9,10 @@ jobs:
       - name: Checkout latest code
         uses: actions/checkout@v3
 
-      - name: Set up JDK 17
+      - name: Set up JDK 11
         uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 11
           distribution: 'zulu'
           cache: 'gradle'
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -41,8 +41,8 @@ application {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
     withJavadocJar()
     withSourcesJar()
 }
@@ -73,7 +73,7 @@ dependencies {
     testImplementation("io.kotest:kotest-assertions-core-jvm:$kotestVersion") // for kotest core jvm assertions
     testImplementation("org.jetbrains.kotlin:kotlin-test-junit5:$kotlinVersion")
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:$junitJupiterVersion")
-    //example use with different frameworks
+    // example use with different frameworks
     testImplementation("org.springframework.boot:spring-boot-starter-webflux:$springBootVersion")
     testImplementation("org.springframework.boot:spring-boot-starter-oauth2-resource-server:$springBootVersion")
     testImplementation("org.springframework.boot:spring-boot-starter-oauth2-client:$springBootVersion")
@@ -188,7 +188,7 @@ jib {
                 os = "linux"
             }
         }
-        image = "gcr.io/distroless/java17-debian11"
+        image = "gcr.io/distroless/java11-debian11"
     }
     container {
         ports = listOf("8080")
@@ -255,7 +255,7 @@ tasks {
 
     withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
         kotlinOptions {
-            jvmTarget = "17"
+            jvmTarget = JavaVersion.VERSION_11.toString()
         }
     }
 
@@ -274,6 +274,6 @@ tasks {
     }
 
     withType<Wrapper> {
-        gradleVersion = "7.5.1"
+        gradleVersion = "7.4.2"
     }
 }