From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Fri, 4 Oct 2024 21:34:19 +0000 (+0200)
Subject: 💚 Remove toolchain definition from Gradle build file
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=ae8f486b707ccf15329784619cc1167f971d6208;p=rhynodge.git

💚 Remove toolchain definition from Gradle build file

And don’t build with Java 8 anymore.
---

diff --git a/Jenkinsfile b/Jenkinsfile
index 096a33d..fa52a18 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -6,17 +6,17 @@ pipeline {
     }
 
     stages {
-        stage('Build (Java 8)') {
+        stage('Build (Java 17)') {
             tools {
-                jdk 'OpenJDK 8'
+                jdk 'OpenJDK 17'
             }
             steps {
                 sh './gradlew --no-daemon clean classes testClasses'
             }
         }
-        stage('Test (Java 8)') {
+        stage('Test (Java 17)') {
             tools {
-                jdk 'OpenJDK 8'
+                jdk 'OpenJDK 17'
             }
             steps {
                 sh './gradlew --no-daemon test jacocoTestReport'
@@ -28,25 +28,15 @@ pipeline {
                 }
             }
         }
-        stage('Binary (Java 8)') {
+        stage('Binary (Java 17)') {
             tools {
-                jdk 'OpenJDK 8'
+                jdk 'OpenJDK 17'
             }
             steps {
                 sh './gradlew --no-daemon fatJar'
                 archiveArtifacts artifacts: 'build/libs/rhynodge-*-jar-with-dependencies.jar', fingerprint: true
             }
         }
-        stage('Compatibility (Java 17)') {
-            tools {
-                jdk 'OpenJDK 17'
-            }
-            steps {
-                catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                    sh './gradlew --no-daemon clean test'
-                }
-            }
-        }
         stage('Compatibility (Java 21)') {
             tools {
                 jdk 'OpenJDK 21'
diff --git a/build.gradle b/build.gradle
index 73f1df8..838acae 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,16 +17,6 @@ plugins {
 apply plugin: "jacoco"
 apply plugin: "idea"
 
-kotlin {
-    jvmToolchain(17)
-}
-
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(17))
-    }
-}
-
 idea {
     project {
         languageLevel = "17"