E - Oppdatering til java 21

navikt · Jan 11, 2024 · 4bf50ac · 4bf50ac
1 parent 376011a
commit 4bf50ac
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/bygg_branch_og_publiser.yml b/.github/workflows/bygg_branch_og_publiser.yml
@@ -28,7 +28,7 @@ jobs:
       - name: 'Java'
         uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: temurin
 
       - name: 'Bygger og tester'

diff --git a/.github/workflows/bygg_mainline_og_deploy.yml b/.github/workflows/bygg_mainline_og_deploy.yml
@@ -27,7 +27,7 @@ jobs:
       - name: 'Java'
         uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: temurin
 
       - name: 'Sjekker at bygget kjører'

diff --git a/buildSrc/ep-module.gradle b/buildSrc/ep-module.gradle
@@ -39,21 +39,21 @@ dependencies {
     implementation(platform("org.jetbrains.kotlin:kotlin-bom:${kotlinVersion}"))
 }
 
-assert JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17): "Java 17 or newer is required"
+assert JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_21): "Java 21 or newer is required"
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
 }
 
 compileKotlin {
-    kotlinOptions.jvmTarget =  "17"
+    kotlinOptions.jvmTarget =  "21"
     kotlinOptions.allWarningsAsErrors = true
     kotlinOptions.freeCompilerArgs += "-Xjsr305=strict"
 }
 
 compileTestKotlin {
-    kotlinOptions.jvmTarget =  "17"
+    kotlinOptions.jvmTarget =  "21"
     kotlinOptions.allWarningsAsErrors = true
     kotlinOptions.freeCompilerArgs += "-Xjsr305=strict"
 }