From 97e1e5e73be534f0f638829c11080e3bbfa590b8 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Wed, 18 Sep 2024 20:28:58 -0700 Subject: [PATCH 1/7] Bumped Kotlin Coroutines to version 1.9.0 --- pom.xml | 4 ++-- src/bld/java/net/thauvin/erik/MobibotBuild.java | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 5d1b89a..a50df02 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 net.thauvin.erik.mobibot mobibot - 0.8.0-rc+20240908192921 + 0.8.0-rc+20240918181213 mobibot @@ -78,7 +78,7 @@ org.jetbrains.kotlinx kotlinx-coroutines-core - 1.8.1 + 1.9.0 compile diff --git a/src/bld/java/net/thauvin/erik/MobibotBuild.java b/src/bld/java/net/thauvin/erik/MobibotBuild.java index 980f2a6..6c4a09c 100644 --- a/src/bld/java/net/thauvin/erik/MobibotBuild.java +++ b/src/bld/java/net/thauvin/erik/MobibotBuild.java @@ -45,7 +45,6 @@ import rife.tools.exceptions.FileUtilsErrorException; import java.io.File; import java.io.IOException; -import java.nio.file.Path; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.ArrayList; @@ -96,7 +95,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.1")) + .include(dependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core", "1.9.0")) .include(dependency("org.jetbrains.kotlinx", "kotlinx-cli-jvm", "0.3.6")) // Logging .include(dependency("org.slf4j", "slf4j-api", "2.0.16")) From 4b908d596ef08f712a9846158a0ed8ec7ef2ad7d Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Wed, 18 Sep 2024 20:37:11 -0700 Subject: [PATCH 2/7] Converted deploy script to fish --- deploy.fish | 11 +++++++++++ deploy.sh | 11 ----------- 2 files changed, 11 insertions(+), 11 deletions(-) create mode 100755 deploy.fish delete mode 100755 deploy.sh diff --git a/deploy.fish b/deploy.fish new file mode 100755 index 0000000..d69ee4e --- /dev/null +++ b/deploy.fish @@ -0,0 +1,11 @@ +#!/usr/bin/env fish + +./bld clean jar deploy +if test $status -eq 0 + echo "cd /home/mobibot/mobitopia/mobibot +lcd deploy +put *.jar +cd lib +rm *.jar +put lib/*.jar" | sftp nix4 +end diff --git a/deploy.sh b/deploy.sh deleted file mode 100755 index d1c1f23..0000000 --- a/deploy.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -./bld clean jar deploy -[ $? -eq 0 ] && sftp nix4.thauvin.us < Date: Wed, 27 Nov 2024 22:24:45 -0800 Subject: [PATCH 3/7] Updated dependencies Bumped Kotlin to version 2.1.0 Bumped Log4J to version 2.24.2 Bumped LangChain4J to version 0.36.2 Bumped Jsoup to version 1.18.2 Bumped UrlEncoder to version 1.6.0 Bumped JUnit to version 5.11.3 --- .github/workflows/bld.yml | 4 ++-- .idea/kotlinc.xml | 16 ++++++++++++++++ README.md | 2 +- src/bld/java/net/thauvin/erik/MobibotBuild.java | 14 +++++++------- 4 files changed, 26 insertions(+), 10 deletions(-) create mode 100644 .idea/kotlinc.xml diff --git a/.github/workflows/bld.yml b/.github/workflows/bld.yml index f76f164..cb0ad5d 100644 --- a/.github/workflows/bld.yml +++ b/.github/workflows/bld.yml @@ -22,8 +22,8 @@ jobs: strategy: matrix: - java-version: [17, 21, 22] - kotlin-version: [1.9.24, 2.0.20] + java-version: [17, 21, 23] + kotlin-version: [1.9.24, 2.0.20, 2.1.0] steps: - name: Checkout source repository diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml new file mode 100644 index 0000000..0273acf --- /dev/null +++ b/.idea/kotlinc.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/README.md b/README.md index e438c94..b31ec67 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-2.0.20-7f52ff.svg)](https://kotlinlang.org) +[![Kotlin](https://img.shields.io/badge/kotlin-2.1.0-7f52ff.svg)](https://kotlinlang.org) [![bld](https://img.shields.io/badge/2.1.0-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 6c4a09c..3858951 100644 --- a/src/bld/java/net/thauvin/erik/MobibotBuild.java +++ b/src/bld/java/net/thauvin/erik/MobibotBuild.java @@ -76,9 +76,9 @@ public class MobibotBuild extends Project { new Repository("https://jitpack.io"), SONATYPE_SNAPSHOTS_LEGACY); - var log4j = version(2, 24, 0); - var kotlin = version(2, 0, 20); - var langchain = version(0, 34, 0); + var log4j = version(2, 24, 2); + var kotlin = version(2, 1, 0); + var langchain = version(0, 36, 2); scope(compile) // PircBotX .include(dependency("com.github.pircbotx", "pircbotx", "2.3.1")) @@ -113,17 +113,17 @@ public class MobibotBuild extends Project { .include(dependency("net.aksingh", "owm-japis", "2.5.3.0")) .include(dependency("net.objecthunter", "exp4j", "0.4.8")) .include(dependency("org.json", "json", "20240303")) - .include(dependency("org.jsoup", "jsoup", "1.18.1")) + .include(dependency("org.jsoup", "jsoup", "1.18.2")) // Thauvin .include(dependency("net.thauvin.erik", "cryptoprice", "1.0.3-SNAPSHOT")) .include(dependency("net.thauvin.erik", "jokeapi", "0.9.2-SNAPSHOT")) .include(dependency("net.thauvin.erik", "pinboard-poster", "1.1.2-SNAPSHOT")) - .include(dependency("net.thauvin.erik.urlencoder", "urlencoder-lib-jvm", "1.5.0")); + .include(dependency("net.thauvin.erik.urlencoder", "urlencoder-lib-jvm", "1.6.0")); scope(test) .include(dependency("com.willowtreeapps.assertk", "assertk-jvm", version(0, 28, 1))) .include(dependency("org.jetbrains.kotlin", "kotlin-test-junit5", kotlin)) - .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 11, 0))) - .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 11, 0))); + .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 11, 3))) + .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 11, 3))); List jars = new ArrayList<>(); runtimeClasspathJars().forEach(f -> jars.add("./lib/" + f.getName())); From f27501634c7d6621284186c6bbebb53427ce03fb Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Wed, 27 Nov 2024 22:26:46 -0800 Subject: [PATCH 4/7] Ensured HttpUrlConnection is properly disconnected --- .../kotlin/net/thauvin/erik/mobibot/Utils.kt | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt b/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt index 6a8e4ff..92b4883 100644 --- a/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt +++ b/src/main/kotlin/net/thauvin/erik/mobibot/Utils.kt @@ -421,14 +421,22 @@ object Utils { @Throws(IOException::class) fun URL.reader(): UrlReaderResponse { val connection = this.openConnection() as HttpURLConnection - connection.setRequestProperty( - "User-Agent", - "Mozilla/5.0 (X11; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/109.0" - ) - return if (connection.responseCode.isHttpSuccess()) { - UrlReaderResponse(connection.responseCode, connection.inputStream.bufferedReader().use { it.readText() }) - } else { - UrlReaderResponse(connection.responseCode, connection.errorStream.bufferedReader().use { it.readText() }) + try { + connection.setRequestProperty( + "User-Agent", + "Mozilla/5.0 (X11; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/109.0" + ) + return if (connection.responseCode.isHttpSuccess()) { + UrlReaderResponse( + connection.responseCode, + connection.inputStream.bufferedReader().use { it.readText() }) + } else { + UrlReaderResponse( + connection.responseCode, + connection.errorStream.bufferedReader().use { it.readText() }) + } + } finally { + connection.disconnect() } } From 83b4b18be743593ddf640140bad7d0f5c1e45551 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Wed, 27 Nov 2024 22:29:31 -0800 Subject: [PATCH 5/7] Added pom-root command --- src/bld/java/net/thauvin/erik/MobibotBuild.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/bld/java/net/thauvin/erik/MobibotBuild.java b/src/bld/java/net/thauvin/erik/MobibotBuild.java index 3858951..897a966 100644 --- a/src/bld/java/net/thauvin/erik/MobibotBuild.java +++ b/src/bld/java/net/thauvin/erik/MobibotBuild.java @@ -200,6 +200,12 @@ public class MobibotBuild extends Project { .execute(); } + @BuildCommand(value = "pom-root", summary = "Generates the POM file in the root directory") + public void pomRoot() throws FileUtilsErrorException { + PomBuilder.generateInto(publishOperation().fromProject(this).info(), dependencies(), + new File(workDirectory, "pom.xml")); + } + @BuildCommand(value = "release-info", summary = "Generates the ReleaseInfo class") public void releaseInfo() throws Exception { new GeneratedVersionOperation() @@ -211,10 +217,4 @@ public class MobibotBuild extends Project { .extension(".kt") .execute(); } - - @BuildCommand(value = "pom-root", summary = "Generates the POM file in the root directory") - public void pomRoot() throws FileUtilsErrorException { - PomBuilder.generateInto(publishOperation().fromProject(this).info(), dependencies(), - new File(workDirectory, "pom.xml")); - } } From 64bd5c92afdbd834f5833738d39f5e4ba371c49d Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Wed, 27 Nov 2024 22:32:12 -0800 Subject: [PATCH 6/7] Don't clean/delete deploy dir if not there --- src/bld/java/net/thauvin/erik/MobibotBuild.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/bld/java/net/thauvin/erik/MobibotBuild.java b/src/bld/java/net/thauvin/erik/MobibotBuild.java index 897a966..c95d779 100644 --- a/src/bld/java/net/thauvin/erik/MobibotBuild.java +++ b/src/bld/java/net/thauvin/erik/MobibotBuild.java @@ -141,7 +141,10 @@ public class MobibotBuild extends Project { @Override public void clean() throws Exception { - FileUtils.deleteDirectory(new File("deploy")); + var deploy = new File("deploy"); + if (deploy.exists()) { + FileUtils.deleteDirectory(deploy); + } super.clean(); } From 700369d7c9b363c5ee5e992f2820269471b2bbf5 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Sat, 21 Dec 2024 06:59:40 -0800 Subject: [PATCH 7/7] Updated dependencies Bumped JUnit to version 5.11.4 Bumped Log4j to version 2.24.3 Bumped Commons Text to version 1.13.0 Bumped Jsoup to version 1.18.3 Bumped Kotlin Coroutines to version 1.10.1 Bumped Kotlin extension to version 1.0.3 --- lib/bld/bld-wrapper.properties | 2 +- .../java/net/thauvin/erik/MobibotBuild.java | 20 ++++++++++--------- .../thauvin/erik/mobibot/modules/Gemini2.kt | 1 - 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties index 547a2bb..ae6925d 100644 --- a/lib/bld/bld-wrapper.properties +++ b/lib/bld/bld-wrapper.properties @@ -4,7 +4,7 @@ bld.downloadLocation= bld.extension-detekt=com.uwyn.rife2:bld-detekt:0.9.7 bld.extension-gv=com.uwyn.rife2:bld-generated-version:0.9.9 bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.8 -bld.extension-kotlin=com.uwyn.rife2:bld-kotlin:1.0.2 +bld.extension-kotlin=com.uwyn.rife2:bld-kotlin:1.0.3 bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES bld.sourceDirectories= bld.version=2.1.0 diff --git a/src/bld/java/net/thauvin/erik/MobibotBuild.java b/src/bld/java/net/thauvin/erik/MobibotBuild.java index c95d779..6800ec1 100644 --- a/src/bld/java/net/thauvin/erik/MobibotBuild.java +++ b/src/bld/java/net/thauvin/erik/MobibotBuild.java @@ -76,7 +76,7 @@ public class MobibotBuild extends Project { new Repository("https://jitpack.io"), SONATYPE_SNAPSHOTS_LEGACY); - var log4j = version(2, 24, 2); + var log4j = version(2, 24, 3); var kotlin = version(2, 1, 0); var langchain = version(0, 36, 2); scope(compile) @@ -84,7 +84,7 @@ public class MobibotBuild extends Project { .include(dependency("com.github.pircbotx", "pircbotx", "2.3.1")) // Commons (mostly for PircBotX) .include(dependency("org.apache.commons", "commons-lang3", "3.17.0")) - .include(dependency("org.apache.commons", "commons-text", "1.12.0")) + .include(dependency("org.apache.commons", "commons-text", "1.13.0")) .include(dependency("commons-codec", "commons-codec", "1.17.1")) .include(dependency("commons-net", "commons-net", "3.11.1")) // Google @@ -95,7 +95,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.9.0")) + .include(dependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core", "1.10.1")) .include(dependency("org.jetbrains.kotlinx", "kotlinx-cli-jvm", "0.3.6")) // Logging .include(dependency("org.slf4j", "slf4j-api", "2.0.16")) @@ -113,7 +113,7 @@ public class MobibotBuild extends Project { .include(dependency("net.aksingh", "owm-japis", "2.5.3.0")) .include(dependency("net.objecthunter", "exp4j", "0.4.8")) .include(dependency("org.json", "json", "20240303")) - .include(dependency("org.jsoup", "jsoup", "1.18.2")) + .include(dependency("org.jsoup", "jsoup", "1.18.3")) // Thauvin .include(dependency("net.thauvin.erik", "cryptoprice", "1.0.3-SNAPSHOT")) .include(dependency("net.thauvin.erik", "jokeapi", "0.9.2-SNAPSHOT")) @@ -122,8 +122,8 @@ public class MobibotBuild extends Project { scope(test) .include(dependency("com.willowtreeapps.assertk", "assertk-jvm", version(0, 28, 1))) .include(dependency("org.jetbrains.kotlin", "kotlin-test-junit5", kotlin)) - .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 11, 3))) - .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 11, 3))); + .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 11, 4))) + .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 11, 4))); List jars = new ArrayList<>(); runtimeClasspathJars().forEach(f -> jars.add("./lib/" + f.getName())); @@ -152,9 +152,11 @@ public class MobibotBuild extends Project { @Override public void compile() throws Exception { releaseInfo(); - new CompileKotlinOperation() - .fromProject(this) - .execute(); + var op = new CompileKotlinOperation() + .kotlinHome("/opt/kotlinc/") + .fromProject(this); + op.compileOptions().verbose(true); + op.execute(); } @Override diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Gemini2.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Gemini2.kt index 812aed3..365fe60 100644 --- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Gemini2.kt +++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Gemini2.kt @@ -39,7 +39,6 @@ import org.slf4j.Logger import org.slf4j.LoggerFactory import java.util.* - class Gemini2 : AbstractModule() { private val logger: Logger = LoggerFactory.getLogger(Gemini2::class.java)