From ca04776f8b523ce22c79f0dc9221cc87a27c1342 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 10 May 2024 11:01:13 -0700 Subject: [PATCH 1/7] Bumped workflow actions to latest versions --- .github/workflows/bld.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/bld.yml b/.github/workflows/bld.yml index ba51eb1..19a51fd 100644 --- a/.github/workflows/bld.yml +++ b/.github/workflows/bld.yml @@ -1,6 +1,6 @@ name: bld-ci -on: [ push, pull_request, workflow_dispatch ] +on: [push, pull_request, workflow_dispatch] jobs: build-bld-project: @@ -11,18 +11,18 @@ jobs: strategy: matrix: - java-version: [ 17, 20 ] + java-version: [17, 21, 22] steps: - name: Checkout source repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Set up JDK ${{ matrix.java-version }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: - distribution: 'zulu' + distribution: "zulu" java-version: ${{ matrix.java-version }} - name: Grant bld execute permission From 7fecaa8f8229aecc86a79a5fd62cc205d887d5f4 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 10 May 2024 11:02:57 -0700 Subject: [PATCH 2/7] Bumped bld to version 1.9.1 --- .idea/libraries/bld.xml | 4 ++-- README.md | 2 +- lib/bld/bld-wrapper.jar | Bin 27319 -> 27319 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 0b615c1..a2969be 100644 --- a/.idea/libraries/bld.xml +++ b/.idea/libraries/bld.xml @@ -2,12 +2,12 @@ - + - + diff --git a/README.md b/README.md index 3f4f787..faf7263 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![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/) -[![bld](https://img.shields.io/badge/1.9.0-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld) +[![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/jokeapi.svg)](https://github.com/ethauvin/jokeapi/releases/latest) [![Maven Central](https://img.shields.io/maven-central/v/net.thauvin.erik/jokeapi?color=blue)](https://central.sonatype.com/artifact/net.thauvin.erik/jokeapi) [![Nexus Snapshot](https://img.shields.io/nexus/s/net.thauvin.erik/jokeapi?label=snapshot&server=https%3A%2F%2Foss.sonatype.org%2F)](https://oss.sonatype.org/content/repositories/snapshots/net/thauvin/erik/jokeapi/) diff --git a/lib/bld/bld-wrapper.jar b/lib/bld/bld-wrapper.jar index c2adfe8730e64fdc0c51dc7994d0d143787eb1e2..ab2efd8985452cb4f800f9274e3ce17765c8bd90 100644 GIT binary patch delta 166 zcmdmfm2vx3M&1B#W)=|!4h{~6mcGRkdFz;g)W$v~V-UT0vvD^QnBi!~t_Nm#r<`X5 zGi1{Y!BUe0GZYnB7y`W6IrKB%X0tOeFt7q~fHxzP2m{>U$&)jjLE0wY%VOdrXNgNSGOa{$#vfXtd)lVuG6^&2^s delta 166 zcmdmfm2vx3M&1B#W)=|!4h{~6Cu<`o^42i}sf~R~#vpq0X5(%qFvHP|T@TFgPC3sA zX2_-)f~6)0W+*B$Fa&tBbL@1t7e9P b>6%PeFnuI54kDiA&jC~y0WxcHO_ntP^9?-6 diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties index d824691..315d0e7 100644 --- a/lib/bld/bld-wrapper.properties +++ b/lib/bld/bld-wrapper.properties @@ -6,4 +6,4 @@ bld.extension-detekt=com.uwyn.rife2:bld-detekt:0.9.2 bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES bld.downloadLocation= bld.sourceDirectories= -bld.version=1.9.0 +bld.version=1.9.1 From 185836c91aca374b243f87a1a033ba80c1b1a538 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 10 May 2024 11:05:16 -0700 Subject: [PATCH 3/7] Bumped Kotlin to version 1.9.24 --- README.md | 2 +- lib/bld/bld-wrapper.properties | 2 +- pom.xml | 2 +- src/bld/java/net/thauvin/erik/JokeApiBuild.java | 8 +++++--- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index faf7263..c002abf 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/jokeapi.svg)](https://github.com/ethauvin/jokeapi/releases/latest) [![Maven Central](https://img.shields.io/maven-central/v/net.thauvin.erik/jokeapi?color=blue)](https://central.sonatype.com/artifact/net.thauvin.erik/jokeapi) 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 f826f1e..41092ba 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.jetbrains.kotlin kotlin-stdlib - 1.9.22 + 1.9.24 compile diff --git a/src/bld/java/net/thauvin/erik/JokeApiBuild.java b/src/bld/java/net/thauvin/erik/JokeApiBuild.java index 1479469..d880b09 100644 --- a/src/bld/java/net/thauvin/erik/JokeApiBuild.java +++ b/src/bld/java/net/thauvin/erik/JokeApiBuild.java @@ -55,6 +55,7 @@ import static rife.bld.dependencies.Scope.compile; import static rife.bld.dependencies.Scope.test; public class JokeApiBuild extends Project { + final File srcMainKotlin = new File(srcMainDirectory(), "kotlin"); public JokeApiBuild() { pkg = "net.thauvin.erik"; name = "jokeapi"; @@ -65,13 +66,13 @@ public class JokeApiBuild extends Project { autoDownloadPurge = true; repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL); - 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("org.json", "json", "20240205")) .include(dependency("net.thauvin.erik.urlencoder", "urlencoder-lib-jvm", version(1, 4, 0))); scope(test) - .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))); @@ -107,7 +108,7 @@ public class JokeApiBuild 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) { @@ -142,6 +143,7 @@ public class JokeApiBuild extends Project { public void jacoco() throws IOException { new JacocoReportOperation() .fromProject(this) + .sourceFiles(srcMainKotlin) .execute(); } From e3c7146d061b727a325cc7acd85c44c70a3f8971 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 10 May 2024 11:05:57 -0700 Subject: [PATCH 4/7] Bumped JaCoCo extension to version 0.9.5 --- lib/bld/bld-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties index 3b10d0a..2895a28 100644 --- a/lib/bld/bld-wrapper.properties +++ b/lib/bld/bld-wrapper.properties @@ -1,7 +1,7 @@ bld.downloadExtensionJavadoc=false bld.downloadExtensionSources=true -bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.3 bld.extension-detekt=com.uwyn.rife2:bld-detekt:0.9.2 +bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.5 bld.extensions=com.uwyn.rife2:bld-kotlin:0.9.4 bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES bld.downloadLocation= From ab15abe11f32303f01448c08217578f439e4d94e Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 10 May 2024 11:06:51 -0700 Subject: [PATCH 5/7] Bumped org.json to version 20240303 --- pom.xml | 2 +- src/bld/java/net/thauvin/erik/JokeApiBuild.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 41092ba..0d669f2 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ org.json json - 20240205 + 20240303 compile diff --git a/src/bld/java/net/thauvin/erik/JokeApiBuild.java b/src/bld/java/net/thauvin/erik/JokeApiBuild.java index d880b09..c6405d9 100644 --- a/src/bld/java/net/thauvin/erik/JokeApiBuild.java +++ b/src/bld/java/net/thauvin/erik/JokeApiBuild.java @@ -69,8 +69,8 @@ public class JokeApiBuild extends Project { final var kotlin = version(1, 9, 24); scope(compile) .include(dependency("org.jetbrains.kotlin", "kotlin-stdlib", kotlin)) - .include(dependency("org.json", "json", "20240205")) .include(dependency("net.thauvin.erik.urlencoder", "urlencoder-lib-jvm", version(1, 4, 0))); + .include(dependency("org.json", "json", "20240303")) scope(test) .include(dependency("org.jetbrains.kotlin", "kotlin-test-junit5", kotlin)) .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 10, 2))) From e8deffa5efee5f9bc615f19bffca90b3198cafbe Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 10 May 2024 11:07:51 -0700 Subject: [PATCH 6/7] Bumped UrlEncoder to version 1.5.0 --- pom.xml | 2 +- src/bld/java/net/thauvin/erik/JokeApiBuild.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 0d669f2..cfa8eb9 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ net.thauvin.erik.urlencoder urlencoder-lib-jvm - 1.4.0 + 1.5.0 compile diff --git a/src/bld/java/net/thauvin/erik/JokeApiBuild.java b/src/bld/java/net/thauvin/erik/JokeApiBuild.java index c6405d9..e99f424 100644 --- a/src/bld/java/net/thauvin/erik/JokeApiBuild.java +++ b/src/bld/java/net/thauvin/erik/JokeApiBuild.java @@ -69,8 +69,8 @@ public class JokeApiBuild extends Project { final var kotlin = version(1, 9, 24); scope(compile) .include(dependency("org.jetbrains.kotlin", "kotlin-stdlib", kotlin)) - .include(dependency("net.thauvin.erik.urlencoder", "urlencoder-lib-jvm", version(1, 4, 0))); .include(dependency("org.json", "json", "20240303")) + .include(dependency("net.thauvin.erik.urlencoder", "urlencoder-lib-jvm", version(1, 5, 0))); scope(test) .include(dependency("org.jetbrains.kotlin", "kotlin-test-junit5", kotlin)) .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 10, 2))) From e81c6a0492a72e96a93e151a903c0911bc88fec3 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 10 May 2024 11:12:41 -0700 Subject: [PATCH 7/7] Bumped AssertK to version 0.28.1 --- src/bld/java/net/thauvin/erik/JokeApiBuild.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/bld/java/net/thauvin/erik/JokeApiBuild.java b/src/bld/java/net/thauvin/erik/JokeApiBuild.java index e99f424..7b2f318 100644 --- a/src/bld/java/net/thauvin/erik/JokeApiBuild.java +++ b/src/bld/java/net/thauvin/erik/JokeApiBuild.java @@ -56,6 +56,7 @@ import static rife.bld.dependencies.Scope.test; public class JokeApiBuild extends Project { final File srcMainKotlin = new File(srcMainDirectory(), "kotlin"); + public JokeApiBuild() { pkg = "net.thauvin.erik"; name = "jokeapi"; @@ -75,7 +76,7 @@ public class JokeApiBuild extends Project { .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())