From 216ad5d6934c18949b63a826d8d1661babd6748f Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Fri, 14 Apr 2023 19:20:30 +0200 Subject: [PATCH] Bump JDK to 17 Signed-off-by: Andy Scherzinger --- .github/workflows/analysis.yml | 4 ++-- .github/workflows/assembleFlavors.yml | 2 +- .github/workflows/check.yml | 4 ++-- .github/workflows/codeql.yml | 2 +- .github/workflows/qa.yml | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml index 66dccebda..38e86bf34 100644 --- a/.github/workflows/analysis.yml +++ b/.github/workflows/analysis.yml @@ -32,11 +32,11 @@ jobs: with: repository: ${{ steps.get-vars.outputs.repo }} ref: ${{ steps.get-vars.outputs.branch }} - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0 with: distribution: "temurin" - java-version: 11 + java-version: 17 - name: Install dependencies run: | python3 -m pip install defusedxml diff --git a/.github/workflows/assembleFlavors.yml b/.github/workflows/assembleFlavors.yml index 30a012487..1cc146743 100644 --- a/.github/workflows/assembleFlavors.yml +++ b/.github/workflows/assembleFlavors.yml @@ -20,7 +20,7 @@ jobs: uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0 with: distribution: "temurin" - java-version: 11 + java-version: 17 - name: Build ${{ matrix.flavor }} run: | echo "org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError" >> gradle.properties diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 7cbaf09b5..2db86b26d 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -16,10 +16,10 @@ jobs: task: [ detekt, ktlintCheck ] steps: - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0 with: distribution: "temurin" - java-version: 11 + java-version: 17 - name: Check ${{ matrix.task }} run: ./gradlew ${{ matrix.task }} diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index d34a7b604..7f7bbc2d0 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -39,7 +39,7 @@ jobs: uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0 with: distribution: "temurin" - java-version: 11 + java-version: 17 - name: Assemble run: | mkdir -p "$HOME/.gradle" diff --git a/.github/workflows/qa.yml b/.github/workflows/qa.yml index 6ea028214..bfb191c11 100644 --- a/.github/workflows/qa.yml +++ b/.github/workflows/qa.yml @@ -17,12 +17,12 @@ jobs: id: check-secrets - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0 if: ${{ steps.check-secrets.outputs.ok == 'true' }} - - name: set up JDK 11 + - name: set up JDK 17 uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0 if: ${{ steps.check-secrets.outputs.ok == 'true' }} with: distribution: "temurin" - java-version: 11 + java-version: 17 - name: Build QA if: ${{ steps.check-secrets.outputs.ok == 'true' }} env: