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

---
 .idea/misc.xml                                |  2 ++
 README.md                                     |  2 +-
 examples/bld/README.md                        |  4 +--
 .../com/example/ReadingTimeExampleBuild.java  | 10 ++----
 examples/gradle/README.md                     |  4 +--
 examples/gradle/build.gradle.kts              |  4 +--
 pom.xml                                       |  2 +-
 .../net/thauvin/erik/ReadingTimeBuild.java    | 36 +++++++++----------
 8 files changed, 30 insertions(+), 34 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index a7b0be7..0666d32 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="EntryPointsManager">
     <pattern value="net.thauvin.erik.ReadingTimeBuild" method="jacoco" />
@@ -12,6 +13,7 @@
         <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/bld-generated-version/config/pmd.xml" />
       </list>
     </option>
     <option name="skipTestSources" value="false" />
diff --git a/README.md b/README.md
index 90ce52b..064661b 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/readingtime.svg)](https://github.com/ethauvin/readingtime/releases/latest)
 [![Maven Central](https://img.shields.io/maven-central/v/net.thauvin.erik/readingtime.svg?label=maven%20central)](https://search.maven.org/search?q=g:%22net.thauvin.erik%22%20AND%20a:%22readingtime%22)
 [![Nexus Snapshot](https://img.shields.io/nexus/s/net.thauvin.erik/readingtime?label=snapshot&server=https%3A%2F%2Foss.sonatype.org%2F)](https://oss.sonatype.org/content/repositories/snapshots/net/thauvin/erik/readingtime/)
diff --git a/examples/bld/README.md b/examples/bld/README.md
index 8dfed5f..13de079 100644
--- a/examples/bld/README.md
+++ b/examples/bld/README.md
@@ -1,7 +1,7 @@
 ## Kotlin Example
 To compile & run the Kotlin example:
 
-```text
+```console
 ./bld compile run --args="example.html"
 ```
 
@@ -9,6 +9,6 @@ To compile & run the Kotlin example:
 
 To compile & run the Java example:
 
-```text
+```console
 ./bld compile run-java --args="example.html"
 ```
diff --git a/examples/bld/src/bld/java/com/example/ReadingTimeExampleBuild.java b/examples/bld/src/bld/java/com/example/ReadingTimeExampleBuild.java
index f7bf8db..acf6fd5 100644
--- a/examples/bld/src/bld/java/com/example/ReadingTimeExampleBuild.java
+++ b/examples/bld/src/bld/java/com/example/ReadingTimeExampleBuild.java
@@ -1,13 +1,13 @@
 package com.example;
 
-import rife.bld.BaseProject;
 import rife.bld.BuildCommand;
 import rife.bld.extension.CompileKotlinOperation;
-import rife.bld.extension.CompileKotlinOptions;
 import rife.bld.operations.RunOperation;
+import rife.bld.BaseProject;
 
 import java.util.List;
 
+
 import static rife.bld.dependencies.Repository.*;
 import static rife.bld.dependencies.Scope.compile;
 
@@ -25,7 +25,6 @@ public class ReadingTimeExampleBuild extends BaseProject {
         repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL, SONATYPE_SNAPSHOTS_LEGACY);
 
         scope(compile)
-                .include(dependency("org.jetbrains.kotlin", "kotlin-stdlib", version(1, 9, 20)))
                 .include(dependency("net.thauvin.erik", "readingtime", version(0, 9, 2, "SNAPSHOT")));
     }
 
@@ -37,11 +36,6 @@ public class ReadingTimeExampleBuild extends BaseProject {
     public void compile() throws Exception {
         new CompileKotlinOperation()
                 .fromProject(this)
-                .compileOptions(
-                        new CompileKotlinOptions()
-                                .jdkRelease(javaRelease)
-                                .verbose(true)
-                )
                 .execute();
 
         // Also compile the Java source code
diff --git a/examples/gradle/README.md b/examples/gradle/README.md
index a193138..e0ce033 100644
--- a/examples/gradle/README.md
+++ b/examples/gradle/README.md
@@ -1,7 +1,7 @@
 ## Kotlin Example
 To compile & run the Kotlin example:
 
-```text
+```console
 ./gradlew run --args="example.html"
 ```
 
@@ -9,6 +9,6 @@ To compile & run the Kotlin example:
 
 To compile & run the Java example:
 
-```text
+```console
 ./gradlew runJava --args="example.html"
 ```
diff --git a/examples/gradle/build.gradle.kts b/examples/gradle/build.gradle.kts
index 11ed327..fcc121e 100644
--- a/examples/gradle/build.gradle.kts
+++ b/examples/gradle/build.gradle.kts
@@ -2,8 +2,8 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     id("application")
-    id("com.github.ben-manes.versions") version "0.49.0"
-    kotlin("jvm") version "1.9.20"
+    id("com.github.ben-manes.versions") version "0.50.0"
+    kotlin("jvm") version "1.9.21"
 }
 
 repositories {
diff --git a/pom.xml b/pom.xml
index 6f36ec5..43e0976 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,7 +37,7 @@
     </developer>
   </developers>
   <scm>
-    <connection>scm:git:https://github.com/ethauvin/readingtime</connection>
+    <connection>scm:git:https://github.com/ethauvin/readingtime.git</connection>
     <developerConnection>scm:git:git@github.com:ethauvin/readingtime.git</developerConnection>
     <url>https://github.com/ethauvin/readingtime</url>
   </scm>
diff --git a/src/bld/java/net/thauvin/erik/ReadingTimeBuild.java b/src/bld/java/net/thauvin/erik/ReadingTimeBuild.java
index 528b9de..41f0516 100644
--- a/src/bld/java/net/thauvin/erik/ReadingTimeBuild.java
+++ b/src/bld/java/net/thauvin/erik/ReadingTimeBuild.java
@@ -33,7 +33,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;
@@ -82,18 +81,24 @@ public class ReadingTimeBuild extends Project {
                 .artifactId(name)
                 .description("Estimated Reading Time for Blog Posts, Articles, etc.")
                 .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"));
 
@@ -109,11 +114,6 @@ public class ReadingTimeBuild extends Project {
     public void compile() throws IOException {
         new CompileKotlinOperation()
                 .fromProject(this)
-                .compileOptions(
-                        new CompileKotlinOptions()
-                                .jdkRelease(javaRelease)
-                                .verbose(true)
-                )
                 .execute();
     }