From 2a88bbb04596f85e4bcf5ed8d390988a06a3fe6d Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 24 Nov 2023 13:18:13 -0800 Subject: [PATCH] Upgrade to Koltin 1.9.21 --- README.md | 2 +- examples/README.md | 2 +- examples/src/bld/java/com/example/ExampleBuild.java | 4 ++-- .../rife/bld/extension/CompileKotlinOperationBuild.java | 2 +- .../java/rife/bld/extension/CompileKotlinOperation.java | 6 ++++++ 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index b883514..0ce25a8 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![License](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) [![Java](https://img.shields.io/badge/java-17%2B-blue)](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html) -[![Kotlin](https://img.shields.io/badge/kotlin-1.9.20-7f52ff.svg)](https://kotlinlang.org) +[![Kotlin](https://img.shields.io/badge/kotlin-1.9.21-7f52ff.svg)](https://kotlinlang.org) [![bld](https://img.shields.io/badge/1.7.3-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld) [![Release](https://flat.badgen.net/maven/v/metadata-url/repo.rife2.com/releases/com/uwyn/rife2/bld-kotlin/maven-metadata.xml?color=blue)](https://repo.rife2.com/#/releases/com/uwyn/rife2/bld-kotlin) [![Snapshot](https://flat.badgen.net/maven/v/metadata-url/repo.rife2.com/snapshots/com/uwyn/rife2/bld-kotlin/maven-metadata.xml?label=snapshot)](https://repo.rife2.com/#/snapshots/com/uwyn/rife2/bld-kotlin) diff --git a/examples/README.md b/examples/README.md index c27af21..e40be28 100644 --- a/examples/README.md +++ b/examples/README.md @@ -1,4 +1,4 @@ -## Compile the Kotlin Example +j## Compile the Kotlin Example ```console ./bld compile diff --git a/examples/src/bld/java/com/example/ExampleBuild.java b/examples/src/bld/java/com/example/ExampleBuild.java index 5447f0a..4a39a60 100644 --- a/examples/src/bld/java/com/example/ExampleBuild.java +++ b/examples/src/bld/java/com/example/ExampleBuild.java @@ -33,9 +33,9 @@ public class ExampleBuild extends Project { repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL, RIFE2_RELEASES); scope(compile) - .include(dependency("org.jetbrains.kotlin", "kotlin-stdlib", version(1, 9, 20))); + .include(dependency("org.jetbrains.kotlin", "kotlin-stdlib", version(1, 9, 21))); scope(test) - .include(dependency("org.jetbrains.kotlin:kotlin-test-junit5:1.9.20")) + .include(dependency("org.jetbrains.kotlin:kotlin-test-junit5:1.9.21")) .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 10, 1))) .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 10, 1))); diff --git a/src/bld/java/rife/bld/extension/CompileKotlinOperationBuild.java b/src/bld/java/rife/bld/extension/CompileKotlinOperationBuild.java index 0dec4e4..493a473 100644 --- a/src/bld/java/rife/bld/extension/CompileKotlinOperationBuild.java +++ b/src/bld/java/rife/bld/extension/CompileKotlinOperationBuild.java @@ -41,7 +41,7 @@ public class CompileKotlinOperationBuild extends Project { repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL, RIFE2_RELEASES); var dokka = version(1, 9, 10); - var kotlin = version(1, 9, 20); + var kotlin = version(1, 9, 21); scope(compile) .include(dependency("org.jetbrains.kotlin", "kotlin-compiler", kotlin)) .include(dependency("org.jetbrains.kotlin", "kotlin-annotation-processing", kotlin)) diff --git a/src/main/java/rife/bld/extension/CompileKotlinOperation.java b/src/main/java/rife/bld/extension/CompileKotlinOperation.java index a1a7e9e..6fbbbee 100644 --- a/src/main/java/rife/bld/extension/CompileKotlinOperation.java +++ b/src/main/java/rife/bld/extension/CompileKotlinOperation.java @@ -239,6 +239,9 @@ public class CompileKotlinOperation extends AbstractOperation