From db4eefd42cddaaf4d10b542c82de2444f1a1ecd0 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Fri, 10 May 2024 00:11:22 -0700
Subject: [PATCH] Bumped Kotlin to version 1.9.24

---
 examples/bld/lib/bld/bld-wrapper.properties            |  2 +-
 examples/gradle/build.gradle.kts                       |  2 +-
 lib/bld/bld-wrapper.properties                         |  2 +-
 pom.xml                                                |  6 +++---
 .../java/net/thauvin/erik/bitly/BitlyShortenBuild.java | 10 +++++-----
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/examples/bld/lib/bld/bld-wrapper.properties b/examples/bld/lib/bld/bld-wrapper.properties
index 58bc83c..113b890 100644
--- a/examples/bld/lib/bld/bld-wrapper.properties
+++ b/examples/bld/lib/bld/bld-wrapper.properties
@@ -1,6 +1,6 @@
 bld.downloadExtensionJavadoc=false
 bld.downloadExtensionSources=true
-bld.extensions=com.uwyn.rife2:bld-kotlin:0.9.1
+bld.extensions=com.uwyn.rife2:bld-kotlin:0.9.4
 bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
 bld.downloadLocation=
 bld.sourceDirectories=
diff --git a/examples/gradle/build.gradle.kts b/examples/gradle/build.gradle.kts
index bae658f..a31abdf 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 "1.9.22"
+    kotlin("jvm") version "1.9.24"
 }
 
 // ./gradlew run --args='https://erik.thauvin.net/ https://bit.ly/2PsNMAA'
diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties
index 315d0e7..3b10d0a 100644
--- a/lib/bld/bld-wrapper.properties
+++ b/lib/bld/bld-wrapper.properties
@@ -1,8 +1,8 @@
 bld.downloadExtensionJavadoc=false
 bld.downloadExtensionSources=true
 bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.3
-bld.extensions=com.uwyn.rife2:bld-kotlin:0.9.1
 bld.extension-detekt=com.uwyn.rife2:bld-detekt:0.9.2
+bld.extensions=com.uwyn.rife2:bld-kotlin:0.9.4
 bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
 bld.downloadLocation=
 bld.sourceDirectories=
diff --git a/pom.xml b/pom.xml
index 8702bcf..13629a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,19 +18,19 @@
     <dependency>
       <groupId>org.jetbrains.kotlin</groupId>
       <artifactId>kotlin-stdlib</artifactId>
-      <version>1.9.22</version>
+      <version>1.9.24</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.jetbrains.kotlin</groupId>
       <artifactId>kotlin-stdlib-common</artifactId>
-      <version>1.9.22</version>
+      <version>1.9.24</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.jetbrains.kotlin</groupId>
       <artifactId>kotlin-stdlib-jdk8</artifactId>
-      <version>1.9.22</version>
+      <version>1.9.24</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/src/bld/java/net/thauvin/erik/bitly/BitlyShortenBuild.java b/src/bld/java/net/thauvin/erik/bitly/BitlyShortenBuild.java
index 5924c98..23df5ed 100644
--- a/src/bld/java/net/thauvin/erik/bitly/BitlyShortenBuild.java
+++ b/src/bld/java/net/thauvin/erik/bitly/BitlyShortenBuild.java
@@ -56,6 +56,7 @@ import static rife.bld.dependencies.Scope.compile;
 import static rife.bld.dependencies.Scope.test;
 
 public class BitlyShortenBuild extends Project {
+    final File srcMainKotlin = new File(srcMainDirectory(), "kotlin");
     public BitlyShortenBuild() {
         pkg = "net.thauvin.erik";
         name = "bitly-shorten";
@@ -67,7 +68,7 @@ public class BitlyShortenBuild extends Project {
         repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL);
 
         var okHttp = version(4, 12, 0);
-        final var kotlin = version(1, 9, 22);
+        final var kotlin = version(1, 9, 24);
         scope(compile)
                 // Kotlin
                 .include(dependency("org.jetbrains.kotlin", "kotlin-stdlib", kotlin))
@@ -115,7 +116,7 @@ public class BitlyShortenBuild extends Project {
                 .signKey(property("sign.key"))
                 .signPassphrase(property("sign.passphrase"));
 
-        jarSourcesOperation().sourceDirectories(new File(srcMainDirectory(), "kotlin"));
+        jarSourcesOperation().sourceDirectories(srcMainKotlin);
     }
 
     public static void main(String[] args) {
@@ -149,7 +150,6 @@ public class BitlyShortenBuild extends Project {
 
     @BuildCommand(summary = "Generates documentation in HTML format")
     public void docs() throws ExitStatusException, IOException, InterruptedException {
-        var kotlin = new File(srcMainDirectory(), "kotlin").getAbsolutePath();
         new DokkaOperation()
                 .fromProject(this)
                 .loggingLevel(LoggingLevel.INFO)
@@ -159,8 +159,8 @@ public class BitlyShortenBuild extends Project {
                 .outputFormat(OutputFormat.HTML)
                 .sourceSet(
                         new SourceSet()
-                                .src(kotlin)
-                                .srcLink(kotlin, "https://github.com/ethauvin/" + name +
+                                .src(srcMainKotlin.getAbsolutePath())
+                                .srcLink(srcMainKotlin.getAbsolutePath(), "https://github.com/ethauvin/" + name +
                                         "/tree/master/src/main/kotlin/", "#L")
                                 .includes("config/dokka/packages.md")
                                 .jdkVersion(javaRelease)