From c43d4c6dec9eac6792ca2fb889932446ff55efcf Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Wed, 8 May 2024 17:00:13 -0700 Subject: [PATCH 1/5] 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 add1696..8a7a007 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![License (3-Clause BSD)](https://img.shields.io/badge/license-BSD%203--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause) [![Kotlin](https://img.shields.io/badge/kotlin-1.9.23-7f52ff.svg)](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) [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=ethauvin_mobibot&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=ethauvin_mobibot) [![GitHub CI](https://github.com/ethauvin/mobibot/actions/workflows/bld.yml/badge.svg)](https://github.com/ethauvin/mobibot/actions/workflows/bld.yml) [![CircleCI](https://circleci.com/gh/ethauvin/mobibot/tree/master.svg?style=shield)](https://circleci.com/gh/ethauvin/mobibot/tree/master) diff --git a/lib/bld/bld-wrapper.jar b/lib/bld/bld-wrapper.jar index a0b841fe66de3c304fccde70393d52a07cb89a82..8a6c6415420d24c2f97b665923c81552b4add950 100644 GIT binary patch delta 166 zcmdmfm2vx3M&1B#W)=|!4h{~6_P)gvdFz;g)W$v~V-UT0vvD^QnBi!~t_Nm#r<`X5 zGi1{Y!BUe0GZYnB7y`W6IrKB%X0tOeFt7q~fHxzP2m{>U$&)jjLE0wY%VOdrXNgNSGOa{$#vfXtd)lVuG60#iA_ delta 166 zcmdmfm2vx3M&1B#W)=|!4h{~6fWGdDymib#YGa?0F^Jy0*|?ht%y2Yg*8?-WQ_eGj z8M0}HV5!N08H$Pw3<2Kk96KXl$*?mpFt7q~fHxzP2m{>U$&)jjLE0wY%VOdrXNgNSGOa{$#vfXtd)lVuG6xkfd* diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties index 8911afc..d4519f0 100644 --- a/lib/bld/bld-wrapper.properties +++ b/lib/bld/bld-wrapper.properties @@ -7,4 +7,4 @@ bld.extensions-detekt=com.uwyn.rife2:bld-detekt:0.9.4-SNAPSHOT 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 e83e12bd117dc59f22aca3484a5c527126924d60 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Wed, 8 May 2024 17:00:57 -0700 Subject: [PATCH 2/5] Bumped Kotlin extension to verison 0.9.4 --- 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 d4519f0..c23d7bb 100644 --- a/lib/bld/bld-wrapper.properties +++ b/lib/bld/bld-wrapper.properties @@ -2,7 +2,7 @@ bld.downloadExtensionJavadoc=false bld.downloadExtensionSources=true bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.5 bld.extensions=com.uwyn.rife2:bld-generated-version:0.9.6-SNAPSHOT -bld.extensions-kotlin=com.uwyn.rife2:bld-kotlin:0.9.3 +bld.extensions-kotlin=com.uwyn.rife2:bld-kotlin:0.9.4 bld.extensions-detekt=com.uwyn.rife2:bld-detekt:0.9.4-SNAPSHOT bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES bld.downloadLocation= From 833421976e5cf5b4fe74298fc56d5a24295c65cd Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Wed, 8 May 2024 17:01:32 -0700 Subject: [PATCH 3/5] Bumped Commons Codec to version 1.17.0 --- src/bld/java/net/thauvin/erik/MobibotBuild.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bld/java/net/thauvin/erik/MobibotBuild.java b/src/bld/java/net/thauvin/erik/MobibotBuild.java index a5e5957..f0aa0aa 100644 --- a/src/bld/java/net/thauvin/erik/MobibotBuild.java +++ b/src/bld/java/net/thauvin/erik/MobibotBuild.java @@ -84,7 +84,7 @@ public class MobibotBuild extends Project { // Commons (mostly for PircBotX) .include(dependency("org.apache.commons", "commons-lang3", "3.14.0")) .include(dependency("org.apache.commons", "commons-text", "1.12.0")) - .include(dependency("commons-codec", "commons-codec", "1.16.1")) + .include(dependency("commons-codec", "commons-codec", "1.17.0")) .include(dependency("commons-net", "commons-net", "3.10.0")) // Google .include(dependency("com.google.code.gson", "gson", "2.10.1")) From b020ae4c0d8740806f33932f6407a961034e08d6 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Wed, 8 May 2024 17:02:18 -0700 Subject: [PATCH 4/5] Bumped Guava to version 33.2.0 --- src/bld/java/net/thauvin/erik/MobibotBuild.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bld/java/net/thauvin/erik/MobibotBuild.java b/src/bld/java/net/thauvin/erik/MobibotBuild.java index f0aa0aa..98faa33 100644 --- a/src/bld/java/net/thauvin/erik/MobibotBuild.java +++ b/src/bld/java/net/thauvin/erik/MobibotBuild.java @@ -88,7 +88,7 @@ public class MobibotBuild extends Project { .include(dependency("commons-net", "commons-net", "3.10.0")) // Google .include(dependency("com.google.code.gson", "gson", "2.10.1")) - .include(dependency("com.google.guava", "guava", "33.1.0-jre")) + .include(dependency("com.google.guava", "guava", "33.2.0-jre")) .include(dependency("com.google.cloud", "google-cloud-vertexai", "1.2.0")) // Kotlin .include(dependency("org.jetbrains.kotlin", "kotlin-stdlib", kotlin)) From d2dd66fb4bd1f74795f19dae61a9bdbb0a9716c9 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Wed, 8 May 2024 17:02:57 -0700 Subject: [PATCH 5/5] Bumped Kotlin to version 1.9.24 --- README.md | 2 +- src/bld/java/net/thauvin/erik/MobibotBuild.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 8a7a007..4ac4370 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # mobibot [![License (3-Clause BSD)](https://img.shields.io/badge/license-BSD%203--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause) -[![Kotlin](https://img.shields.io/badge/kotlin-1.9.23-7f52ff.svg)](https://kotlinlang.org) +[![Kotlin](https://img.shields.io/badge/kotlin-1.9.24-7f52ff.svg)](https://kotlinlang.org) [![bld](https://img.shields.io/badge/1.9.1-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld) [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=ethauvin_mobibot&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=ethauvin_mobibot) [![GitHub CI](https://github.com/ethauvin/mobibot/actions/workflows/bld.yml/badge.svg)](https://github.com/ethauvin/mobibot/actions/workflows/bld.yml) diff --git a/src/bld/java/net/thauvin/erik/MobibotBuild.java b/src/bld/java/net/thauvin/erik/MobibotBuild.java index 98faa33..576e378 100644 --- a/src/bld/java/net/thauvin/erik/MobibotBuild.java +++ b/src/bld/java/net/thauvin/erik/MobibotBuild.java @@ -58,6 +58,7 @@ import static rife.bld.dependencies.Scope.test; public class MobibotBuild extends Project { private static final String DETEKT_BASELINE = "config/detekt/baseline.xml"; + final File srcMainKotlin = new File(srcMainDirectory(), "kotlin"); public MobibotBuild() { pkg = "net.thauvin.erik.mobibot"; @@ -77,7 +78,7 @@ public class MobibotBuild extends Project { SONATYPE_SNAPSHOTS_LEGACY); var log4j = version(2, 23, 1); - var kotlin = version(1, 9, 23); + var kotlin = version(1, 9, 24); scope(compile) // PircBotX .include(dependency("com.github.pircbotx", "pircbotx", "2.3.1")) @@ -124,7 +125,7 @@ public class MobibotBuild extends Project { .manifestAttribute(Attributes.Name.MAIN_CLASS, mainClass()) .manifestAttribute(Attributes.Name.CLASS_PATH, ". " + String.join(" ", jars)); - jarSourcesOperation().sourceDirectories(new File(srcMainDirectory(), "kotlin")); + jarSourcesOperation().sourceDirectories(srcMainKotlin); } public static void main(String[] args) { @@ -182,6 +183,7 @@ public class MobibotBuild extends Project { public void jacoco() throws IOException { new JacocoReportOperation() .fromProject(this) + .sourceFiles(srcMainKotlin) .execute(); }