From 8204ffcc9e1a1a1025bdd98dd58ffefc53cbfd70 Mon Sep 17 00:00:00 2001 From: stefankoppier Date: Sun, 16 Jun 2024 21:50:10 +0200 Subject: [PATCH] Java 17 in build pipeline --- .github/workflows/build.yml | 3 ++- build.gradle.kts | 4 ---- gradle.properties | 2 -- gradle/libs.versions.toml | 2 +- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 32137d34..5492bcdd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,8 +20,9 @@ jobs: - uses: actions/setup-java@v4 with: - java-version: 11 + java-version: 17 distribution: temurin + cache: 'gradle' - name: Build run: ./gradlew build diff --git a/build.gradle.kts b/build.gradle.kts index 1e16e4ac..69945007 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,10 +8,6 @@ allprojects { version = "0.1.0" } -kotlin { - jvmToolchain(11) -} - sonar { properties { property("sonar.projectKey", "Mr-Mappie_mappe") diff --git a/gradle.properties b/gradle.properties index 9c55b8b1..f0e038a8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,3 @@ kotlin.code.style=official org.gradle.configuration-cache=true - -systemProp.sonar.gradle.skipCompile=true \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1216ecaa..270b1915 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,4 +9,4 @@ junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params", vers [plugins] kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } gradle-plugin-publish = { id = "com.gradle.plugin-publish", version = "1.2.1" } -sonarqube = { id = "org.sonarqube", version = "4.4.1.3373" } \ No newline at end of file +sonarqube = { id = "org.sonarqube", version = "5.0.0.4638" } \ No newline at end of file