From 21fffc19a23ac813658d4cd7766726c8f6c816de Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Thu, 23 Nov 2023 18:00:16 -0800
Subject: [PATCH] Upgraded to Kotlin 1.9.21

---
 .idea/misc.xml                                | 12 ++++++
 README.md                                     |  2 +-
 pom.xml                                       |  4 +-
 .../java/net/thauvin/erik/JokeApiBuild.java   | 40 +++++++++----------
 4 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index d303503..7408350 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,8 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="EntryPointsManager">
     <pattern value="net.thauvin.erik.JokeApiBuild" method="jacoco" />
   </component>
   <component name="PDMPlugin">
+    <option name="customRuleSets">
+      <list>
+        <option value="K:\java\semver\config\pmd.xml" />
+        <option value="$PROJECT_DIR$/../../java/bld-generated-version/config/pmd.xml" />
+        <option value="$PROJECT_DIR$/../../java/bld-pitest/config/pmd.xml" />
+        <option value="$PROJECT_DIR$/../../java/bld-jacoco-report/config/pmd.xml" />
+        <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" />
+      </list>
+    </option>
     <option name="skipTestSources" value="false" />
   </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="17" project-jdk-type="JavaSDK">
diff --git a/README.md b/README.md
index c2f6c09..5308277 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 [![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.20-7f52ff)](https://kotlinlang.org/)
+[![Kotlin](https://img.shields.io/badge/kotlin-1.9.21-7f52ff)](https://kotlinlang.org/)
 [![Release](https://img.shields.io/github/release/ethauvin/jokeapi.svg)](https://github.com/ethauvin/jokeapi/releases/latest)
 [![Maven Central](https://img.shields.io/maven-central/v/net.thauvin.erik/jokeapi?color=blue)](https://central.sonatype.com/artifact/net.thauvin.erik/jokeapi)
 [![Nexus Snapshot](https://img.shields.io/nexus/s/net.thauvin.erik/jokeapi?label=snapshot&server=https%3A%2F%2Foss.sonatype.org%2F)](https://oss.sonatype.org/content/repositories/snapshots/net/thauvin/erik/jokeapi/)
diff --git a/pom.xml b/pom.xml
index 79c01bc..ed4ed5d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
     <dependency>
       <groupId>org.jetbrains.kotlin</groupId>
       <artifactId>kotlin-stdlib</artifactId>
-      <version>1.9.20</version>
+      <version>1.9.21</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -43,7 +43,7 @@
     </developer>
   </developers>
   <scm>
-    <connection>scm:git:https://github.com/ethauvin/jokeapi</connection>
+    <connection>scm:git:https://github.com/ethauvin/jokeapi.git</connection>
     <developerConnection>scm:git:git@github.com:ethauvin/jokeapi.git</developerConnection>
     <url>https://github.com/ethauvin/jokeapi</url>
   </scm>
diff --git a/src/bld/java/net/thauvin/erik/JokeApiBuild.java b/src/bld/java/net/thauvin/erik/JokeApiBuild.java
index bc4d902..5469163 100644
--- a/src/bld/java/net/thauvin/erik/JokeApiBuild.java
+++ b/src/bld/java/net/thauvin/erik/JokeApiBuild.java
@@ -34,7 +34,6 @@ 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;
@@ -66,11 +65,11 @@ public class JokeApiBuild extends Project {
         repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL);
 
         scope(compile)
-                .include(dependency("org.jetbrains.kotlin", "kotlin-stdlib", version(1, 9, 20)))
+                .include(dependency("org.jetbrains.kotlin", "kotlin-stdlib", version(1, 9, 21)))
                 .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.jetbrains.kotlin", "kotlin-test-junit5", version(1, 9, 21)))
                 .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)));
@@ -85,18 +84,24 @@ public class JokeApiBuild extends Project {
                 .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))
+                .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 + ".git")
+                                .developerConnection("scm:git:git@github.com:ethauvin/" + name + ".git")
+                                .url("https://github.com/ethauvin/" + name)
+                )
                 .signKey(property("sign.key"))
                 .signPassphrase(property("sign.passphrase"));
 
@@ -112,11 +117,6 @@ public class JokeApiBuild extends Project {
     public void compile() throws IOException {
         new CompileKotlinOperation()
                 .fromProject(this)
-                .compileOptions(
-                        new CompileKotlinOptions()
-                                .jdkRelease(javaRelease)
-                                .verbose(true)
-                )
                 .execute();
     }