diff --git a/build.gradle.kts b/build.gradle.kts index a0bcd68..285cf4c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -23,7 +23,7 @@ repositories { dependencies { implementation("org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:4.0.0.2929") implementation("org.jlleitschuh.gradle.ktlint:org.jlleitschuh.gradle.ktlint.gradle.plugin:11.3.1") - implementation("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.22.0") + implementation("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.1") testImplementation(gradleTestKit()) testImplementation("com.willowtreeapps.assertk:assertk-jvm:0.26.1") diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index c1962a7..033e24c 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0c85a1f..9f4197d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index aeb74cb..fcb6fca 100755 --- a/gradlew +++ b/gradlew @@ -130,10 +130,13 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. diff --git a/src/main/kotlin/com/ekino/oss/plugin/KotlinQualityPlugin.kt b/src/main/kotlin/com/ekino/oss/plugin/KotlinQualityPlugin.kt index 381ed7a..6fa659a 100644 --- a/src/main/kotlin/com/ekino/oss/plugin/KotlinQualityPlugin.kt +++ b/src/main/kotlin/com/ekino/oss/plugin/KotlinQualityPlugin.kt @@ -93,7 +93,7 @@ class KotlinQualityPlugin : Plugin { } configure { - config = files(detektConfigFiles) + config.from(files(detektConfigFiles)) buildUponDefaultConfig = true } diff --git a/src/test/kotlin/com/ekino/oss/plugin/GradleVersionsCompatibilityTest.kt b/src/test/kotlin/com/ekino/oss/plugin/GradleVersionsCompatibilityTest.kt index 2f73afb..a0ad0ba 100644 --- a/src/test/kotlin/com/ekino/oss/plugin/GradleVersionsCompatibilityTest.kt +++ b/src/test/kotlin/com/ekino/oss/plugin/GradleVersionsCompatibilityTest.kt @@ -18,7 +18,7 @@ class GradleVersionsCompatibilityTest { @TempDir lateinit var tempDir: File - @ValueSource(strings = ["7.6.1", "8.1"]) + @ValueSource(strings = ["7.6.1", "8.1", "8.2.1"]) @ParameterizedTest(name = "Gradle {0}") @DisplayName("Should work in Gradle version") fun shouldWorkInGradleVersion(gradleVersion: String) { diff --git a/src/test/kotlin/com/ekino/oss/plugin/KotlinQualityPluginIT.kt b/src/test/kotlin/com/ekino/oss/plugin/KotlinQualityPluginIT.kt index cc9348a..6ac09cf 100644 --- a/src/test/kotlin/com/ekino/oss/plugin/KotlinQualityPluginIT.kt +++ b/src/test/kotlin/com/ekino/oss/plugin/KotlinQualityPluginIT.kt @@ -99,14 +99,14 @@ class KotlinQualityPluginIT { fun `custom detekt config with default name`(@TempDir tempDir: Path) { val result = runTask("project_with_custom_detekt", tempDir) - assertThat(result.output).contains("EmptyClassBlock", "UnnecessaryAbstractClass") + assertThat(result.output).contains("EmptyClassBlock") } @Test fun `custom detekt config with custom name`(@TempDir tempDir: Path) { val result = runTask("project_with_custom_detekt_extension", tempDir) - assertThat(result.output).contains("EmptyClassBlock", "UnnecessaryAbstractClass") + assertThat(result.output).contains("EmptyClassBlock") } @Test