From 1b923b34346ec2550600d4f20617c9e9571588a6 Mon Sep 17 00:00:00 2001 From: Peter Trifanov Date: Sat, 3 Feb 2024 16:33:07 +0100 Subject: [PATCH 1/8] Update gradle-wrapper.properties --- 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 46671ac..e4e331e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists distributionSha256Sum=3e1af3ae886920c3ac87f7a91f816c0c7c436f276a6eefdb3da152100fef72ae -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From fdbfa23ec1e98b9616ff126c9e942a0bd9a0968e Mon Sep 17 00:00:00 2001 From: Peter Trifanov Date: Sat, 3 Feb 2024 16:36:47 +0100 Subject: [PATCH 2/8] Update build_and_test.yml --- .github/workflows/build_and_test.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 32add2e..60cd55a 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -20,12 +20,13 @@ jobs: with: distribution: temurin java-version: 11 - - uses: gradle/gradle-build-action@v2 - name: build and test + - uses: gradle/actions/setup-gradle@v3 + name: Setup Gradle with: - arguments: check build -x detekt -Pdetekt.multiplatform.disabled=true --scan gradle-version: wrapper - dependency-graph: generate-and-submit + cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }} + - name: build and test + run: ./gradlew check build -x detekt -Pdetekt.multiplatform.disabled=true --scan --configuration-cache - name: Upload test reports if: ${{ failure() }} # runs only if previous step has failed, the entire workflow will still be marked as failed uses: actions/upload-artifact@v4 @@ -37,6 +38,10 @@ jobs: with: flags: unittests fail_ci_if_error: true # optional (default = false) + - name: Generate and submit dependency graph + uses: gradle/actions/dependency-submission@v3 + with: + cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }} - uses: gradle/gradle-build-action@v2 name: run detekt From e7ea5817b92361c7f9870636a67a92d7259cb7fd Mon Sep 17 00:00:00 2001 From: Peter Trifanov Date: Sat, 3 Feb 2024 16:39:26 +0100 Subject: [PATCH 3/8] Update gradle-wrapper.properties --- 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 e4e331e..4baf5a1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=3e1af3ae886920c3ac87f7a91f816c0c7c436f276a6eefdb3da152100fef72ae +distributionSha256Sum=9631d53cf3e74bfa726893aee1f8994fee4e060c401335946dba2156f440f24c distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip networkTimeout=10000 validateDistributionUrl=true From 3f86cd612a72247f196ab643691fc5a0b9e86254 Mon Sep 17 00:00:00 2001 From: Peter Trifanov Date: Sat, 3 Feb 2024 16:44:56 +0100 Subject: [PATCH 4/8] Update build_and_test.yml --- .github/workflows/build_and_test.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 60cd55a..e858db9 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -26,7 +26,7 @@ jobs: gradle-version: wrapper cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }} - name: build and test - run: ./gradlew check build -x detekt -Pdetekt.multiplatform.disabled=true --scan --configuration-cache + run: ./gradlew check build -x detekt -Pdetekt.multiplatform.disabled=true --scan - name: Upload test reports if: ${{ failure() }} # runs only if previous step has failed, the entire workflow will still be marked as failed uses: actions/upload-artifact@v4 @@ -43,11 +43,8 @@ jobs: with: cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }} - - uses: gradle/gradle-build-action@v2 - name: run detekt - with: - arguments: check -Pdetekt.multiplatform.disabled=false -PdetektAutoCorrect=true - gradle-version: wrapper + - name: run detekt + run: ./gradlew check -Pdetekt.multiplatform.disabled=false -PdetektAutoCorrect=true - run: git status && git diff if: ${{ always() }} - uses: reviewdog/action-suggester@v1 From 10d01b53a8f31d5bd8b0d403f15c4288648a8871 Mon Sep 17 00:00:00 2001 From: Peter Trifanov Date: Sat, 3 Feb 2024 16:45:21 +0100 Subject: [PATCH 5/8] Update gradle-enterprise plugin --- settings.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index fdc44df..d2153c4 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -6,7 +6,7 @@ pluginManagement { } plugins { - id("com.gradle.enterprise") version("3.15.1") + id("com.gradle.enterprise") version("3.16.1") id("org.ajoberstar.reckon.settings") version("0.18.0") } From 8f5be7688be3b7f95025be3235bd37a2e5591bda Mon Sep 17 00:00:00 2001 From: Peter Trifanov Date: Sat, 3 Feb 2024 16:52:03 +0100 Subject: [PATCH 6/8] Update build_and_test.yml --- .github/workflows/build_and_test.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index e858db9..3c0b0fd 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -25,6 +25,7 @@ jobs: with: gradle-version: wrapper cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }} + dependency-graph: generate-and-submit - name: build and test run: ./gradlew check build -x detekt -Pdetekt.multiplatform.disabled=true --scan - name: Upload test reports @@ -38,10 +39,6 @@ jobs: with: flags: unittests fail_ci_if_error: true # optional (default = false) - - name: Generate and submit dependency graph - uses: gradle/actions/dependency-submission@v3 - with: - cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }} - name: run detekt run: ./gradlew check -Pdetekt.multiplatform.disabled=false -PdetektAutoCorrect=true From c2e92babd805f7887b691a45f68aedf1ffb25d2e Mon Sep 17 00:00:00 2001 From: Peter Trifanov Date: Sat, 3 Feb 2024 16:52:17 +0100 Subject: [PATCH 7/8] Update settings.gradle.kts --- settings.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index d2153c4..8ee4059 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -6,7 +6,7 @@ pluginManagement { } plugins { - id("com.gradle.enterprise") version("3.16.1") + id("com.gradle.enterprise") version("3.16.2") id("org.ajoberstar.reckon.settings") version("0.18.0") } From 1833056e02f8c9dae249f1bb04b7e3c7bb24e53b Mon Sep 17 00:00:00 2001 From: Peter Trifanov Date: Sat, 3 Feb 2024 16:53:56 +0100 Subject: [PATCH 8/8] Update build_and_test.yml --- .github/workflows/build_and_test.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 3c0b0fd..4a5ba3d 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -6,6 +6,9 @@ on: branches: - 'main' +permissions: + contents: write # https://github.com/gradle/actions/blob/main/setup-gradle/README.md#basic-usage + jobs: build_and_test_with_code_coverage: name: Build, test and upload code coverage