Compare commits

...

7 commits

Author SHA1 Message Date
700369d7c9
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
2024-12-21 06:59:40 -08:00
64bd5c92af
Don't clean/delete deploy dir if not there 2024-11-27 22:32:12 -08:00
83b4b18be7
Added pom-root command 2024-11-27 22:29:31 -08:00
f27501634c
Ensured HttpUrlConnection is properly disconnected 2024-11-27 22:26:46 -08:00
fcbfe63aee
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
2024-11-27 22:24:45 -08:00
4b908d596e
Converted deploy script to fish 2024-09-18 20:38:04 -07:00
97e1e5e73b
Bumped Kotlin Coroutines to version 1.9.0 2024-09-18 20:28:58 -07:00
10 changed files with 73 additions and 46 deletions

View file

@ -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

16
.idea/kotlinc.xml generated Normal file
View file

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Kotlin2JsCompilerArguments">
<option name="moduleKind" value="plain" />
</component>
<component name="Kotlin2JvmCompilerArguments">
<option name="jvmTarget" value="17" />
</component>
<component name="KotlinCommonCompilerArguments">
<option name="apiVersion" value="2.0" />
<option name="languageVersion" value="2.0" />
</component>
<component name="KotlinJpsPluginSettings">
<option name="version" value="2.1.0" />
</component>
</project>

View file

@ -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)

11
deploy.fish Executable file
View file

@ -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

View file

@ -1,11 +0,0 @@
#!/bin/bash
./bld clean jar deploy
[ $? -eq 0 ] && sftp nix4.thauvin.us <<EOF
cd /home/mobibot/mobitopia/mobibot
lcd deploy
put *.jar
cd lib
rm *.jar
put lib/*.jar
EOF

View file

@ -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

View file

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>net.thauvin.erik.mobibot</groupId>
<artifactId>mobibot</artifactId>
<version>0.8.0-rc+20240908192921</version>
<version>0.8.0-rc+20240918181213</version>
<name>mobibot</name>
<description></description>
<url></url>
@ -78,7 +78,7 @@
<dependency>
<groupId>org.jetbrains.kotlinx</groupId>
<artifactId>kotlinx-coroutines-core</artifactId>
<version>1.8.1</version>
<version>1.9.0</version>
<scope>compile</scope>
</dependency>
<dependency>

View file

@ -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;
@ -77,15 +76,15 @@ 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, 3);
var kotlin = version(2, 1, 0);
var langchain = version(0, 36, 2);
scope(compile)
// PircBotX
.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
@ -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.10.1"))
.include(dependency("org.jetbrains.kotlinx", "kotlinx-cli-jvm", "0.3.6"))
// Logging
.include(dependency("org.slf4j", "slf4j-api", "2.0.16"))
@ -114,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.3"))
// 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, 4)))
.include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 11, 4)));
List<String> jars = new ArrayList<>();
runtimeClasspathJars().forEach(f -> jars.add("./lib/" + f.getName()));
@ -142,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();
}
@ -150,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
@ -201,6 +205,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()
@ -212,10 +222,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"));
}
}

View file

@ -421,14 +421,22 @@ object Utils {
@Throws(IOException::class)
fun URL.reader(): UrlReaderResponse {
val connection = this.openConnection() as HttpURLConnection
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() })
UrlReaderResponse(
connection.responseCode,
connection.inputStream.bufferedReader().use { it.readText() })
} else {
UrlReaderResponse(connection.responseCode, connection.errorStream.bufferedReader().use { it.readText() })
UrlReaderResponse(
connection.responseCode,
connection.errorStream.bufferedReader().use { it.readText() })
}
} finally {
connection.disconnect()
}
}

View file

@ -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)