From 3ba415a78da066b9cec0df7dd430354a91d2d5ee Mon Sep 17 00:00:00 2001 From: Dave Ames Date: Thu, 11 Jul 2024 13:32:42 +0100 Subject: [PATCH] Updated Gradle version and GitHub Workflows --- .github/workflows/extension-criteria.yml | 14 +++++++------- .github/workflows/standard-criteria.yml | 12 ++++++------ gradle/wrapper/gradle-wrapper.properties | 3 ++- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/.github/workflows/extension-criteria.yml b/.github/workflows/extension-criteria.yml index dedee23..ea75bc7 100644 --- a/.github/workflows/extension-criteria.yml +++ b/.github/workflows/extension-criteria.yml @@ -9,13 +9,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout project sources - uses: actions/checkout@v2 - - name: Setup Java 17 Version - uses: actions/setup-java@v3 + uses: actions/checkout@v4 + - name: Setup Java 21 Version + uses: actions/setup-java@v4 with: - distribution: 'oracle' - java-version: '17' + distribution: 'microsoft' + java-version: '21' - name: Setup Gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/actions/setup-gradle@v3 - name: Run build with Gradle Wrapper - run: ./gradlew test --tests com.booleanuk.extension.* + run: ./gradlew test --tests com.booleanuk.extension.* \ No newline at end of file diff --git a/.github/workflows/standard-criteria.yml b/.github/workflows/standard-criteria.yml index d5bd28a..3b9915d 100644 --- a/.github/workflows/standard-criteria.yml +++ b/.github/workflows/standard-criteria.yml @@ -9,13 +9,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout project sources - uses: actions/checkout@v2 - - name: Setup Java 17 Version - uses: actions/setup-java@v3 + uses: actions/checkout@v4 + - name: Setup Java 21 Version + uses: actions/setup-java@v4 with: - distribution: 'oracle' - java-version: '17' + distribution: 'microsoft' + java-version: '21' - name: Setup Gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/actions/setup-gradle@v3 - name: Run build with Gradle Wrapper run: ./gradlew test --tests com.booleanuk.core.* diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ae04661..2617362 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists