diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index 86ebe4c..54d38d2 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,18 +1,13 @@
-
-
-
-
-
-
-
+
+
diff --git a/.idea/libraries/bld.xml b/.idea/libraries/bld.xml
index 2fb5ff0..a2969be 100644
--- a/.idea/libraries/bld.xml
+++ b/.idea/libraries/bld.xml
@@ -2,12 +2,12 @@
-
+
-
+
diff --git a/examples/bld/.idea/runConfigurations/Run Tests.xml b/examples/bld/.idea/runConfigurations/Run Tests.xml
new file mode 100644
index 0000000..2b503e5
--- /dev/null
+++ b/examples/bld/.idea/runConfigurations/Run Tests.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/examples/bld/lib/bld/bld-wrapper.jar b/examples/bld/lib/bld/bld-wrapper.jar
index a56ed93..6012eef 100644
Binary files a/examples/bld/lib/bld/bld-wrapper.jar and b/examples/bld/lib/bld/bld-wrapper.jar differ
diff --git a/examples/bld/lib/bld/bld-wrapper.properties b/examples/bld/lib/bld/bld-wrapper.properties
index d3f0a91..8c08ccc 100644
--- a/examples/bld/lib/bld/bld-wrapper.properties
+++ b/examples/bld/lib/bld/bld-wrapper.properties
@@ -1,8 +1,7 @@
bld.downloadExtensionJavadoc=false
bld.downloadExtensionSources=true
-bld.downloadLocation=
-bld.extension-dokka=com.uwyn.rife2:bld-dokka:1.0.0-SNAPSHOT
-bld.extension-kotlin=com.uwyn.rife2:bld-kotlin:1.0.0-SNAPSHOT
+bld.extensions=com.uwyn.rife2:bld-kotlin:0.9.8
bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
+bld.downloadLocation=
bld.sourceDirectories=
bld.version=1.9.1
diff --git a/examples/bld/src/bld/java/com/example/ExampleBuild.java b/examples/bld/src/bld/java/com/example/ExampleBuild.java
index 9e11c5b..ff74303 100644
--- a/examples/bld/src/bld/java/com/example/ExampleBuild.java
+++ b/examples/bld/src/bld/java/com/example/ExampleBuild.java
@@ -25,7 +25,7 @@ public class ExampleBuild extends BaseProject {
scope(compile)
.include(dependency("net.thauvin.erik:akismet-kotlin:1.1.0-SNAPSHOT"))
- .include(dependency("jakarta.servlet:jakarta.servlet-api:6.1.0"));
+ .include(dependency("jakarta.servlet:jakarta.servlet-api:6.0.0"));
}
public static void main(String[] args) {
diff --git a/examples/gradle/.idea/gradle.xml b/examples/gradle/.idea/gradle.xml
index ce1c62c..7d3b3e8 100644
--- a/examples/gradle/.idea/gradle.xml
+++ b/examples/gradle/.idea/gradle.xml
@@ -5,6 +5,7 @@
+
diff --git a/examples/gradle/build.gradle.kts b/examples/gradle/build.gradle.kts
index b31c97b..924f9ac 100644
--- a/examples/gradle/build.gradle.kts
+++ b/examples/gradle/build.gradle.kts
@@ -12,7 +12,7 @@ repositories {
}
dependencies {
- implementation("jakarta.servlet:jakarta.servlet-api:6.1.0")
+ implementation("jakarta.servlet:jakarta.servlet-api:6.0.0")
implementation("net.thauvin.erik:akismet-kotlin:1.1.0-SNAPSHOT")
}
diff --git a/examples/gradle/gradle/wrapper/gradle-wrapper.jar b/examples/gradle/gradle/wrapper/gradle-wrapper.jar
index 2c35211..e644113 100644
Binary files a/examples/gradle/gradle/wrapper/gradle-wrapper.jar and b/examples/gradle/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/examples/gradle/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/gradle/wrapper/gradle-wrapper.properties
index 09523c0..b82aa23 100644
--- a/examples/gradle/gradle/wrapper/gradle-wrapper.properties
+++ b/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.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
diff --git a/examples/gradle/gradlew b/examples/gradle/gradlew
index f5feea6..1aa94a4 100755
--- a/examples/gradle/gradlew
+++ b/examples/gradle/gradlew
@@ -15,8 +15,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-# SPDX-License-Identifier: Apache-2.0
-#
##############################################################################
#
@@ -57,7 +55,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
-# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -86,8 +84,7 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
diff --git a/examples/gradle/gradlew.bat b/examples/gradle/gradlew.bat
index 9d21a21..25da30d 100644
--- a/examples/gradle/gradlew.bat
+++ b/examples/gradle/gradlew.bat
@@ -13,8 +13,6 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
-@rem SPDX-License-Identifier: Apache-2.0
-@rem
@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
diff --git a/lib/bld/bld-wrapper.jar b/lib/bld/bld-wrapper.jar
index df1100d..d3c99e9 100644
Binary files a/lib/bld/bld-wrapper.jar and b/lib/bld/bld-wrapper.jar differ
diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties
index 3bc38e2..a1e2c45 100644
--- a/lib/bld/bld-wrapper.properties
+++ b/lib/bld/bld-wrapper.properties
@@ -1,11 +1,10 @@
bld.downloadExtensionJavadoc=false
bld.downloadExtensionSources=true
-bld.downloadLocation=
-bld.extension-detekt=com.uwyn.rife2:bld-detekt:0.9.4
-#bld.extension-dokka=com.uwyn.rife2:bld-dokka:1.0.0-SNAPSHOT
-bld.extension-gv=com.uwyn.rife2:bld-generated-version:0.9.8-SNAPSHOT
-bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.6
-bld.extension-kotlin=com.uwyn.rife2:bld-kotlin:1.0.0-SNAPSHOT
+bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.5
+bld.extensions-kotlin=com.uwyn.rife2:bld-kotlin:0.9.8
+bld.extensions-detekt=com.uwyn.rife2:bld-detekt:0.9.4
+bld.extensions=com.uwyn.rife2:bld-generated-version:0.9.6
bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
+bld.downloadLocation=
bld.sourceDirectories=
-bld.version=2.0.0-SNAPSHOT
+bld.version=1.9.1
diff --git a/src/bld/java/net/thauvin/erik/AkismetBuild.java b/src/bld/java/net/thauvin/erik/AkismetBuild.java
index 8037618..db01101 100644
--- a/src/bld/java/net/thauvin/erik/AkismetBuild.java
+++ b/src/bld/java/net/thauvin/erik/AkismetBuild.java
@@ -33,11 +33,11 @@ package net.thauvin.erik;
import rife.bld.BuildCommand;
import rife.bld.Project;
-import rife.bld.extension.CompileKotlinOperation;
-import rife.bld.extension.DetektOperation;
-import rife.bld.extension.GeneratedVersionOperation;
-import rife.bld.extension.JacocoReportOperation;
-import rife.bld.extension.kotlin.CompilerPlugin;
+import rife.bld.extension.*;
+import rife.bld.extension.dokka.DokkaOperation;
+import rife.bld.extension.dokka.LoggingLevel;
+import rife.bld.extension.dokka.OutputFormat;
+import rife.bld.extension.dokka.SourceSet;
import rife.bld.operations.exceptions.ExitStatusException;
import rife.bld.publish.PomBuilder;
import rife.bld.publish.PublishDeveloper;
@@ -48,9 +48,6 @@ import rife.tools.exceptions.FileUtilsErrorException;
import java.io.File;
import java.io.IOException;
import java.util.List;
-import java.util.logging.ConsoleHandler;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import static rife.bld.dependencies.Repository.*;
import static rife.bld.dependencies.Scope.*;
@@ -65,27 +62,25 @@ public class AkismetBuild extends Project {
version = version(1, 1, 0, "SNAPSHOT");
javaRelease = 11;
-
downloadSources = true;
autoDownloadPurge = true;
repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL);
var okHttp = version(4, 12, 0);
- final var kotlin = version(2, 0, 0);
+ final var kotlin = version(1, 9, 24);
scope(compile)
.include(dependency("org.jetbrains.kotlin", "kotlin-stdlib", 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("org.jetbrains.kotlinx", "kotlinx-serialization-json", version(1, 7, 1)));
+ .include(dependency("org.jetbrains.kotlinx", "kotlinx-serialization-json-jvm", version(1, 6, 3)));
scope(provided)
- .include(dependency("jakarta.servlet", "jakarta.servlet-api", version(6, 1, 0)));
+ .include(dependency("jakarta.servlet", "jakarta.servlet-api", version(6, 0, 0)))
+ .include(dependency("org.jetbrains.kotlin", "kotlin-serialization-compiler-plugin", kotlin));
scope(test)
.include(dependency("org.mockito", "mockito-core", version(5, 12, 0)))
.include(dependency("org.jetbrains.kotlin", "kotlin-test-junit5", kotlin))
- .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 10, 3)))
- .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 10, 3)))
+ .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, 1)));
publishOperation()
@@ -124,27 +119,26 @@ 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);
}
@BuildCommand(summary = "Compiles the Kotlin project")
@Override
- public void compile() throws Exception {
+ public void compile() throws IOException {
genver();
- var op = new CompileKotlinOperation()
+ new CompileKotlinOperation()
.fromProject(this)
- .plugins(CompilerPlugin.KOTLIN_SERIALIZATION);
- op.compileOptions().verbose(true);
- op.execute();
+ .plugins(libProvidedDirectory(), CompileKotlinPlugin.KOTLIN_SERIALIZATION)
+ .execute();
}
@BuildCommand(summary = "Checks source with Detekt")
@@ -164,69 +158,63 @@ public class AkismetBuild extends Project {
.execute();
}
-// @BuildCommand(summary = "Generates documentation in HTML format")
-// public void docs() throws ExitStatusException, IOException, InterruptedException {
-// new DokkaOperation()
-// .fromProject(this)
-// .loggingLevel(LoggingLevel.INFO)
-// .moduleName("Akismet Kotlin")
-// .moduleVersion(version.toString())
-// .outputDir("docs")
-// .outputFormat(OutputFormat.HTML)
-// .sourceSet(
-// new SourceSet()
-// .src(srcMainKotlin)
-// .classpath(compileClasspathJars())
-// .classpath(providedClasspathJars())
-// .srcLink(srcMainKotlin, "https://github.com/ethauvin/" + name
-// + "/tree/master/src/main/kotlin/", "#L")
-// .includes("config/dokka/packages.md")
-// .jdkVersion(javaRelease)
-// .externalDocumentationLinks("https://jakarta.ee/specifications/platform/9/apidocs/",
-// "https://jakarta.ee/specifications/platform/9/apidocs/package-list")
-//
-// )
-// .execute();
-// }
+ @BuildCommand(summary = "Generates documentation in HTML format")
+ public void docs() throws ExitStatusException, IOException, InterruptedException {
+ new DokkaOperation()
+ .fromProject(this)
+ .loggingLevel(LoggingLevel.INFO)
+ .moduleName("Akismet Kotlin")
+ .moduleVersion(version.toString())
+ .outputDir("docs")
+ .outputFormat(OutputFormat.HTML)
+ .sourceSet(
+ new SourceSet()
+ .src(srcMainKotlin.getAbsolutePath())
+ .classpath(compileClasspathJars())
+ .classpath(providedClasspathJars())
+ .srcLink(srcMainKotlin.getAbsolutePath(), "https://github.com/ethauvin/" + name
+ + "/tree/master/src/main/kotlin/", "#L")
+ .includes("config/dokka/packages.md")
+ .jdkVersion(javaRelease)
+ .externalDocumentationLinks("https://jakarta.ee/specifications/platform/9/apidocs/",
+ "https://jakarta.ee/specifications/platform/9/apidocs/package-list")
+
+ )
+ .execute();
+ }
@BuildCommand(summary = "Generates version class")
- public void genver() throws Exception {
+ public void genver() {
new GeneratedVersionOperation()
.fromProject(this)
.projectName("Akismet Kotlin")
.packageName(pkg + ".akismet")
- .classTemplate("version.txt")
+ .classTemplate(new File(workDirectory(), "version.txt"))
.directory(srcMainKotlin)
.extension(".kt")
.execute();
}
@BuildCommand(summary = "Generates JaCoCo Reports")
- public void jacoco() throws Exception {
+ public void jacoco() throws IOException {
new JacocoReportOperation()
.fromProject(this)
.sourceFiles(srcMainKotlin)
.execute();
}
-// @Override
-// public void javadoc() throws ExitStatusException, IOException, InterruptedException {
-// new DokkaOperation()
-// .fromProject(this)
-// .loggingLevel(LoggingLevel.INFO)
-// .moduleName("Bitly Shorten")
-// .moduleVersion(version.toString())
-// .outputDir(new File(buildDirectory(), "javadoc"))
-// .outputFormat(OutputFormat.JAVADOC)
-// .globalLinks("https://jakarta.ee/specifications/platform/9/apidocs/",
-// "https://jakarta.ee/specifications/platform/9/apidocs/package-list")
-// .execute();
-// }
-
- @BuildCommand(value = "pom-root", summary = "Generates the POM file in the root directory")
- public void pomRoot() throws FileUtilsErrorException {
- PomBuilder.generateInto(publishOperation().fromProject(this).info(), dependencies(),
- new File(workDirectory, "pom.xml"));
+ @Override
+ public void javadoc() throws ExitStatusException, IOException, InterruptedException {
+ new DokkaOperation()
+ .fromProject(this)
+ .loggingLevel(LoggingLevel.INFO)
+ .moduleName("Bitly Shorten")
+ .moduleVersion(version.toString())
+ .outputDir(new File(buildDirectory(), "javadoc"))
+ .outputFormat(OutputFormat.JAVADOC)
+ .globalLinks("https://jakarta.ee/specifications/platform/9/apidocs/",
+ "https://jakarta.ee/specifications/platform/9/apidocs/package-list")
+ .execute();
}
@Override
@@ -234,4 +222,10 @@ public class AkismetBuild extends Project {
super.publish();
pomRoot();
}
+
+ @BuildCommand(value = "pom-root", summary = "Generates the POM file in the root directory")
+ public void pomRoot() throws FileUtilsErrorException {
+ PomBuilder.generateInto(publishOperation().fromProject(this).info(), dependencies(),
+ new File(workDirectory, "pom.xml"));
+ }
}
diff --git a/src/main/kotlin/net/thauvin/erik/akismet/Akismet.kt b/src/main/kotlin/net/thauvin/erik/akismet/Akismet.kt
index 1824f45..6e2f93d 100644
--- a/src/main/kotlin/net/thauvin/erik/akismet/Akismet.kt
+++ b/src/main/kotlin/net/thauvin/erik/akismet/Akismet.kt
@@ -61,7 +61,7 @@ open class Akismet(apiKey: String) {
*/
@JvmStatic
fun jsonComment(json: String): AkismetComment {
- return Json.decodeFromString(json)
+ return Json.decodeFromString(AkismetComment.serializer(), json)
}
/**
diff --git a/src/main/kotlin/net/thauvin/erik/akismet/CommentConfig.kt b/src/main/kotlin/net/thauvin/erik/akismet/CommentConfig.kt
index 53b9295..ff04fb9 100644
--- a/src/main/kotlin/net/thauvin/erik/akismet/CommentConfig.kt
+++ b/src/main/kotlin/net/thauvin/erik/akismet/CommentConfig.kt
@@ -31,6 +31,8 @@
package net.thauvin.erik.akismet
+import net.thauvin.erik.akismet.AkismetComment.Companion.ADMIN_ROLE
+
/**
* Provides a comment configuration.
*/
@@ -167,7 +169,7 @@ class CommentConfig private constructor(builder: Builder) {
/**
* Set the user role of the user who submitted the comment. This is an optional parameter.
*
- * If you set it to [AkismetComment.ADMIN_ROLE], Akismet will always return `false`.
+ * If you set it to [ADMIN_ROLE], Akismet will always return `false`.
*/
fun userRole(userRole: String): Builder = apply { this.userRole = userRole }