Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
kkocel committed Oct 3, 2023
2 parents b9cd728 + 348cea0 commit 8983a58
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/codecoverage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-snapshot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/detekt-with-type-resolution.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/pre-merge.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand All @@ -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

Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/website.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ internal fun loadDetektVersion(classLoader: ClassLoader): String {
.toList()
.mapNotNull { versions ->
Properties().run {
load(versions.openSafeStream())
versions.openSafeStream().use(::load)
getProperty("detektVersion")
}
}
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down

0 comments on commit 8983a58

Please sign in to comment.