From 2ebc62b899ecb50f5825bd835e6988868d9f69cd Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sun, 16 Mar 2025 22:11:55 -0700
Subject: [PATCH] Bump Kotlin to version 2.1.10

---
 .circleci/config.yml                                | 8 ++++----
 .github/workflows/bld.yml                           | 4 ++--
 examples/bld/lib/bld/bld-wrapper.properties         | 2 +-
 examples/gradle/build.gradle.kts                    | 2 +-
 lib/bld/bld-wrapper.properties                      | 4 +---
 src/bld/java/net/thauvin/erik/IsgdShortenBuild.java | 2 +-
 6 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8dabc3f..c781fdc 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -21,7 +21,7 @@ commands:
       - sdkman/setup-sdkman
       - sdkman/sdkman-install:
           candidate: kotlin
-          version: 2.0.20
+          version: 2.1.10
       - run:
           name: Download dependencies
           command: ./bld download
@@ -46,11 +46,11 @@ jobs:
     steps:
       - build_and_test
 
-  bld_jdk20:
+  bld_jdk21:
     <<: *defaults
 
     docker:
-      - image: cimg/openjdk:20.0
+      - image: cimg/openjdk:21.0
 
     steps:
       - build_and_test
@@ -59,4 +59,4 @@ workflows:
   bld:
     jobs:
       - bld_jdk17
-      - bld_jdk20
+      - bld_jdk21
diff --git a/.github/workflows/bld.yml b/.github/workflows/bld.yml
index 297568a..08a73b4 100644
--- a/.github/workflows/bld.yml
+++ b/.github/workflows/bld.yml
@@ -13,8 +13,8 @@ jobs:
 
     strategy:
       matrix:
-        java-version: [17, 21, 22]
-        kotlin-version: [1.19.24, 2.0.20]
+        java-version: [17, 21, 23]
+        kotlin-version: [1.9.25, 2.1.10]
 
     steps:
       - name: Checkout source repository
diff --git a/examples/bld/lib/bld/bld-wrapper.properties b/examples/bld/lib/bld/bld-wrapper.properties
index be617e2..2c457ac 100644
--- a/examples/bld/lib/bld/bld-wrapper.properties
+++ b/examples/bld/lib/bld/bld-wrapper.properties
@@ -1,8 +1,8 @@
 bld.downloadExtensionJavadoc=false
 bld.downloadExtensionSources=true
 bld.downloadLocation=
-bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.8
 bld.extension-kotlin=com.uwyn.rife2:bld-kotlin:1.0.2
+bld.extension-kotlin=com.uwyn.rife2:bld-kotlin:1.0.4
 bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
 bld.sourceDirectories=
 bld.version=2.2.1
diff --git a/examples/gradle/build.gradle.kts b/examples/gradle/build.gradle.kts
index b7804fb..18002f7 100644
--- a/examples/gradle/build.gradle.kts
+++ b/examples/gradle/build.gradle.kts
@@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 plugins {
     id("application")
     id("com.github.ben-manes.versions") version "0.51.0"
-    kotlin("jvm") version "2.0.20"
+    kotlin("jvm") version "2.1.10"
 }
 
 repositories {
diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties
index a1c4522..2c457ac 100644
--- a/lib/bld/bld-wrapper.properties
+++ b/lib/bld/bld-wrapper.properties
@@ -1,10 +1,8 @@
 bld.downloadExtensionJavadoc=false
 bld.downloadExtensionSources=true
 bld.downloadLocation=
-bld.extension-detekt=com.uwyn.rife2:bld-detekt:0.9.7
-bld.extension-dokka=com.uwyn.rife2:bld-dokka:1.0.1
-bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.8
 bld.extension-kotlin=com.uwyn.rife2:bld-kotlin:1.0.2
+bld.extension-kotlin=com.uwyn.rife2:bld-kotlin:1.0.4
 bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
 bld.sourceDirectories=
 bld.version=2.2.1
diff --git a/src/bld/java/net/thauvin/erik/IsgdShortenBuild.java b/src/bld/java/net/thauvin/erik/IsgdShortenBuild.java
index dd8b32e..4450b5b 100644
--- a/src/bld/java/net/thauvin/erik/IsgdShortenBuild.java
+++ b/src/bld/java/net/thauvin/erik/IsgdShortenBuild.java
@@ -68,7 +68,7 @@ public class IsgdShortenBuild extends Project {
 
         repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL);
 
-        final var kotlin = version(2, 0, 20);
+        final var kotlin = version(2, 1, 10);
         scope(compile)
                 .include(dependency("org.jetbrains.kotlin", "kotlin-stdlib", kotlin))
                 .include(dependency("net.thauvin.erik.urlencoder", "urlencoder-lib-jvm", version(1, 5, 0)));