Merge pull request #120 from ekino/dependabot/gradle/io.gitlab.arturb…

…osch.detekt-detekt-gradle-plugin-1.23.1

chore(deps): bump io.gitlab.arturbosch.detekt:detekt-gradle-plugin from 1.22.0 to 1.23.1

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")

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

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.

src/main/kotlin/com/ekino/oss/plugin/KotlinQualityPlugin.kt

@@ -93,7 +93,7 @@ class KotlinQualityPlugin : Plugin<Project> {
       }
 
       configure<DetektExtension> {
-        config = files(detektConfigFiles)
+        config.from(files(detektConfigFiles))
         buildUponDefaultConfig = true
       }
 

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) {

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