From ac5cb0ef07c5fabc354893d3fa12c66b85905b10 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sat, 25 Nov 2023 21:46:55 -0800
Subject: [PATCH] Added detekt extension

---
 .idea/misc.xml                                |  2 ++
 config/detekt/baseline.xml                    |  1 +
 lib/bld/bld-wrapper.properties                |  1 +
 pom.xml                                       | 18 +++++++++++++++
 .../java/net/thauvin/erik/AkismetBuild.java   | 23 ++++++++++++++++++-
 5 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 7a6aa48..c5a2e9b 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,6 +4,8 @@
     <pattern value="net.thauvin.erik.AkismetBuild" />
     <pattern value="net.thauvin.erik.AkismetBuild" method="docs" />
     <pattern value="net.thauvin.erik.AkismetBuild" method="jacoco" />
+    <pattern value="net.thauvin.erik.AkismetBuild" method="detekt" />
+    <pattern value="net.thauvin.erik.AkismetBuild" method="detektBaseline" />
   </component>
   <component name="PDMPlugin">
     <option name="customRuleSets">
diff --git a/config/detekt/baseline.xml b/config/detekt/baseline.xml
index c62f0b7..0c56b4a 100644
--- a/config/detekt/baseline.xml
+++ b/config/detekt/baseline.xml
@@ -9,5 +9,6 @@
     <ID>NestedBlockDepth:Akismet.kt$Akismet$@JvmOverloads fun executeMethod(apiUrl: HttpUrl, formBody: FormBody, trueOnError: Boolean = false): Boolean</ID>
     <ID>NestedBlockDepth:AkismetTest.kt$fun getKey(key: String): String</ID>
     <ID>ReturnCount:Akismet.kt$Akismet$@JvmOverloads fun executeMethod(apiUrl: HttpUrl, formBody: FormBody, trueOnError: Boolean = false): Boolean</ID>
+    <ID>WildcardImport:AkismetTest.kt$import assertk.assertions.*</ID>
   </CurrentIssues>
 </SmellBaseline>
diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties
index 74dfad6..78e29f1 100644
--- a/lib/bld/bld-wrapper.properties
+++ b/lib/bld/bld-wrapper.properties
@@ -2,6 +2,7 @@ bld.downloadExtensionJavadoc=false
 bld.downloadExtensionSources=true
 bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.1
 bld.extensions-kotlin=com.uwyn.rife2:bld-kotlin:0.9.0-SNAPSHOT
+bld.extensions-detekt=com.uwyn.rife2:bld-detekt:0.9.0-SNAPSHOT
 bld.extensions=com.uwyn.rife2:bld-generated-version:0.9.3
 bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
 bld.downloadLocation=
diff --git a/pom.xml b/pom.xml
index 5f65e61..2a36584 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,6 +21,24 @@
       <version>1.9.21</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.jetbrains.kotlin</groupId>
+      <artifactId>kotlin-stdlib-common</artifactId>
+      <version>1.9.21</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jetbrains.kotlin</groupId>
+      <artifactId>kotlin-stdlib-jdk7</artifactId>
+      <version>1.9.21</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jetbrains.kotlin</groupId>
+      <artifactId>kotlin-stdlib-jdk8</artifactId>
+      <version>1.9.21</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>com.squareup.okhttp3</groupId>
       <artifactId>okhttp</artifactId>
diff --git a/src/bld/java/net/thauvin/erik/AkismetBuild.java b/src/bld/java/net/thauvin/erik/AkismetBuild.java
index f32d1e8..8e6febb 100644
--- a/src/bld/java/net/thauvin/erik/AkismetBuild.java
+++ b/src/bld/java/net/thauvin/erik/AkismetBuild.java
@@ -64,8 +64,12 @@ public class AkismetBuild extends Project {
         repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL);
 
         var okHttp = version(4, 12, 0);
+        final var kotlin = version(1, 9, 21);
         scope(compile)
-                .include(dependency("org.jetbrains.kotlin", "kotlin-stdlib", version(1, 9, 21)))
+                .include(dependency("org.jetbrains.kotlin", "kotlin-stdlib", kotlin))
+                .include(dependency("org.jetbrains.kotlin", "kotlin-stdlib-common", kotlin))
+                .include(dependency("org.jetbrains.kotlin", "kotlin-stdlib-jdk7", kotlin))
+                .include(dependency("org.jetbrains.kotlin", "kotlin-stdlib-jdk8", kotlin))
                 .include(dependency("com.squareup.okhttp3", "okhttp", okHttp))
                 .include(dependency("com.squareup.okhttp3", "logging-interceptor", okHttp))
                 .include(dependency("jakarta.servlet", "jakarta.servlet-api", version(6, 0, 0)))
@@ -127,6 +131,23 @@ public class AkismetBuild extends Project {
                 .execute();
     }
 
+    @BuildCommand(summary = "Checks source with Detekt")
+    public void detekt() throws ExitStatusException, IOException, InterruptedException {
+        new DetektOperation()
+                .fromProject(this)
+                .baseline("config/detekt/baseline.xml")
+                .execute();
+    }
+
+    @BuildCommand(value = "detekt-baseline", summary = "Creates the Detekt baseline")
+    public void detektBaseline() throws ExitStatusException, IOException, InterruptedException {
+        new DetektOperation()
+                .fromProject(this)
+                .baseline("config/detekt/baseline.xml")
+                .createBaseline(true)
+                .execute();
+    }
+
     @BuildCommand(summary = "Generates documentation in HTML format")
     public void docs() throws ExitStatusException, IOException, InterruptedException {
         var kotlin = new File(srcMainDirectory(), "kotlin").getAbsolutePath();