From 8959a134446990833ae2b2b90488be4c7090d4bc Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Thu, 9 May 2024 08:06:54 -0700 Subject: [PATCH 1/4] Added root POM generation to updates command --- src/bld/java/net/thauvin/erik/MobibotBuild.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/bld/java/net/thauvin/erik/MobibotBuild.java b/src/bld/java/net/thauvin/erik/MobibotBuild.java index 0cc441e..ddc0b75 100644 --- a/src/bld/java/net/thauvin/erik/MobibotBuild.java +++ b/src/bld/java/net/thauvin/erik/MobibotBuild.java @@ -150,6 +150,12 @@ public class MobibotBuild extends Project { .execute(); } + @Override + public void updates() throws Exception { + super.updates(); + rootPom(); + } + @BuildCommand(summary = "Copies all needed files to the deploy directory") public void deploy() throws FileUtilsErrorException { var deploy = new File("deploy"); From cd873acc24c51e5117e6d70274763e4149a2cfac Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Sat, 11 May 2024 13:03:18 -0700 Subject: [PATCH 2/4] Bumped Kotlin Coroutines to version 1.8.1 --- pom.xml | 2 +- src/bld/java/net/thauvin/erik/MobibotBuild.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 8a562d6..df4bbe8 100644 --- a/pom.xml +++ b/pom.xml @@ -84,7 +84,7 @@ org.jetbrains.kotlinx kotlinx-coroutines-core - 1.8.0 + 1.8.1 compile diff --git a/src/bld/java/net/thauvin/erik/MobibotBuild.java b/src/bld/java/net/thauvin/erik/MobibotBuild.java index ddc0b75..d2e4cb1 100644 --- a/src/bld/java/net/thauvin/erik/MobibotBuild.java +++ b/src/bld/java/net/thauvin/erik/MobibotBuild.java @@ -96,7 +96,7 @@ public class MobibotBuild extends Project { .include(dependency("org.jetbrains.kotlin", "kotlin-stdlib-common", kotlin)) .include(dependency("org.jetbrains.kotlin", "kotlin-stdlib-jdk7", kotlin)) .include(dependency("org.jetbrains.kotlin", "kotlin-stdlib-jdk8", kotlin)) - .include(dependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core", "1.8.0")) + .include(dependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core", "1.8.1")) .include(dependency("org.jetbrains.kotlinx", "kotlinx-cli-jvm", "0.3.6")) // Logging .include(dependency("org.slf4j", "slf4j-api", "2.0.13")) From 3f7fb103433475cb1854098f2715bde15939ecfa Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Mon, 27 May 2024 00:11:54 -0700 Subject: [PATCH 3/4] Bumped extensions versions Bumped GeneratedVersion extenions to version 0.9.6 Bumped Kotlin extension to version 0.9.8 Bumped Detekt extension to version 0.9.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 c23d7bb..1695c0b 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.5 -bld.extensions=com.uwyn.rife2:bld-generated-version:0.9.6-SNAPSHOT -bld.extensions-kotlin=com.uwyn.rife2:bld-kotlin:0.9.4 -bld.extensions-detekt=com.uwyn.rife2:bld-detekt:0.9.4-SNAPSHOT +bld.extensions=com.uwyn.rife2:bld-generated-version:0.9.6 +bld.extensions-kotlin=com.uwyn.rife2:bld-kotlin:0.9.8 +bld.extensions-detekt=com.uwyn.rife2:bld-detekt:0.9.4 bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES bld.downloadLocation= bld.sourceDirectories= From 3419e12f06b11dc7620e991cd0f30e4a79696e9f Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Mon, 27 May 2024 00:15:26 -0700 Subject: [PATCH 4/4] Bumped dependencies versions Bumped Kotlin to version 2.0.0 Bumped Gson to version 2.11.0 Bumped VertexAI (Gemini) to version 1.4.0 --- .idea/misc.xml | 16 +--------------- README.md | 2 +- pom.xml | 12 ++++++------ src/bld/java/net/thauvin/erik/MobibotBuild.java | 14 +++++++------- 4 files changed, 15 insertions(+), 29 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index f63c128..bccad37 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -8,21 +8,7 @@ - - - - \ No newline at end of file + diff --git a/README.md b/README.md index 4ac4370..eb38cfb 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.24-7f52ff.svg)](https://kotlinlang.org) +[![Kotlin](https://img.shields.io/badge/kotlin-2.0.0-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/pom.xml b/pom.xml index df4bbe8..3ef1964 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ com.google.code.gson gson - 2.10.1 + 2.11.0 compile @@ -54,31 +54,31 @@ com.google.cloud google-cloud-vertexai - 1.3.0 + 1.4.0 compile org.jetbrains.kotlin kotlin-stdlib - 1.9.24 + 2.0.0 compile org.jetbrains.kotlin kotlin-stdlib-common - 1.9.24 + 2.0.0 compile org.jetbrains.kotlin kotlin-stdlib-jdk7 - 1.9.24 + 2.0.0 compile org.jetbrains.kotlin kotlin-stdlib-jdk8 - 1.9.24 + 2.0.0 compile diff --git a/src/bld/java/net/thauvin/erik/MobibotBuild.java b/src/bld/java/net/thauvin/erik/MobibotBuild.java index d2e4cb1..8a7265e 100644 --- a/src/bld/java/net/thauvin/erik/MobibotBuild.java +++ b/src/bld/java/net/thauvin/erik/MobibotBuild.java @@ -78,7 +78,7 @@ public class MobibotBuild extends Project { SONATYPE_SNAPSHOTS_LEGACY); var log4j = version(2, 23, 1); - var kotlin = version(1, 9, 24); + var kotlin = version(2, 0, 0); scope(compile) // PircBotX .include(dependency("com.github.pircbotx", "pircbotx", "2.3.1")) @@ -88,9 +88,9 @@ public class MobibotBuild extends Project { .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")) + .include(dependency("com.google.code.gson", "gson", "2.11.0")) .include(dependency("com.google.guava", "guava", "33.2.0-jre")) - .include(dependency("com.google.cloud", "google-cloud-vertexai", "1.3.0")) + .include(dependency("com.google.cloud", "google-cloud-vertexai", "1.4.0")) // Kotlin .include(dependency("org.jetbrains.kotlin", "kotlin-stdlib", kotlin)) .include(dependency("org.jetbrains.kotlin", "kotlin-stdlib-common", kotlin)) @@ -153,7 +153,7 @@ public class MobibotBuild extends Project { @Override public void updates() throws Exception { super.updates(); - rootPom(); + pomRoot(); } @BuildCommand(summary = "Copies all needed files to the deploy directory") @@ -203,13 +203,13 @@ public class MobibotBuild extends Project { .classTemplate(new File(workDirectory(), "release-info.txt")) .className("ReleaseInfo") .packageName(pkg) - .directory(new File(srcMainDirectory(), "kotlin")) + .directory(srcMainKotlin) .extension(".kt") .execute(); } - @BuildCommand(value = "root-pom", summary = "Generates the POM file in the root directory") - public void rootPom() throws FileUtilsErrorException { + @BuildCommand(value = "pom-root", summary = "Generates the POM file in the root directory") + public void pomRoot() throws FileUtilsErrorException { PomBuilder.generateInto(publishOperation().info(), dependencies(), Path.of(workDirectory.getPath(), "pom.xml").toFile()); }