From 7a9d960a4dee04d70267a320b1d988004988eed2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 29 Sep 2023 19:21:02 +0200 Subject: [PATCH 1/4] Update plugin com.gradle.common-custom-user-data-gradle-plugin to v1.11.3 (#6517) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- settings.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index 51e11c47d377..475ce633c92f 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -46,7 +46,7 @@ enableFeaturePreview("STABLE_CONFIGURATION_CACHE") // build scan plugin can only be applied in settings file plugins { id("com.gradle.enterprise") version "3.13.4" - id("com.gradle.common-custom-user-data-gradle-plugin") version "1.11.2" + id("com.gradle.common-custom-user-data-gradle-plugin") version "1.11.3" } val isCiBuild = providers.environmentVariable("CI").isPresent From 3b23142b582403b79cde03767644812bd7458869 Mon Sep 17 00:00:00 2001 From: Pablo Baxter Date: Sat, 30 Sep 2023 20:46:55 -0700 Subject: [PATCH 2/4] Fix inputstream leaking file descriptor in Gradle (#6519) --- .../io/gitlab/arturbosch/detekt/extensions/DetektExtension.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/extensions/DetektExtension.kt b/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/extensions/DetektExtension.kt index 89021b4e1001..388a878acc7a 100644 --- a/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/extensions/DetektExtension.kt +++ b/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/extensions/DetektExtension.kt @@ -65,7 +65,7 @@ internal fun loadDetektVersion(classLoader: ClassLoader): String { .toList() .mapNotNull { versions -> Properties().run { - load(versions.openSafeStream()) + versions.openSafeStream().use(::load) getProperty("detektVersion") } } From 7d10be10b35c75ab7a5597a4ef5122c41cb62211 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 1 Oct 2023 12:16:17 +0200 Subject: [PATCH 3/4] Update gradle/gradle-build-action digest to 842c587 (#6520) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/codecoverage.yaml | 2 +- .github/workflows/deploy-snapshot.yaml | 2 +- .github/workflows/detekt-with-type-resolution.yaml | 4 ++-- .github/workflows/pre-merge.yaml | 8 ++++---- .github/workflows/website.yaml | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/codecoverage.yaml b/.github/workflows/codecoverage.yaml index 9155a5a14f5b..ecf418bf17fd 100644 --- a/.github/workflows/codecoverage.yaml +++ b/.github/workflows/codecoverage.yaml @@ -26,7 +26,7 @@ jobs: distribution: 'temurin' - name: Setup Gradle - uses: gradle/gradle-build-action@b5126f31dbc19dd434c3269bf8c28c315e121da2 # v2 + uses: gradle/gradle-build-action@842c587ad8aa4c68eeba24c396e15af4c2e9f30a # v2 with: gradle-home-cache-cleanup: true diff --git a/.github/workflows/deploy-snapshot.yaml b/.github/workflows/deploy-snapshot.yaml index 389ca2d4edb7..c7359a1fa6f8 100644 --- a/.github/workflows/deploy-snapshot.yaml +++ b/.github/workflows/deploy-snapshot.yaml @@ -27,7 +27,7 @@ jobs: distribution: "temurin" - name: Setup Gradle - uses: gradle/gradle-build-action@b5126f31dbc19dd434c3269bf8c28c315e121da2 # v2 + uses: gradle/gradle-build-action@842c587ad8aa4c68eeba24c396e15af4c2e9f30a # v2 with: gradle-home-cache-cleanup: true diff --git a/.github/workflows/detekt-with-type-resolution.yaml b/.github/workflows/detekt-with-type-resolution.yaml index e75fbe8733c8..cbfd41957cc9 100644 --- a/.github/workflows/detekt-with-type-resolution.yaml +++ b/.github/workflows/detekt-with-type-resolution.yaml @@ -31,7 +31,7 @@ jobs: distribution: 'temurin' - name: Setup Gradle - uses: gradle/gradle-build-action@b5126f31dbc19dd434c3269bf8c28c315e121da2 # v2 + uses: gradle/gradle-build-action@842c587ad8aa4c68eeba24c396e15af4c2e9f30a # v2 with: gradle-home-cache-cleanup: true @@ -61,7 +61,7 @@ jobs: distribution: 'temurin' - name: Setup Gradle - uses: gradle/gradle-build-action@b5126f31dbc19dd434c3269bf8c28c315e121da2 # v2 + uses: gradle/gradle-build-action@842c587ad8aa4c68eeba24c396e15af4c2e9f30a # v2 with: gradle-home-cache-cleanup: true diff --git a/.github/workflows/pre-merge.yaml b/.github/workflows/pre-merge.yaml index d31194b1db90..a23373677b74 100644 --- a/.github/workflows/pre-merge.yaml +++ b/.github/workflows/pre-merge.yaml @@ -38,7 +38,7 @@ jobs: distribution: 'temurin' - name: Setup Gradle - uses: gradle/gradle-build-action@b5126f31dbc19dd434c3269bf8c28c315e121da2 # v2 + uses: gradle/gradle-build-action@842c587ad8aa4c68eeba24c396e15af4c2e9f30a # v2 with: gradle-home-cache-cleanup: true @@ -67,7 +67,7 @@ jobs: distribution: 'temurin' - name: Setup Gradle - uses: gradle/gradle-build-action@b5126f31dbc19dd434c3269bf8c28c315e121da2 # v2 + uses: gradle/gradle-build-action@842c587ad8aa4c68eeba24c396e15af4c2e9f30a # v2 with: gradle-home-cache-cleanup: true @@ -87,7 +87,7 @@ jobs: distribution: 'temurin' - name: Setup Gradle - uses: gradle/gradle-build-action@b5126f31dbc19dd434c3269bf8c28c315e121da2 # v2 + uses: gradle/gradle-build-action@842c587ad8aa4c68eeba24c396e15af4c2e9f30a # v2 with: gradle-home-cache-cleanup: true @@ -107,7 +107,7 @@ jobs: distribution: 'temurin' - name: Setup Gradle - uses: gradle/gradle-build-action@b5126f31dbc19dd434c3269bf8c28c315e121da2 # v2 + uses: gradle/gradle-build-action@842c587ad8aa4c68eeba24c396e15af4c2e9f30a # v2 with: gradle-home-cache-cleanup: true diff --git a/.github/workflows/website.yaml b/.github/workflows/website.yaml index 4efe0b18a631..c58e74ca9e7b 100644 --- a/.github/workflows/website.yaml +++ b/.github/workflows/website.yaml @@ -27,7 +27,7 @@ jobs: distribution: 'temurin' - name: Setup Gradle - uses: gradle/gradle-build-action@b5126f31dbc19dd434c3269bf8c28c315e121da2 # v2 + uses: gradle/gradle-build-action@842c587ad8aa4c68eeba24c396e15af4c2e9f30a # v2 with: gradle-home-cache-cleanup: true From 348cea01bbc04f8134dc8f9f5e8ddb7fc9059453 Mon Sep 17 00:00:00 2001 From: Jake Wharton Date: Mon, 2 Oct 2023 15:42:30 -0400 Subject: [PATCH 4/4] Correct reference to Gradle extension name (#6521) --- .../version-1.23.1/gettingstarted/compilerplugin.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/versioned_docs/version-1.23.1/gettingstarted/compilerplugin.mdx b/website/versioned_docs/version-1.23.1/gettingstarted/compilerplugin.mdx index 1e6f1ecda908..ff681283d76f 100644 --- a/website/versioned_docs/version-1.23.1/gettingstarted/compilerplugin.mdx +++ b/website/versioned_docs/version-1.23.1/gettingstarted/compilerplugin.mdx @@ -28,7 +28,7 @@ plugins { ## Configuring the Compiler Plugin -The compiler plugin can be configured using the `react{}` block in your gradle file. +The compiler plugin can be configured using the `detekt{}` block in your gradle file. The following options are allowed: