Update dependencies

SmartsquareGmbH · Oct 19, 2021 · 2b60b72 · 2b60b72
1 parent f6fe96e
commit 2b60b72
Show file tree

Hide file tree

Showing 6 changed files with 194 additions and 125 deletions.
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -10,15 +10,16 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2.3.1
+        uses: actions/checkout@v2
 
       - name: Setup JDK 8
-        uses: actions/setup-java@v1.4.3
+        uses: actions/setup-java@v2
         with:
+          distribution: 'temurin'
           java-version: 8
 
       - name: Setup Gradle cache
-        uses: actions/cache@v2.1.0
+        uses: actions/cache@v2
         with:
           path: ~/.gradle
           key: ${{ runner.os }}-8-gradle-${{ hashFiles('build.gradle') }}
@@ -38,7 +39,7 @@ jobs:
           GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
 
       - name: Upload Gradle reports
-        uses: actions/upload-artifact@v2.1.3
+        uses: actions/upload-artifact@v2
         if: failure()
         with:
           name: Gradle Reports

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,15 +11,16 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2.3.1
+        uses: actions/checkout@v2
 
       - name: Setup JDK
-        uses: actions/setup-java@v1.4.3
+        uses: actions/setup-java@v2
         with:
+          distribution: 'temurin'
           java-version: ${{ matrix.java }}
 
       - name: Setup Gradle cache
-        uses: actions/cache@v2.1.0
+        uses: actions/cache@v2
         with:
           path: ~/.gradle
           key: ${{ runner.os }}-${{ matrix.java }}-gradle-${{ hashFiles('build.gradle') }}
@@ -30,7 +31,7 @@ jobs:
         run: ./gradlew check
 
       - name: Upload Gradle reports
-        uses: actions/upload-artifact@v2.1.3
+        uses: actions/upload-artifact@v2
         if: failure()
         with:
           name: Gradle Reports ${{ matrix.java }}

diff --git a/build.gradle b/build.gradle
@@ -1,19 +1,19 @@
 buildscript {
     ext {
         javaVersion = JavaVersion.VERSION_1_8
-        gradleVersion = "7.1.1"
-
-        junitVersion = "5.7.2"
-        kotlinVersion = "1.5.20"
-        detektVersion = "1.17.1"
-        ktlintVersion = "10.1.0"
-        jacksonVersion = "2.12.4"
-        springBootVersion = "2.5.2"
+        gradleVersion = "7.2"
+
+        junitVersion = "5.8.1"
+        kotlinVersion = "1.5.31"
+        detektVersion = "1.18.1"
+        ktlintVersion = "10.2.0"
+        jacksonVersion = "2.13.0"
+        springBootVersion = "2.5.5"
         awaitilityVersion = "4.1.0"
         hivemqClientVersion = "1.2.2"
-        testcontainersVersion = "1.15.3"
-        kluentVersion = "1.67"
-        dokkaVersion = "1.5.0"
+        testcontainersVersion = "1.16.0"
+        kluentVersion = "1.68"
+        dokkaVersion = "1.5.31"
         dependencyManagementVersion = "1.0.11.RELEASE"
         gradleNexusVersion = "1.1.0"
         gradleVersionsPluginVersion = "0.39.0"
@@ -92,6 +92,24 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
     }
 }
 
+// Make kapt work on recent java versions. Remove when upgrading to Kotlin 1.6.
+// https://youtrack.jetbrains.com/issue/KT-45545
+kotlin {
+    kotlinDaemonJvmArgs = [
+            "-Dfile.encoding=UTF-8",
+            "--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
+            "--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",
+            "--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED",
+            "--add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
+            "--add-opens=jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED",
+            "--add-opens=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED",
+            "--add-opens=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED",
+            "--add-opens=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED",
+            "--add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
+            "--add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"
+    ]
+}
+
 kapt {
     arguments {
         arg(

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists