From 8aa4dcbcce42fb44196994620cfafa6ae3f96cf7 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 9 Feb 2024 16:48:31 -0800 Subject: [PATCH 1/2] Bumped Google Cloud VertexAI dependency to 0.4.0 --- src/bld/java/net/thauvin/erik/MobibotBuild.java | 2 +- src/main/kotlin/net/thauvin/erik/mobibot/ReleaseInfo.kt | 4 ++-- src/main/kotlin/net/thauvin/erik/mobibot/modules/Gemini.kt | 6 +++--- 3 files 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 3977d27..c1d5baa 100644 --- a/src/bld/java/net/thauvin/erik/MobibotBuild.java +++ b/src/bld/java/net/thauvin/erik/MobibotBuild.java @@ -85,7 +85,7 @@ public class MobibotBuild extends Project { // Google .include(dependency("com.google.code.gson", "gson", "2.10.1")) .include(dependency("com.google.guava", "guava", "33.0.0-jre")) - .include(dependency("com.google.cloud", "google-cloud-vertexai", version(0, 3, 0))) + .include(dependency("com.google.cloud", "google-cloud-vertexai", version(0, 4, 0))) // Kotlin .include(dependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core", "1.7.3")) .include(dependency("org.jetbrains.kotlinx", "kotlinx-cli-jvm", "0.3.6")) diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/ReleaseInfo.kt b/src/main/kotlin/net/thauvin/erik/mobibot/ReleaseInfo.kt index 72ba96c..a4d58f3 100644 --- a/src/main/kotlin/net/thauvin/erik/mobibot/ReleaseInfo.kt +++ b/src/main/kotlin/net/thauvin/erik/mobibot/ReleaseInfo.kt @@ -14,12 +14,12 @@ import java.time.ZoneId */ object ReleaseInfo { const val PROJECT = "mobibot" - const val VERSION = "0.8.0-rc+20240209010856" + const val VERSION = "0.8.0-rc+20240209164526" @JvmField @Suppress("MagicNumber") val BUILD_DATE: LocalDateTime = LocalDateTime.ofInstant( - Instant.ofEpochMilli(1707469736725L), ZoneId.systemDefault() + Instant.ofEpochMilli(1707525927076L), ZoneId.systemDefault() ) const val WEBSITE = "https://mobitopia.org/mobibot/" diff --git a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Gemini.kt b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Gemini.kt index 18db66d..b1a2c83 100644 --- a/src/main/kotlin/net/thauvin/erik/mobibot/modules/Gemini.kt +++ b/src/main/kotlin/net/thauvin/erik/mobibot/modules/Gemini.kt @@ -33,9 +33,9 @@ package net.thauvin.erik.mobibot.modules import com.google.cloud.vertexai.VertexAI import com.google.cloud.vertexai.api.GenerationConfig -import com.google.cloud.vertexai.generativeai.preview.ChatSession -import com.google.cloud.vertexai.generativeai.preview.GenerativeModel -import com.google.cloud.vertexai.generativeai.preview.ResponseHandler +import com.google.cloud.vertexai.generativeai.ChatSession +import com.google.cloud.vertexai.generativeai.GenerativeModel +import com.google.cloud.vertexai.generativeai.ResponseHandler import net.thauvin.erik.mobibot.Utils import net.thauvin.erik.mobibot.Utils.sendMessage import org.pircbotx.hooks.types.GenericMessageEvent From 0d37c7b15250c5da643a5dc4fcb6462abcaaa12f Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Sun, 25 Feb 2024 21:24:16 -0800 Subject: [PATCH 2/2] Added the Snyk custom POM --- snyx.xml | 11 +++++++++++ src/bld/java/net/thauvin/erik/MobibotBuild.java | 14 +++++++++++--- 2 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 snyx.xml diff --git a/snyx.xml b/snyx.xml new file mode 100644 index 0000000..8a129a6 --- /dev/null +++ b/snyx.xml @@ -0,0 +1,11 @@ + + + 4.0.0 + + + + + + + diff --git a/src/bld/java/net/thauvin/erik/MobibotBuild.java b/src/bld/java/net/thauvin/erik/MobibotBuild.java index c1d5baa..1f72ddf 100644 --- a/src/bld/java/net/thauvin/erik/MobibotBuild.java +++ b/src/bld/java/net/thauvin/erik/MobibotBuild.java @@ -39,11 +39,13 @@ import rife.bld.extension.DetektOperation; import rife.bld.extension.GeneratedVersionOperation; import rife.bld.extension.JacocoReportOperation; import rife.bld.operations.exceptions.ExitStatusException; +import rife.bld.publish.PomBuilder; import rife.tools.FileUtils; 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; @@ -72,7 +74,7 @@ public class MobibotBuild extends Project { new Repository("https://jitpack.io"), SONATYPE_SNAPSHOTS_LEGACY); - var log4j = version(2, 22, 1); + var log4j = version(2, 23, 0); var kotlin = version(1, 9, 22); scope(compile) // PircBotX @@ -85,9 +87,9 @@ public class MobibotBuild extends Project { // Google .include(dependency("com.google.code.gson", "gson", "2.10.1")) .include(dependency("com.google.guava", "guava", "33.0.0-jre")) - .include(dependency("com.google.cloud", "google-cloud-vertexai", version(0, 4, 0))) + .include(dependency("com.google.cloud", "google-cloud-vertexai", version(0, 5, 0))) // Kotlin - .include(dependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core", "1.7.3")) + .include(dependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core", "1.8.0")) .include(dependency("org.jetbrains.kotlinx", "kotlinx-cli-jvm", "0.3.6")) // Logging .include(dependency("org.slf4j", "slf4j-api", "2.0.12")) @@ -191,4 +193,10 @@ public class MobibotBuild extends Project { .extension(".kt") .execute(); } + + @BuildCommand(value = "snyk-pom", summary = "Generates the Snyk POM") + public void snykPom() throws FileUtilsErrorException { + PomBuilder.generateInto(publishOperation().info(), publishOperation().dependencies(), + Path.of(workDirectory.getPath(), "snyx.xml").toFile()); + } }