Bumped Kotlin to version 1.9.24

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.21-7f52ff)](https://kotlinlang.org/)
+[![Kotlin](https://img.shields.io/badge/kotlin-1.9.24-7f52ff)](https://kotlinlang.org/)
 [![bld](https://img.shields.io/badge/1.9.1-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld)
 [![Release](https://img.shields.io/github/release/ethauvin/akismet-kotlin.svg)](https://github.com/ethauvin/akismet-kotlin/releases/latest)
 [![Nexus Snapshot](https://img.shields.io/nexus/s/net.thauvin.erik/akismet-kotlin?label=snapshot&server=https%3A%2F%2Foss.sonatype.org%2F)](https://oss.sonatype.org/content/repositories/snapshots/net/thauvin/erik/akismet-kotlin/)

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=

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"
 }
 
 defaultTasks(ApplicationPlugin.TASK_RUN_NAME)

lib/bld/bld-wrapper.properties

@@ -1,9 +1,9 @@
 bld.downloadExtensionJavadoc=false
 bld.downloadExtensionSources=true
 bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.3
-bld.extensions-kotlin=com.uwyn.rife2:bld-kotlin:0.9.1
 bld.extensions-detekt=com.uwyn.rife2:bld-detekt:0.9.2
 bld.extensions=com.uwyn.rife2:bld-generated-version:0.9.5
+bld.extensions-kotlin=com.uwyn.rife2:bld-kotlin:0.9.4
 bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
 bld.downloadLocation=
 bld.sourceDirectories=

pom.xml

@@ -18,7 +18,7 @@
     <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>

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

@@ -48,14 +48,13 @@ import rife.tools.exceptions.FileUtilsErrorException;
 import java.io.File;
 import java.io.IOException;
 import java.util.List;
-import java.util.logging.ConsoleHandler;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 import static rife.bld.dependencies.Repository.*;
 import static rife.bld.dependencies.Scope.*;
 
 public class AkismetBuild extends Project {
+    final File srcMainKotlin = new File(srcMainDirectory(), "kotlin");
+
     public AkismetBuild() {
         pkg = "net.thauvin.erik";
         name = "akismet-kotlin";
@@ -67,7 +66,7 @@ public class AkismetBuild 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)
                 .include(dependency("org.jetbrains.kotlin", "kotlin-stdlib", kotlin))
                 .include(dependency("com.squareup.okhttp3", "okhttp", okHttp))
@@ -75,13 +74,13 @@ public class AkismetBuild extends Project {
                 .include(dependency("jakarta.servlet", "jakarta.servlet-api", version(6, 0, 0)))
                 .include(dependency("org.jetbrains.kotlinx", "kotlinx-serialization-json-jvm", version(1, 6, 3)));
         scope(provided)
-                .include(dependency("org.jetbrains.kotlin", "kotlin-serialization-compiler-plugin", version(1, 9, 22)));
+                .include(dependency("org.jetbrains.kotlin", "kotlin-serialization-compiler-plugin", kotlin));
         scope(test)
                 .include(dependency("org.mockito", "mockito-core", version(5, 11, 0)))
-                .include(dependency("org.jetbrains.kotlin", "kotlin-test-junit5", version(1, 9, 22)))
+                .include(dependency("org.jetbrains.kotlin", "kotlin-test-junit5", kotlin))
                 .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 10, 2)))
                 .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 10, 2)))
-                .include(dependency("com.willowtreeapps.assertk", "assertk-jvm", version(0, 28, 0)));
+                .include(dependency("com.willowtreeapps.assertk", "assertk-jvm", version(0, 28, 1)));
 
         publishOperation()
                 .repository(version.isSnapshot() ? repository(SONATYPE_SNAPSHOTS_LEGACY.location())
@@ -114,7 +113,7 @@ public class AkismetBuild 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) {
@@ -160,7 +159,6 @@ public class AkismetBuild 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)
@@ -170,9 +168,9 @@ public class AkismetBuild extends Project {
                 .outputFormat(OutputFormat.HTML)
                 .sourceSet(
                         new SourceSet()
-                                .src(kotlin)
-                                .srcLink(kotlin, "https://github.com/ethauvin/" + name +
-                                        "/tree/master/src/main/kotlin/", "#L")
+                                .src(srcMainKotlin.getAbsolutePath())
+                                .srcLink(srcMainKotlin.getAbsolutePath(), "https://github.com/ethauvin/" + name
+                                        + "/tree/master/src/main/kotlin/", "#L")
                                 .includes("config/dokka/packages.md")
                                 .jdkVersion(javaRelease)
                 )
@@ -186,7 +184,7 @@ public class AkismetBuild extends Project {
                 .projectName("Akismet Kotlin")
                 .packageName(pkg + ".akismet")
                 .classTemplate(new File(workDirectory(), "version.txt"))
-                .directory(new File(srcMainDirectory(), "kotlin"))
+                .directory(srcMainKotlin)
                 .extension(".kt")
                 .execute();
     }
@@ -195,6 +193,7 @@ public class AkismetBuild extends Project {
     public void jacoco() throws IOException {
         new JacocoReportOperation()
                 .fromProject(this)
+                .sourceFiles(srcMainKotlin)
                 .execute();
     }