From 5b837efc2a9effdb3ab466f6d39476615c9ee9d9 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Thu, 9 May 2024 23:44:27 -0700 Subject: [PATCH] Bumped Kotlin to version 1.9.24 --- README.md | 2 +- examples/bld/lib/bld/bld-wrapper.properties | 2 +- examples/gradle/build.gradle.kts | 2 +- lib/bld/bld-wrapper.properties | 2 +- ...zation-compiler-plugin-1.9.24-sources.jar} | Bin ...-serialization-compiler-plugin-1.9.24.jar} | Bin 993980 -> 993979 bytes pom.xml | 2 +- .../java/net/thauvin/erik/AkismetBuild.java | 25 +++++++++--------- 8 files changed, 17 insertions(+), 18 deletions(-) rename lib/provided/{kotlin-serialization-compiler-plugin-1.9.22-sources.jar => kotlin-serialization-compiler-plugin-1.9.24-sources.jar} (100%) rename lib/provided/{kotlin-serialization-compiler-plugin-1.9.22.jar => kotlin-serialization-compiler-plugin-1.9.24.jar} (97%) diff --git a/README.md b/README.md index e836c9c..c19ce47 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.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/) 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 7fa3957..253829e 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" } defaultTasks(ApplicationPlugin.TASK_RUN_NAME) diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties index 06cbc2c..cf1f717 100644 --- a/lib/bld/bld-wrapper.properties +++ b/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= diff --git a/lib/provided/kotlin-serialization-compiler-plugin-1.9.22-sources.jar b/lib/provided/kotlin-serialization-compiler-plugin-1.9.24-sources.jar similarity index 100% rename from lib/provided/kotlin-serialization-compiler-plugin-1.9.22-sources.jar rename to lib/provided/kotlin-serialization-compiler-plugin-1.9.24-sources.jar diff --git a/lib/provided/kotlin-serialization-compiler-plugin-1.9.22.jar b/lib/provided/kotlin-serialization-compiler-plugin-1.9.24.jar similarity index 97% rename from lib/provided/kotlin-serialization-compiler-plugin-1.9.22.jar rename to lib/provided/kotlin-serialization-compiler-plugin-1.9.24.jar index 82c9746e1076472836f8239c485d34542a12d650..a710db535dbc999694a018d5bfa46975677c90b3 100644 GIT binary patch delta 7402 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 K-iV?Y!T$kK{5L`X delta 7346 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 org.jetbrains.kotlin kotlin-stdlib - 1.9.22 + 1.9.24 compile diff --git a/src/bld/java/net/thauvin/erik/AkismetBuild.java b/src/bld/java/net/thauvin/erik/AkismetBuild.java index def9f6b..82c312e 100644 --- a/src/bld/java/net/thauvin/erik/AkismetBuild.java +++ b/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(); }