From 257559d522f82b18ba27b34b92211b35f79e795e Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Mon, 27 Jan 2025 22:09:49 -0800 Subject: [PATCH 1/3] Bumped bld to version 2.2.0 --- .idea/libraries/bld.xml | 4 ++-- .vscode/settings.json | 2 +- lib/bld/bld-wrapper.jar | Bin 30440 -> 30440 bytes lib/bld/bld-wrapper.properties | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.idea/libraries/bld.xml b/.idea/libraries/bld.xml index 5c4010c..553c281 100644 --- a/.idea/libraries/bld.xml +++ b/.idea/libraries/bld.xml @@ -2,12 +2,12 @@ - + - + diff --git a/.vscode/settings.json b/.vscode/settings.json index 4c33beb..a3f4fd0 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -9,7 +9,7 @@ ], "java.configuration.updateBuildConfiguration": "automatic", "java.project.referencedLibraries": [ - "${HOME}/.bld/dist/bld-2.1.0.jar", + "${HOME}/.bld/dist/bld-2.2.0.jar", "lib/**/*.jar" ] } diff --git a/lib/bld/bld-wrapper.jar b/lib/bld/bld-wrapper.jar index 28ecedee85ba8a470c67360a4e064051711f5a1b..fede4fb1c1cbbef1c6954f994737ecdc87c642e2 100644 GIT binary patch delta 203 zcmaFymhr_~M!o=VW)=|!4h{|m!AaUt6ZvXcK=j6b6B{sNa-Y4%=Jz(UnZUfwefC{Y zmW&gd9z;y7;2a}_^`p=LB0E{9L{8< delta 203 zcmaFymhr_~M!o=VW)=|!4h{|mqdBsX6ZvXcK=j6b6B{sNa-Y4%=Jz(UnZUfwefC{Y zmW&gd9z;y7;2a}_^`p=LB0E{9L{8<3F#|(@H#^70qR3Eo1_lOJAP(?mWD;RO*f%+^ q#0g^0mJ$yzV^V1_L?9f-SXb%-5&2dc3zaJK;{dr5Wb)*-W!3;Gojx}J diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties index a333b3e..edd747b 100644 --- a/lib/bld/bld-wrapper.properties +++ b/lib/bld/bld-wrapper.properties @@ -9,4 +9,4 @@ bld.extension-dokka=com.uwyn.rife2:bld-dokka:1.0.2 bld.extension-kotlin=com.uwyn.rife2:bld-kotlin:1.0.3 bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_RELEASES,RIFE2_SNAPSHOTS bld.sourceDirectories= -bld.version=2.1.0 +bld.version=2.2.0 From 51ba40cbcd5ffb6644db03cd98e10215e02f4d60 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Mon, 27 Jan 2025 22:10:44 -0800 Subject: [PATCH 2/3] Bumped Kotlin to version 2.1.10 --- .circleci/config.yml | 2 +- .github/workflows/bld.yml | 2 +- src/bld/java/com/example/ExampleBuild.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8d8eb96..82ef4e4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -45,7 +45,7 @@ jobs: - image: cimg/openjdk:23.0 steps: - build_and_test: - kotlin: 2.1.0 + kotlin: 2.1.10 workflows: bld: diff --git a/.github/workflows/bld.yml b/.github/workflows/bld.yml index 38ab640..ffcf68b 100644 --- a/.github/workflows/bld.yml +++ b/.github/workflows/bld.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: java-version: [17, 21, 23] - kotlin-version: [1.9.24, 2.1.0] + kotlin-version: [1.9.25, 2.1.10] steps: - name: Checkout source repository diff --git a/src/bld/java/com/example/ExampleBuild.java b/src/bld/java/com/example/ExampleBuild.java index 8cfba0f..51473fa 100644 --- a/src/bld/java/com/example/ExampleBuild.java +++ b/src/bld/java/com/example/ExampleBuild.java @@ -30,7 +30,7 @@ public class ExampleBuild extends Project { autoDownloadPurge = true; repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL, RIFE2_RELEASES); - final var kotlin = version(2, 1, 0); + final var kotlin = version(2, 1, 10); scope(compile) .include(dependency("org.jetbrains.kotlin", "kotlin-stdlib", kotlin)); scope(test) From 169a1df4453e567488742f73253fc119ebbe2c16 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Mon, 27 Jan 2025 22:11:56 -0800 Subject: [PATCH 3/3] Updated extensions Bumped Detekt extension to version 0.9.8 Bumped Dokka extension to version 1.0.3 Bumped Kotlin extension to version 1.0.4 --- lib/bld/bld-wrapper.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties index edd747b..97e82e4 100644 --- a/lib/bld/bld-wrapper.properties +++ b/lib/bld/bld-wrapper.properties @@ -4,9 +4,9 @@ bld.downloadLocation= bld.extensions= bld.javaOptions= bld.javacOptions= -bld.extension-detekt=com.uwyn.rife2:bld-detekt:0.9.7 -bld.extension-dokka=com.uwyn.rife2:bld-dokka:1.0.2 -bld.extension-kotlin=com.uwyn.rife2:bld-kotlin:1.0.3 +bld.extension-detekt=com.uwyn.rife2:bld-detekt:0.9.8 +bld.extension-dokka=com.uwyn.rife2:bld-dokka:1.0.3 +bld.extension-kotlin=com.uwyn.rife2:bld-kotlin:1.0.4 bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_RELEASES,RIFE2_SNAPSHOTS bld.sourceDirectories= bld.version=2.2.0