Add Java17 container to build job in GHA (#207)

transferwise · Sep 10, 2024 · db693e8 · db693e8
1 parent 69b3995
commit db693e8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 17 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -125,6 +125,8 @@ jobs:
 
   build:
     name: "Build and Test"
+    container:
+      image: azul/zulu-openjdk:17
     runs-on:
       - ubuntu-latest
     needs: matrix_build

diff --git a/build.common.gradle b/build.common.gradle
@@ -91,13 +91,8 @@ dependencies {
 }
 
 java {
-    if (springBootVersion.startsWith("2.")) {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    } else {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
     withSourcesJar()
     withJavadocJar()
 }
@@ -118,18 +113,9 @@ compileJava {
     options.compilerArgs << '-Xlint:-processing'
 }
 
-compileTestJava {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
-    javaCompiler = javaToolchains.compilerFor {
-        languageVersion = JavaLanguageVersion.of(17)
-    }
-}
 
 test {
-    javaLauncher = javaToolchains.launcherFor {
-        languageVersion = JavaLanguageVersion.of(17)
-    }
+
 
     testLogging {
         events TestLogEvent.STARTED, TestLogEvent.FAILED, TestLogEvent.SKIPPED, TestLogEvent.PASSED,