Bumped to bld 1.9.0

.circleci/config.yml

@@ -6,7 +6,7 @@ defaults: &defaults
     TERM: dumb
     CI_NAME: "CircleCI"
 
-defaults_gradle: &defaults_bld
+defaults_bld: &defaults_bld
   steps:
     - checkout
     - run:

.idea/libraries/bld.xml

@@ -2,12 +2,12 @@
   <library name="bld">
     <CLASSES>
       <root url="file://$PROJECT_DIR$/lib/bld" />
-      <root url="jar://$USER_HOME$/.bld/dist/bld-1.8.0.jar!/" />
+      <root url="jar://$USER_HOME$/.bld/dist/bld-1.9.0.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
       <root url="file://$PROJECT_DIR$/lib/bld" />
-      <root url="jar://$USER_HOME$/.bld/dist/bld-1.8.0-sources.jar!/" />
+      <root url="jar://$USER_HOME$/.bld/dist/bld-1.9.0-sources.jar!/" />
     </SOURCES>
     <excluded>
       <root url="jar://$PROJECT_DIR$/lib/bld/bld-wrapper.jar!/" />

.idea/misc.xml

@@ -17,6 +17,12 @@
         <option value="$PROJECT_DIR$/../../java/bld-checkstyle/config/pmd.xml" />
         <option value="$PROJECT_DIR$/../../java/bld-exec/config/pmd.xml" />
         <option value="$PROJECT_DIR$/../../java/bld-testng/config/pmd.xml" />
+        <option value="$PROJECT_DIR$/../../java/rife2/bld-checkstyle/config/pmd.xml" />
+        <option value="$PROJECT_DIR$/../../java/rife2/bld-generated-version/config/pmd.xml" />
+        <option value="$PROJECT_DIR$/../../java/rife2/bld-jacoco-report/config/pmd.xml" />
+        <option value="$PROJECT_DIR$/../../java/rife2/bld-testng/config/pmd.xml" />
+        <option value="$PROJECT_DIR$/../../java/rife2/bld-exec/config/pmd.xml" />
+        <option value="$PROJECT_DIR$/../../java/rife2/bld-pitest/config/pmd.xml" />
       </list>
     </option>
     <option name="skipTestSources" value="false" />

.vscode/launch.json

@@ -1,11 +0,0 @@
-{
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "type": "java",
-            "name": "Run Tests",
-            "request": "launch",
-            "mainClass": "net.thauvin.erik.AkismetTest"
-        }
-    ]
-}

.vscode/settings.json

@@ -1,15 +0,0 @@
-{
-    "java.project.sourcePaths": [
-        "src/main/java",
-        "src/main/resources",
-        "src/test/java",
-        "src/bld/java"
-    ],
-    "java.configuration.updateBuildConfiguration": "automatic",
-    "java.project.referencedLibraries": [
-        "${HOME}/.bld/dist/bld-1.8.0.jar",
-        "lib/compile/*.jar",
-        "lib/runtime/*.jar",
-        "lib/test/*.jar"
-    ]
-}

README.md

@@ -1,6 +1,6 @@
 [![License (3-Clause BSD)](https://img.shields.io/badge/license-BSD%203--Clause-blue.svg?style=flat-square)](https://opensource.org/licenses/BSD-3-Clause)
 [![Kotlin](https://img.shields.io/badge/kotlin-1.9.21-7f52ff)](https://kotlinlang.org/)
-[![bld](https://img.shields.io/badge/1.8.0-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld)
+[![bld](https://img.shields.io/badge/1.9.0-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld)
 [![Release](https://img.shields.io/github/release/ethauvin/akismet-kotlin.svg)](https://github.com/ethauvin/akismet-kotlin/releases/latest)
 [![Nexus Snapshot](https://img.shields.io/nexus/s/net.thauvin.erik/akismet-kotlin?label=snapshot&server=https%3A%2F%2Foss.sonatype.org%2F)](https://oss.sonatype.org/content/repositories/snapshots/net/thauvin/erik/akismet-kotlin/)
 [![Maven Central](https://img.shields.io/maven-central/v/net.thauvin.erik/akismet-kotlin.svg?color=blue)](https://central.sonatype.com/artifact/net.thauvin.erik/akismet-kotlin)
@@ -15,7 +15,7 @@ A pretty complete and straightforward implementation of the [Automattic's Akisme
 
 ## Examples (TL;DR)
 
-#### Kotlin
+### Kotlin
 
 ```kotlin
 val akismet = Akismet(apiKey = "YOUR_API_KEY", blog = "YOUR_BLOG_URL")
@@ -40,7 +40,7 @@ if (isSpam) {
 
 [View Full Examples](https://github.com/ethauvin/akismet-kotlin/blob/master/examples)
 
-#### Java
+### Java
 
 ```java
 final Akismet akismet = new Akismet("YOUR_API_KEY", "YOUR_BLOG_URL");
@@ -63,7 +63,7 @@ if (isSpam) {
 
 [View Full Examples](https://github.com/ethauvin/akismet-kotlin/blob/master/examples)
 
-### bld
+## bld
 
 To use with [bld](https://rife2.com/bld), include the following dependency in your [build](https://github.com/ethauvin/akismet-kotlin/blob/master/examples/bld/src/bld/java/com/example/ExampleBuild.java) file:
 
@@ -74,7 +74,7 @@ scope(compile)
     .include(dependency("net.thauvin.erik:akismet-kotlin:1.0.0"));
 ```
 
-### Gradle
+## Gradle
 
 To use with [Gradle](https://gradle.org/), include the following dependency in your [build](https://github.com/ethauvin/akismet-kotlin/blob/master/examples/gradle/build.gradle.kts) file:
 
@@ -90,7 +90,7 @@ dependencies {
 
 Instructions for using with Maven, Ivy, etc. can be found on [Maven Central](https://central.sonatype.com/artifact/net.thauvin.erik/akismet-kotlin).
 
-### HttpServletRequest
+## HttpServletRequest
 
 The more information is sent to Akismet, the more accurate the response is. An [HttpServletRequest](https://javaee.github.io/javaee-spec/javadocs/javax/servlet/http/HttpServletRequest.html) can be used as a parameter so that all the relevant information is automatically included.
 
@@ -102,7 +102,7 @@ This will ensure that the user's IP, agent, referrer and various environment var
 
 [View Full Example](https://github.com/ethauvin/akismet-kotlin/blob/master/examples/src/main/kotlin/com/example/AkismetServlet.kt)
 
-### JSON
+## JSON
 
 Since comments mis-identified as spam or ham can be submitted to Askimet to improve the service. A comment can be saved as a JSON object to be stored in a database, etc.
 
@@ -116,10 +116,6 @@ At a latter time, the comment can then be submitted:
 akismet.submitSpam(Akismet.jsonComment(json))
 ```
 
-### More…
-
-If all else fails, there's always more [Documentation](https://ethauvin.github.io/akismet-kotlin/).
-
 ## Contributing
 
 If you want to contribute to this project, all you have to do is clone the GitHub
@@ -136,5 +132,8 @@ cd akismet-kotlin
 ./bld compile
 ```
 
-The project has an [IntelliJ IDEA](https://www.jetbrains.com/idea/) project structure. You can just open it after all
-the dependencies were downloaded and peruse the code.
+The project has an [IntelliJ IDEA](https://www.jetbrains.com/idea/) project structure. You can just open it after all the dependencies were downloaded and peruse the code.
+
+### More…
+
+If all else fails, there's always more [Documentation](https://ethauvin.github.io/akismet-kotlin/).

config/detekt/baseline.xml

@@ -1,12 +1,14 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" ?>
 <SmellBaseline>
-  <ManuallySuppressedIssues/>
+  <ManuallySuppressedIssues></ManuallySuppressedIssues>
   <CurrentIssues>
     <ID>CyclomaticComplexMethod:Akismet.kt$Akismet$private fun buildFormBody(comment: AkismetComment): FormBody</ID>
     <ID>CyclomaticComplexMethod:AkismetComment.kt$AkismetComment$@Suppress("DuplicatedCode") override fun equals(other: Any?): Boolean</ID>
+    <ID>LongParameterList:AkismetServlet.kt$AkismetServlet$( id: String, name: String?, email: String?, date: String?, comment: String?, json: String, isSpam: Boolean )</ID>
     <ID>MagicNumber:Akismet.kt$Akismet$12</ID>
     <ID>MagicNumber:Akismet.kt$Akismet$8</ID>
     <ID>NestedBlockDepth:Akismet.kt$Akismet$@JvmOverloads fun executeMethod(apiUrl: HttpUrl, formBody: FormBody, trueOnError: Boolean = false): Boolean</ID>
+    <ID>NestedBlockDepth:AkismetExample.kt$fun main(args: Array&lt;String&gt;)</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>

examples/bld/.idea/libraries/bld.xml

@@ -2,12 +2,12 @@
   <library name="bld">
     <CLASSES>
       <root url="file://$PROJECT_DIR$/lib/bld" />
-      <root url="jar://$USER_HOME$/.bld/dist/bld-1.8.0.jar!/" />
+      <root url="jar://$USER_HOME$/.bld/dist/bld-1.9.0.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
       <root url="file://$PROJECT_DIR$/lib/bld" />
-      <root url="jar://$USER_HOME$/.bld/dist/bld-1.8.0-sources.jar!/" />
+      <root url="jar://$USER_HOME$/.bld/dist/bld-1.9.0-sources.jar!/" />
     </SOURCES>
     <excluded>
       <root url="jar://$PROJECT_DIR$/lib/bld/bld-wrapper.jar!/" />

examples/bld/.vscode/settings.json

@@ -3,13 +3,13 @@
         "src/main/java",
         "src/main/resources",
         "src/test/java",
-        "src/bld/java"
+        "src/test/resources",
+        "src/bld/java",
+        "src/bld/resources"
     ],
     "java.configuration.updateBuildConfiguration": "automatic",
     "java.project.referencedLibraries": [
-        "${HOME}/.bld/dist/bld-1.8.0.jar",
-        "lib/compile/*.jar",
-        "lib/runtime/*.jar",
-        "lib/test/*.jar"
+        "${HOME}/.bld/dist/bld-1.9.0.jar",
+        "lib/**/*.jar"
     ]
 }

examples/bld/lib/bld/bld-wrapper.properties

@@ -1,7 +1,7 @@
 bld.downloadExtensionJavadoc=false
 bld.downloadExtensionSources=true
-bld.extensions=com.uwyn.rife2:bld-kotlin:0.9.0-SNAPSHOT
+bld.extensions=com.uwyn.rife2:bld-kotlin:0.9.1
 bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
 bld.downloadLocation=
 bld.sourceDirectories=
-bld.version=1.8.0
+bld.version=1.9.0

examples/gradle/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

examples/gradle/gradlew.bat

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

lib/bld/bld-wrapper.properties

@@ -1,10 +1,10 @@
 bld.downloadExtensionJavadoc=false
 bld.downloadExtensionSources=true
-bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.2
-bld.extensions-kotlin=com.uwyn.rife2:bld-kotlin:0.9.0
-bld.extensions-detekt=com.uwyn.rife2:bld-detekt:0.9.0
-bld.extensions=com.uwyn.rife2:bld-generated-version:0.9.4
+bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.3
+bld.extensions-kotlin=com.uwyn.rife2:bld-kotlin:0.9.1
+bld.extensions-detekt=com.uwyn.rife2:bld-detekt:0.9.2
+bld.extensions=com.uwyn.rife2:bld-generated-version:0.9.5
 bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
 bld.downloadLocation=
 bld.sourceDirectories=
-bld.version=1.8.0
+bld.version=1.9.0

pom.xml

@@ -42,7 +42,7 @@
     <dependency>
       <groupId>org.jetbrains.kotlinx</groupId>
       <artifactId>kotlinx-serialization-json-jvm</artifactId>
-      <version>1.6.2</version>
+      <version>1.6.3</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

src/bld/java/net/thauvin/erik/AkismetBuild.java

@@ -73,14 +73,14 @@ public class AkismetBuild extends Project {
                 .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)))
-                .include(dependency("org.jetbrains.kotlinx", "kotlinx-serialization-json-jvm", version(1, 6, 2)));
+                .include(dependency("org.jetbrains.kotlinx", "kotlinx-serialization-json-jvm", version(1, 6, 3)));
         scope(provided)
                 .include(dependency("org.jetbrains.kotlin", "kotlin-serialization-compiler-plugin", version(1, 9, 22)));
         scope(test)
                 .include(dependency("org.mockito", "mockito-core", version(5, 10, 0)))
                 .include(dependency("org.jetbrains.kotlin", "kotlin-test-junit5", version(1, 9, 22)))
-                .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 10, 1)))
-                .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 10, 1)))
+                .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 10, 2)))
+                .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 10, 2)))
                 .include(dependency("com.willowtreeapps.assertk", "assertk-jvm", version(0, 28, 0)));
 
         publishOperation()
@@ -119,14 +119,14 @@ public class AkismetBuild extends Project {
 
     public static void main(String[] args) {
         // Enable detailed logging for the Kotlin extension
-        var level = Level.ALL;
-        var logger = Logger.getLogger("rife.bld.extension");
-        var consoleHandler = new ConsoleHandler();
+        // var level = Level.ALL;
+        // var logger = Logger.getLogger("rife.bld.extension");
+        // var consoleHandler = new ConsoleHandler();
 
-        consoleHandler.setLevel(level);
-        logger.addHandler(consoleHandler);
-        logger.setLevel(level);
-        logger.setUseParentHandlers(false);
+        // consoleHandler.setLevel(level);
+        // logger.addHandler(consoleHandler);
+        // logger.setLevel(level);
+        // logger.setUseParentHandlers(false);
 
         new AkismetBuild().start(args);
     }