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

---
 .idea/misc.xml                                |  3 +++
 config/detekt/baseline.xml                    |  1 -
 lib/bld/bld-wrapper.properties                |  1 +
 pom.xml                                       | 18 +++++++++++++
 .../erik/pinboard/PinboardPosterBuild.java    | 26 +++++++++++++++++--
 5 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index dd194dc..c80528e 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,6 +3,9 @@
   <component name="EntryPointsManager">
     <pattern value="net.thauvin.erik.PinboardPosterBuild" method="jacoco" />
     <pattern value="net.thauvin.erik.pinboard.PinboardPosterBuild" method="jacoco" />
+    <pattern value="net.thauvin.erik.pinboard.PinboardPosterBuild" method="detekt" />
+    <pattern value="net.thauvin.erik.pinboard.PinboardPosterBuild" method="detektBaseline" />
+    <pattern value="net.thauvin.erik.pinboard.PinboardPosterBuild" />
   </component>
   <component name="PDMPlugin">
     <option name="customRuleSets">
diff --git a/config/detekt/baseline.xml b/config/detekt/baseline.xml
index 278860b..6c39509 100644
--- a/config/detekt/baseline.xml
+++ b/config/detekt/baseline.xml
@@ -7,6 +7,5 @@
     <ID>NestedBlockDepth:PinboardPoster.kt$PinboardPoster$private fun executeMethod(method: String, params: Map&lt;String, String>): Boolean</ID>
     <ID>ThrowsCount:PinboardPoster.kt$PinboardPoster$@Throws(IOException::class) internal fun parseMethodResponse(method: String, response: String)</ID>
     <ID>TooManyFunctions:PinConfig.kt$PinConfig$Builder</ID>
-    <ID>WildcardImport:PinboardPosterTest.kt$import org.testng.Assert.*</ID>
   </CurrentIssues>
 </SmellBaseline>
diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties
index ff9973f..ac34063 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=com.uwyn.rife2:bld-kotlin:0.9.0-SNAPSHOT
+bld.extension-detekt=com.uwyn.rife2:bld-detekt:0.9.0-SNAPSHOT
 bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
 bld.downloadLocation=
 bld.sourceDirectories=
diff --git a/pom.xml b/pom.xml
index cd32fe8..c36e607 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/pinboard/PinboardPosterBuild.java b/src/bld/java/net/thauvin/erik/pinboard/PinboardPosterBuild.java
index f30b68f..91100d8 100644
--- a/src/bld/java/net/thauvin/erik/pinboard/PinboardPosterBuild.java
+++ b/src/bld/java/net/thauvin/erik/pinboard/PinboardPosterBuild.java
@@ -34,6 +34,7 @@ package net.thauvin.erik.pinboard;
 import rife.bld.BuildCommand;
 import rife.bld.Project;
 import rife.bld.extension.CompileKotlinOperation;
+import rife.bld.extension.DetektOperation;
 import rife.bld.extension.JacocoReportOperation;
 import rife.bld.extension.dokka.DokkaOperation;
 import rife.bld.extension.dokka.LoggingLevel;
@@ -66,9 +67,13 @@ public class PinboardPosterBuild extends Project {
         autoDownloadPurge = true;
         repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL);
 
-        var okHttp = version(4, 12, 0);
+        final 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));
         scope(test)
@@ -122,6 +127,23 @@ public class PinboardPosterBuild 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 JaCoCo Reports")
     public void jacoco() throws IOException {
         new JacocoReportOperation()