diff --git a/.editorconfig b/.editorconfig index 96fb087..6285163 100644 --- 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 index 5644d1a..166da59 100644 --- 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 index c8b8b16..d84593f 100644 --- 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 index 9012cf6..c6d23ae 100644 --- 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 index 92118b8..0109c34 100644 --- 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 index 30e69f1..76ce447 100644 --- 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