Switched from Gradle to bld

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

@@ -0,0 +1,153 @@
+/*
+ * JokeApiBuild.java
+ *
+ * Copyright 2022-2023 Erik C. Thauvin (erik@thauvin.net)
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *   Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ *   Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ *   Neither the name of this project nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package net.thauvin.erik;
+
+import rife.bld.BuildCommand;
+import rife.bld.Project;
+import rife.bld.extension.CompileKotlinOperation;
+import rife.bld.extension.CompileKotlinOptions;
+import rife.bld.extension.JacocoReportOperation;
+import rife.bld.extension.dokka.DokkaOperation;
+import rife.bld.extension.dokka.LoggingLevel;
+import rife.bld.extension.dokka.OutputFormat;
+import rife.bld.operations.exceptions.ExitStatusException;
+import rife.bld.publish.PomBuilder;
+import rife.bld.publish.PublishDeveloper;
+import rife.bld.publish.PublishLicense;
+import rife.bld.publish.PublishScm;
+import rife.tools.exceptions.FileUtilsErrorException;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+
+import static rife.bld.dependencies.Repository.*;
+import static rife.bld.dependencies.Scope.compile;
+import static rife.bld.dependencies.Scope.test;
+
+public class JokeApiBuild extends Project {
+    public JokeApiBuild() {
+        pkg = "net.thauvin.erik";
+        name = "jokeapi";
+        version = version(0, 9, 1, "SNAPSHOT");
+
+        javaRelease = 11;
+        downloadSources = true;
+        autoDownloadPurge = true;
+        repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL);
+
+        scope(compile)
+                .include(dependency("org.jetbrains.kotlin", "kotlin-stdlib", version(1, 9, 20)))
+                .include(dependency("org.json", "json", "20231013"))
+                .include(dependency("net.thauvin.erik.urlencoder", "urlencoder-lib-jvm", version(1, 4, 0)));
+        scope(test)
+                .include(dependency("org.jetbrains.kotlin", "kotlin-test-junit5", version(1, 9, 20)))
+                .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("com.willowtreeapps.assertk", "assertk-jvm", version(0, 27, 0)));
+
+        publishOperation()
+                .repository(version.isSnapshot() ? repository(SONATYPE_SNAPSHOTS_LEGACY.location())
+                        .withCredentials(property("sonatype.user"), property("sonatype.password"))
+                        : repository(SONATYPE_RELEASES_LEGACY.location())
+                        .withCredentials(property("sonatype.user"), property("sonatype.password")))
+                .info()
+                .groupId(pkg)
+                .artifactId(name)
+                .description("Retrieve jokes from Sv443's JokeAPI")
+                .url("https://github.com/ethauvin/" + name)
+                .developer(new PublishDeveloper()
+                        .id("ethauvin")
+                        .name("Erik C. Thauvin")
+                        .email("erik@thauvin.net")
+                        .url("https://erik.thauvin.net/"))
+                .license(new PublishLicense()
+                        .name("BSD 3-Clause")
+                        .url("https://opensource.org/licenses/BSD-3-Clause"))
+                .scm(new PublishScm()
+                        .connection("scm:git:https://github.com/ethauvin/" + name)
+                        .developerConnection("scm:git:git@github.com:ethauvin/" + name + ".git")
+                        .url("https://github.com/ethauvin/" + name))
+                .signKey(property("sign.key"))
+                .signPassphrase(property("sign.passphrase"));
+
+        jarSourcesOperation().sourceDirectories(new File(srcMainDirectory(), "kotlin"));
+    }
+
+    public static void main(String[] args) {
+        new JokeApiBuild().start(args);
+    }
+
+    @BuildCommand(summary = "Compiles the Kotlin project")
+    @Override
+    public void compile() throws IOException {
+        new CompileKotlinOperation()
+                .fromProject(this)
+                .compileOptions(
+                        new CompileKotlinOptions()
+                                .jdkRelease(javaRelease)
+                                .verbose(true)
+                )
+                .execute();
+    }
+
+    @BuildCommand(summary = "Generates JaCoCo Reports")
+    public void jacoco() throws IOException {
+        new JacocoReportOperation()
+                .fromProject(this)
+                .execute();
+    }
+
+    @Override
+    public void javadoc() throws ExitStatusException, IOException, InterruptedException {
+        new DokkaOperation()
+                .fromProject(this)
+                .loggingLevel(LoggingLevel.INFO)
+                .moduleName("JokeApi")
+                .moduleVersion(version.toString())
+                .outputDir(new File(buildDirectory(), "javadoc"))
+                .outputFormat(OutputFormat.JAVADOC)
+                .execute();
+    }
+
+    @Override
+    public void publish() throws Exception {
+        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"));
+    }
+}

src/main/kotlin/net/thauvin/erik/jokeapi/JokeConfig.kt

@@ -32,12 +32,7 @@
 package net.thauvin.erik.jokeapi
 
 import net.thauvin.erik.jokeapi.JokeConfig.Builder
-import net.thauvin.erik.jokeapi.models.Category
-import net.thauvin.erik.jokeapi.models.Flag
-import net.thauvin.erik.jokeapi.models.Format
-import net.thauvin.erik.jokeapi.models.IdRange
-import net.thauvin.erik.jokeapi.models.Language
-import net.thauvin.erik.jokeapi.models.Type
+import net.thauvin.erik.jokeapi.models.*
 
 /**
  * Joke Configuration.

src/main/kotlin/net/thauvin/erik/jokeapi/JokeUtil.kt

@@ -35,12 +35,7 @@ package net.thauvin.erik.jokeapi
 
 import net.thauvin.erik.jokeapi.exceptions.HttpErrorException
 import net.thauvin.erik.jokeapi.exceptions.JokeException
-import net.thauvin.erik.jokeapi.models.Category
-import net.thauvin.erik.jokeapi.models.Flag
-import net.thauvin.erik.jokeapi.models.Joke
-import net.thauvin.erik.jokeapi.models.Language
-import net.thauvin.erik.jokeapi.models.Parameter
-import net.thauvin.erik.jokeapi.models.Type
+import net.thauvin.erik.jokeapi.models.*
 import org.json.JSONObject
 import java.io.IOException
 import java.net.HttpURLConnection
@@ -155,7 +150,7 @@ internal fun parseJoke(json: JSONObject, splitNewLine: Boolean): Joke {
     }
     val enabledFlags = mutableSetOf<Flag>()
     val jsonFlags = json.getJSONObject("flags")
-    Flag.values().filter { it != Flag.ALL }.forEach {
+    Flag.entries.filter { it != Flag.ALL }.forEach {
         if (jsonFlags.has(it.value) && jsonFlags.getBoolean(it.value)) {
             enabledFlags.add(it)
         }

src/main/kotlin/net/thauvin/erik/jokeapi/exceptions/HttpErrorException.kt

@@ -44,6 +44,7 @@ class HttpErrorException @JvmOverloads constructor(
     cause: Throwable? = null
 ) : IOException(message, cause) {
     companion object {
+        @Suppress("ConstPropertyName")
         private const val serialVersionUID = 1L
     }
 }

src/main/kotlin/net/thauvin/erik/jokeapi/exceptions/JokeException.kt

@@ -29,6 +29,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+@file:Suppress("ConstPropertyName")
+
 package net.thauvin.erik.jokeapi.exceptions
 
 /**

src/test/kotlin/net/thauvin/erik/jokeapi/ExceptionsTest.kt

@@ -33,16 +33,7 @@ package net.thauvin.erik.jokeapi
 
 import assertk.all
 import assertk.assertThat
-import assertk.assertions.index
-import assertk.assertions.isEqualTo
-import assertk.assertions.isFalse
-import assertk.assertions.isGreaterThan
-import assertk.assertions.isNotEmpty
-import assertk.assertions.isNotNull
-import assertk.assertions.isNull
-import assertk.assertions.prop
-import assertk.assertions.size
-import assertk.assertions.startsWith
+import assertk.assertions.*
 import net.thauvin.erik.jokeapi.JokeApi.logger
 import net.thauvin.erik.jokeapi.exceptions.HttpErrorException
 import net.thauvin.erik.jokeapi.exceptions.JokeException

src/test/kotlin/net/thauvin/erik/jokeapi/GetJokeTest.kt

@@ -33,29 +33,10 @@ package net.thauvin.erik.jokeapi
 
 import assertk.all
 import assertk.assertThat
-import assertk.assertions.any
-import assertk.assertions.contains
-import assertk.assertions.containsNone
-import assertk.assertions.each
-import assertk.assertions.isBetween
-import assertk.assertions.isEmpty
-import assertk.assertions.isEqualTo
-import assertk.assertions.isGreaterThan
-import assertk.assertions.isGreaterThanOrEqualTo
-import assertk.assertions.isIn
-import assertk.assertions.isNotEmpty
-import assertk.assertions.isNotNull
-import assertk.assertions.isTrue
-import assertk.assertions.prop
-import assertk.assertions.size
+import assertk.assertions.*
 import net.thauvin.erik.jokeapi.JokeApi.logger
 import net.thauvin.erik.jokeapi.exceptions.JokeException
-import net.thauvin.erik.jokeapi.models.Category
-import net.thauvin.erik.jokeapi.models.Flag
-import net.thauvin.erik.jokeapi.models.IdRange
-import net.thauvin.erik.jokeapi.models.Joke
-import net.thauvin.erik.jokeapi.models.Language
-import net.thauvin.erik.jokeapi.models.Type
+import net.thauvin.erik.jokeapi.models.*
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
 import org.junit.jupiter.api.extension.ExtendWith
@@ -82,7 +63,7 @@ internal class GetJokeTest {
 
     @Test
     fun `Get Joke without any Blacklist Flags`() {
-        val allFlags = Flag.values().filter { it != Flag.ALL }.toSet()
+        val allFlags = Flag.entries.filter { it != Flag.ALL }.toSet()
         val joke = joke(blacklistFlags = allFlags)
         assertThat(joke::flags).isEmpty()
     }
@@ -138,7 +119,7 @@ internal class GetJokeTest {
 
     @Test
     fun `Get Joke with each Categories`() {
-        Category.values().filter { it != Category.ANY }.forEach {
+        Category.entries.filter { it != Category.ANY }.forEach {
             val joke = joke(categories = setOf(it))
             logger.fine(joke.toString())
             assertThat(joke::category, "joke($it)").prop(Category::value).isEqualTo(it.value)
@@ -147,7 +128,7 @@ internal class GetJokeTest {
 
     @Test
     fun `Get Joke with each Languages`() {
-        Language.values().forEach {
+        Language.entries.forEach {
             val joke = joke(lang = it)
             logger.fine(joke.toString())
             assertThat(joke::lang, "joke($it)").prop(Language::value).isEqualTo(it.value)

src/test/kotlin/net/thauvin/erik/jokeapi/GetJokesTest.kt

@@ -33,15 +33,7 @@ package net.thauvin.erik.jokeapi
 
 import assertk.all
 import assertk.assertThat
-import assertk.assertions.contains
-import assertk.assertions.each
-import assertk.assertions.index
-import assertk.assertions.isEqualTo
-import assertk.assertions.isGreaterThanOrEqualTo
-import assertk.assertions.isNotNull
-import assertk.assertions.isTrue
-import assertk.assertions.prop
-import assertk.assertions.size
+import assertk.assertions.*
 import net.thauvin.erik.jokeapi.models.Joke
 import net.thauvin.erik.jokeapi.models.Language
 import org.junit.jupiter.api.Test

src/test/kotlin/net/thauvin/erik/jokeapi/JokeConfigTest.kt

@@ -33,25 +33,12 @@ package net.thauvin.erik.jokeapi
 
 import assertk.all
 import assertk.assertThat
-import assertk.assertions.each
-import assertk.assertions.isBetween
-import assertk.assertions.isEmpty
-import assertk.assertions.isEqualTo
-import assertk.assertions.isGreaterThanOrEqualTo
-import assertk.assertions.isTrue
-import assertk.assertions.prop
-import assertk.assertions.size
+import assertk.assertions.*
+import net.thauvin.erik.jokeapi.JokeApi.getRawJokes
 import net.thauvin.erik.jokeapi.JokeApi.joke
 import net.thauvin.erik.jokeapi.JokeApi.jokes
-import net.thauvin.erik.jokeapi.JokeApi.getRawJokes
 import net.thauvin.erik.jokeapi.JokeApi.logger
-import net.thauvin.erik.jokeapi.models.Category
-import net.thauvin.erik.jokeapi.models.Flag
-import net.thauvin.erik.jokeapi.models.Format
-import net.thauvin.erik.jokeapi.models.IdRange
-import net.thauvin.erik.jokeapi.models.Joke
-import net.thauvin.erik.jokeapi.models.Language
-import net.thauvin.erik.jokeapi.models.Type
+import net.thauvin.erik.jokeapi.models.*
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 import kotlin.test.assertContains

src/test/kotlin/net/thauvin/erik/jokeapi/JokeUtilTest.kt

@@ -1,5 +1,5 @@
 /*
- * UtilTest.kt
+ * JokeUtilTest.kt
  *
  * Copyright 2022-2023 Erik C. Thauvin (erik@thauvin.net)
  *