From de78c8ddf6bb40bd9f62aecaf9ba683919eb3f25 Mon Sep 17 00:00:00 2001 From: Goooler Date: Wed, 19 Jul 2023 18:04:08 +0800 Subject: [PATCH 1/2] Gradle 8.3-rc-1 https://docs.gradle.org/8.3-rc-1/release-notes.html --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9f4197d5f..f3e628912 100644 --- 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.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-rc-1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From 8c932609d2d9c5033871a6524b89992c5110e462 Mon Sep 17 00:00:00 2001 From: Goooler Date: Wed, 19 Jul 2023 18:05:01 +0800 Subject: [PATCH 2/2] Run CI on Java 20 --- .github/workflows/ci.yml | 12 ++++++------ .github/workflows/release.yml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 71eb68ba0..f19c7fd76 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,7 +39,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: 18 + java-version: 20 - uses: gradle/gradle-build-action@v2 - run: ./gradlew lintKotlin @@ -50,7 +50,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: 18 + java-version: 20 - uses: gradle/gradle-build-action@v2 - run: ./gradlew detekt @@ -61,7 +61,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: 18 + java-version: 20 - uses: gradle/gradle-build-action@v2 - run: ./gradlew lintDebug @@ -74,7 +74,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: 18 + java-version: 20 - uses: gradle/gradle-build-action@v2 - run: ./gradlew testDebugUnitTest @@ -91,7 +91,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: 18 + java-version: 20 - uses: gradle/gradle-build-action@v2 - uses: actions/cache@v3 id: avd-cache @@ -125,7 +125,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: 18 + 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 e4f6da03e..d7459e526 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: 18 + java-version: 20 - uses: gradle/gradle-build-action@v2 - run: ./gradlew app:assembleProdRelease - uses: ncipollo/release-action@v1