Merge pull request #138 from mfvanek/feature/jdk21

Upgraded Gradle to 8.5. Migrated to JDK 21 in pipeline
mfvanek · Dec 2, 2023 · beb30f8 · beb30f8
2 parents 155b568 + d9c3f39
commit beb30f8
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -14,11 +14,11 @@ jobs:
                 uses: actions/checkout@v4
                 with:
                     fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-            -   name: Set up JDK 19
+            -   name: Set up JDK 21
                 uses: actions/setup-java@v3
                 with:
                     distribution: 'temurin'
-                    java-version: '19'
+                    java-version: '21'
                     cache: 'gradle'
             -   name: Cache SonarCloud packages
                 uses: actions/cache@v3

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -8,28 +8,28 @@ import org.sonarqube.gradle.SonarTask
 
 plugins {
     id("java")
-    id("com.github.spotbugs") version "5.2.4"
+    id("com.github.spotbugs") version "5.2.5"
     id("checkstyle")
     id("jacoco")
     id("pmd")
     id("org.sonarqube") version "4.4.1.3373"
     id("info.solidsoft.pitest") version "1.15.0"
     id("io.freefair.lombok") version "8.4"
     id("net.ltgt.errorprone") version "3.1.0"
-    id("org.gradle.test-retry") version "1.5.6"
+    id("org.gradle.test-retry") version "1.5.7"
     id("com.github.ben-manes.versions") version "0.50.0"
 }
 
 group = "io.github.mfvanek"
-version = "0.10.1"
+version = "0.10.2"
 
 repositories {
     mavenLocal()
     mavenCentral()
 }
 
 dependencies {
-    implementation(platform("io.github.mfvanek:pg-index-health-bom:0.10.1"))
+    implementation(platform("io.github.mfvanek:pg-index-health-bom:0.10.2"))
     implementation("io.github.mfvanek:pg-index-health")
     implementation("io.github.mfvanek:pg-index-health-generator")
     implementation("io.github.mfvanek:pg-index-health-testing")
@@ -62,10 +62,12 @@ dependencies {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(17)
+    }
 }
 tasks.withType<JavaCompile>().configureEach {
+    options.compilerArgs.add("-parameters")
     options.errorprone {
         disableWarningsInGeneratedCode.set(true)
     }
@@ -77,7 +79,7 @@ jacoco {
 
 tasks {
     wrapper {
-        gradleVersion = "8.4"
+        gradleVersion = "8.5"
     }
 
     test {

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -4,7 +4,7 @@ dependencyResolutionManagement {
     versionCatalogs {
         create("libs") {
             library("postgresql", "org.postgresql:postgresql:42.7.0")
-            library("logback-classic", "ch.qos.logback:logback-classic:1.4.11")
+            library("logback-classic", "ch.qos.logback:logback-classic:1.4.14")
         }
     }
 }