Compare commits

...

5 commits

5 changed files with 12 additions and 10 deletions

View file

@ -2,12 +2,12 @@
<library name="bld"> <library name="bld">
<CLASSES> <CLASSES>
<root url="file://$PROJECT_DIR$/lib/bld" /> <root url="file://$PROJECT_DIR$/lib/bld" />
<root url="jar://$USER_HOME$/.bld/dist/bld-1.9.0.jar!/" /> <root url="jar://$USER_HOME$/.bld/dist/bld-1.9.1.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES> <SOURCES>
<root url="file://$PROJECT_DIR$/lib/bld" /> <root url="file://$PROJECT_DIR$/lib/bld" />
<root url="jar://$USER_HOME$/.bld/dist/bld-1.9.0-sources.jar!/" /> <root url="jar://$USER_HOME$/.bld/dist/bld-1.9.1-sources.jar!/" />
</SOURCES> </SOURCES>
<excluded> <excluded>
<root url="jar://$PROJECT_DIR$/lib/bld/bld-wrapper.jar!/" /> <root url="jar://$PROJECT_DIR$/lib/bld/bld-wrapper.jar!/" />

View file

@ -1,8 +1,8 @@
# mobibot # mobibot
[![License (3-Clause BSD)](https://img.shields.io/badge/license-BSD%203--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause) [![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.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) [![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) [![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) [![CircleCI](https://circleci.com/gh/ethauvin/mobibot/tree/master.svg?style=shield)](https://circleci.com/gh/ethauvin/mobibot/tree/master)

Binary file not shown.

View file

@ -2,9 +2,9 @@ bld.downloadExtensionJavadoc=false
bld.downloadExtensionSources=true bld.downloadExtensionSources=true
bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.5 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=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.extensions-detekt=com.uwyn.rife2:bld-detekt:0.9.4-SNAPSHOT
bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
bld.downloadLocation= bld.downloadLocation=
bld.sourceDirectories= bld.sourceDirectories=
bld.version=1.9.0 bld.version=1.9.1

View file

@ -58,6 +58,7 @@ import static rife.bld.dependencies.Scope.test;
public class MobibotBuild extends Project { public class MobibotBuild extends Project {
private static final String DETEKT_BASELINE = "config/detekt/baseline.xml"; private static final String DETEKT_BASELINE = "config/detekt/baseline.xml";
final File srcMainKotlin = new File(srcMainDirectory(), "kotlin");
public MobibotBuild() { public MobibotBuild() {
pkg = "net.thauvin.erik.mobibot"; pkg = "net.thauvin.erik.mobibot";
@ -77,18 +78,18 @@ public class MobibotBuild extends Project {
SONATYPE_SNAPSHOTS_LEGACY); SONATYPE_SNAPSHOTS_LEGACY);
var log4j = version(2, 23, 1); var log4j = version(2, 23, 1);
var kotlin = version(1, 9, 23); var kotlin = version(1, 9, 24);
scope(compile) scope(compile)
// PircBotX // PircBotX
.include(dependency("com.github.pircbotx", "pircbotx", "2.3.1")) .include(dependency("com.github.pircbotx", "pircbotx", "2.3.1"))
// Commons (mostly for PircBotX) // Commons (mostly for PircBotX)
.include(dependency("org.apache.commons", "commons-lang3", "3.14.0")) .include(dependency("org.apache.commons", "commons-lang3", "3.14.0"))
.include(dependency("org.apache.commons", "commons-text", "1.12.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")) .include(dependency("commons-net", "commons-net", "3.10.0"))
// Google // Google
.include(dependency("com.google.code.gson", "gson", "2.10.1")) .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")) .include(dependency("com.google.cloud", "google-cloud-vertexai", "1.2.0"))
// Kotlin // Kotlin
.include(dependency("org.jetbrains.kotlin", "kotlin-stdlib", kotlin)) .include(dependency("org.jetbrains.kotlin", "kotlin-stdlib", kotlin))
@ -124,7 +125,7 @@ public class MobibotBuild extends Project {
.manifestAttribute(Attributes.Name.MAIN_CLASS, mainClass()) .manifestAttribute(Attributes.Name.MAIN_CLASS, mainClass())
.manifestAttribute(Attributes.Name.CLASS_PATH, ". " + String.join(" ", jars)); .manifestAttribute(Attributes.Name.CLASS_PATH, ". " + String.join(" ", jars));
jarSourcesOperation().sourceDirectories(new File(srcMainDirectory(), "kotlin")); jarSourcesOperation().sourceDirectories(srcMainKotlin);
} }
public static void main(String[] args) { public static void main(String[] args) {
@ -182,6 +183,7 @@ public class MobibotBuild extends Project {
public void jacoco() throws IOException { public void jacoco() throws IOException {
new JacocoReportOperation() new JacocoReportOperation()
.fromProject(this) .fromProject(this)
.sourceFiles(srcMainKotlin)
.execute(); .execute();
} }