From 5bf3b2b790e6fa824717bd5f16de16950dd1c048 Mon Sep 17 00:00:00 2001 From: paul-dingemans Date: Sat, 25 Mar 2023 12:20:22 +0100 Subject: [PATCH] Replace testing on java 19 with testing on java 20 Closes #1888 --- .github/workflows/gradle-pr-build.yml | 2 +- .github/workflows/gradle-snapshot-build.yml | 2 +- .github/workflows/release.yml | 2 +- CHANGELOG.md | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/gradle-pr-build.yml b/.github/workflows/gradle-pr-build.yml index 8e53c407d9..8d354d650e 100644 --- a/.github/workflows/gradle-pr-build.yml +++ b/.github/workflows/gradle-pr-build.yml @@ -20,7 +20,7 @@ jobs: os: [ ubuntu-latest, windows-latest ] # When changing the list of JDK versions, the build configuration has to be changed by a repository admin. See # https://github.com/pinterest/ktlint/pull/1787#issuecomment-1409074092 - jdk: [ 8, 11, 17, 19 ] + jdk: [ 8, 11, 17, 20 ] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/gradle-snapshot-build.yml b/.github/workflows/gradle-snapshot-build.yml index f26868c669..cbb5439686 100644 --- a/.github/workflows/gradle-snapshot-build.yml +++ b/.github/workflows/gradle-snapshot-build.yml @@ -17,7 +17,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: 19 + java-version: 20 - uses: gradle/gradle-build-action@v2 with: gradle-home-cache-cleanup: true diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 33c7d8318a..f86c92715c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,7 +17,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: 19 + java-version: 20 - uses: gradle/gradle-build-action@v2 with: gradle-home-cache-cleanup: true diff --git a/CHANGELOG.md b/CHANGELOG.md index e8d1e3e58a..2502731ef3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -286,6 +286,7 @@ dependencies { * Update Kotlin development version to `1.8.20-Beta` and Kotlin version to `1.8.10`. * Revert to matrix build to speed up build, especially for the Windows related build ([#1787](https://github.com/pinterest/ktlint/pull/1787)) * For the new code style `ktlint_official`, do not allow wildcard imports `java.util` and `kotlinx.android.synthetic` by default. Important: `.editorconfig` property `ij_kotlin_packages_to_use_import_on_demand` needs to be set to value `unset` in order to enforce IntelliJ IDEA default formatter to not generate wildcard imports `no-wildcard-imports` ([#1797](https://github.com/pinterest/ktlint/issues/1797)) +* Add support for running tests on `java 20`, remove support for running tests on `java 19`. ## [0.48.2] - 2023-01-21