update gradle to 7.4

This commit is contained in:
2022-02-25 22:06:43 +01:00
committed by Fabrice Lecomte
parent 9460992f37
commit ac5dbbc384
2 changed files with 26 additions and 31 deletions

View File

@@ -21,6 +21,10 @@ jobs:
uses: actions/setup-java@v1 uses: actions/setup-java@v1
with: with:
java-version: 11 java-version: 11
- name: Setup Gradle
uses: gradle/gradle-build-action@v2
with:
gradle-version: '7.4'
- name: Cache Gradle packages - name: Cache Gradle packages
uses: actions/cache@v2 uses: actions/cache@v2
@@ -32,26 +36,17 @@ jobs:
restore-keys: | restore-keys: |
${{ runner.os }}-gradle- ${{ runner.os }}-gradle-
- name: Build - name: Build
uses: eskatos/gradle-command-action@v1 uses: gradle/gradle-build-action@v2
with: with:
gradle-version: '7.2' gradle-version: '7.4'
arguments: build -x test -x ktlintKotlinScriptCheck -x ktlintTestSourceSetCheck -x ktlintMainSourceSetCheck -x detekt arguments: build -x test -x ktlintKotlinScriptCheck -x ktlintTestSourceSetCheck -x ktlintMainSourceSetCheck -x detekt
- name: Cleanup Gradle Cache
# Remove some files from the Gradle cache, so they aren't cached by GitHub Actions.
# Restoring these files from a GitHub Actions cache might cause problems for future builds.
run: |
rm -f ~/.gradle/caches/modules-2/modules-2.lock
rm -f ~/.gradle/caches/modules-2/gc.properties
- name: processResources - name: processResources
uses: eskatos/gradle-command-action@v1 run: gradle processResources
with:
gradle-version: '7.2'
arguments: processResources
- name: processTestResources - name: processTestResources
uses: eskatos/gradle-command-action@v1 uses: gradle/gradle-build-action@v2
with: with:
gradle-version: '7.2' gradle-version: '7.4'
arguments: processResources arguments: processResources
- uses: actions/upload-artifact@v2 - uses: actions/upload-artifact@v2
with: with:
@@ -74,15 +69,15 @@ jobs:
path: build path: build
- name: Composer Up - name: Composer Up
uses: eskatos/gradle-command-action@v1 uses: gradle/gradle-build-action@v2
with: with:
gradle-version: '7.2' gradle-version: '7.4'
arguments: testSqlComposeUp arguments: testSqlComposeUp
- name: TestSql - name: TestSql
uses: eskatos/gradle-command-action@v1 uses: gradle/gradle-build-action@v2
with: with:
gradle-version: '7.2' gradle-version: '7.4'
arguments: testSql arguments: testSql
test: test:
@@ -103,21 +98,21 @@ jobs:
path: build path: build
- name: Composer Up - name: Composer Up
uses: eskatos/gradle-command-action@v1 uses: gradle/gradle-build-action@v2
with: with:
gradle-version: '7.2' gradle-version: '7.4'
arguments: testComposeUp arguments: testComposeUp
- name: Test - name: Test
uses: eskatos/gradle-command-action@v1 uses: gradle/gradle-build-action@v2
with: with:
gradle-version: '7.2' gradle-version: '7.4'
arguments: test arguments: test
- name: Coverage - name: Coverage
uses: eskatos/gradle-command-action@v1 uses: gradle/gradle-build-action@v2
with: with:
gradle-version: '7.2' gradle-version: '7.4'
arguments: coveralls arguments: coveralls
env: env:
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
@@ -130,18 +125,18 @@ jobs:
restore-keys: ${{ runner.os }}-sonar restore-keys: ${{ runner.os }}-sonar
- name: Test - name: Test
uses: eskatos/gradle-command-action@v1 uses: gradle/gradle-build-action@v2
with: with:
gradle-version: '7.2' gradle-version: '7.4'
arguments: test arguments: test
- name: Build and analyze - name: Build and analyze
uses: eskatos/gradle-command-action@v1 uses: gradle/gradle-build-action@v2
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
with: with:
gradle-version: '7.2' gradle-version: '7.4'
arguments: sonarqube --info arguments: sonarqube --info
lint: lint:
@@ -159,7 +154,7 @@ jobs:
name: Build name: Build
path: build path: build
- name: Lint - name: Lint
uses: eskatos/gradle-command-action@v1 uses: gradle/gradle-build-action@v2
with: with:
gradle-version: '7.2' gradle-version: '7.4'
arguments: ktlintCheck arguments: ktlintCheck

View File

@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists