Merge pull request #324 from usefulness/updates

usefulness · Oct 21, 2023 · 069c1ef · 069c1ef
2 parents d7f9629 + 819f0e7
commit 069c1ef
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 5 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -7,3 +7,4 @@ insert_final_newline = true
 ij_kotlin_allow_trailing_comma = true
 ij_kotlin_allow_trailing_comma_on_call_site = true
 ktlint_standard_property-naming = disabled
+ktlint_code_style = intellij_idea
diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml
@@ -18,7 +18,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: 20
+          java-version: 21
 
       - uses: gradle/gradle-build-action@v2
 

diff --git a/.github/workflows/on-pull-request.yml b/.github/workflows/on-pull-request.yml
@@ -29,7 +29,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: 20
+          java-version: 21
 
       - uses: gradle/wrapper-validation-action@v1
 

diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml
@@ -24,7 +24,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: 20
+          java-version: 21
 
       - name: Unwrap GPG key
         env:

diff --git a/build.gradle b/build.gradle
@@ -23,7 +23,7 @@ allprojects {
             }
         }
         kotlin {
-            jvmToolchain(20)
+            jvmToolchain(21)
         }
     }
     tasks.withType(KotlinCompile).configureEach {

diff --git a/gradle/plugins/build.gradle b/gradle/plugins/build.gradle
@@ -11,7 +11,7 @@ dependencies {
 }
 
 kotlin {
-    jvmToolchain(20)
+    jvmToolchain(21)
 }
 
 def targetJavaVersion = JavaVersion.VERSION_1_8