erik/mobibot
erik/mobibot
1
1
Fork 0
Code Issues Releases Activity

Updated dependencies

Browse source
This commit is contained in:
Erik C. Thauvin 2023-09-01 15:29:45 -07:00
parent 2313d36584
commit c99debd740
12 changed files with 43 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -67,7 +67,6 @@ dist/
ehthumbs.db ehthumbs.db
fabric.properties fabric.properties
gen/ gen/
gradle.properties
hs_err_pid* hs_err_pid*
kobaltBuild kobaltBuild
kobaltw*-test kobaltw*-test

35
.idea/codeStyles/Project.xml generated
View file

@ -1,11 +1,17 @@
<component name="ProjectCodeStyleConfiguration"> <component name="ProjectCodeStyleConfiguration">
<code_scheme name="Project" version="173"> <code_scheme name="Project" version="200">
<JetCodeStyleSettings> <JetCodeStyleSettings>
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" /> <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
</JetCodeStyleSettings> </JetCodeStyleSettings>
<codeStyleSettings language="JAVA"> <codeStyleSettings language="JAVA">
<option name="IF_BRACE_FORCE" value="1" /> <option name="IF_BRACE_FORCE" value="1" />
<arrangement> <arrangement>
<groups>
<group>
<type>OVERRIDDEN_METHODS</type>
<order>BY_NAME</order>
</group>
</groups>
<rules> <rules>
<section> <section>
<rule> <rule>
@ -17,6 +23,7 @@
<STATIC>true</STATIC> <STATIC>true</STATIC>
</AND> </AND>
</match> </match>
<order>BY_NAME</order>
</rule> </rule>
</section> </section>
<section> <section>
@ -29,6 +36,7 @@
<STATIC>true</STATIC> <STATIC>true</STATIC>
</AND> </AND>
</match> </match>
<order>BY_NAME</order>
</rule> </rule>
</section> </section>
<section> <section>
@ -41,6 +49,7 @@
<STATIC>true</STATIC> <STATIC>true</STATIC>
</AND> </AND>
</match> </match>
<order>BY_NAME</order>
</rule> </rule>
</section> </section>
<section> <section>
@ -53,6 +62,7 @@
<STATIC>true</STATIC> <STATIC>true</STATIC>
</AND> </AND>
</match> </match>
<order>BY_NAME</order>
</rule> </rule>
</section> </section>
<section> <section>
@ -64,6 +74,7 @@
<STATIC>true</STATIC> <STATIC>true</STATIC>
</AND> </AND>
</match> </match>
<order>BY_NAME</order>
</rule> </rule>
</section> </section>
<section> <section>
@ -73,8 +84,10 @@
<FIELD>true</FIELD> <FIELD>true</FIELD>
<PROTECTED>true</PROTECTED> <PROTECTED>true</PROTECTED>
<STATIC>true</STATIC> <STATIC>true</STATIC>
<visibility />
</AND> </AND>
</match> </match>
<order>BY_NAME</order>
</rule> </rule>
</section> </section>
<section> <section>
@ -86,6 +99,7 @@
<STATIC>true</STATIC> <STATIC>true</STATIC>
</AND> </AND>
</match> </match>
<order>BY_NAME</order>
</rule> </rule>
</section> </section>
<section> <section>
@ -97,6 +111,7 @@
<STATIC>true</STATIC> <STATIC>true</STATIC>
</AND> </AND>
</match> </match>
<order>BY_NAME</order>
</rule> </rule>
</section> </section>
<section> <section>
@ -118,6 +133,7 @@
<PUBLIC>true</PUBLIC> <PUBLIC>true</PUBLIC>
</AND> </AND>
</match> </match>
<order>BY_NAME</order>
</rule> </rule>
</section> </section>
<section> <section>
@ -129,6 +145,7 @@
<PROTECTED>true</PROTECTED> <PROTECTED>true</PROTECTED>
</AND> </AND>
</match> </match>
<order>BY_NAME</order>
</rule> </rule>
</section> </section>
<section> <section>
@ -140,6 +157,7 @@
<PACKAGE_PRIVATE>true</PACKAGE_PRIVATE> <PACKAGE_PRIVATE>true</PACKAGE_PRIVATE>
</AND> </AND>
</match> </match>
<order>BY_NAME</order>
</rule> </rule>
</section> </section>
<section> <section>
@ -151,6 +169,7 @@
<PRIVATE>true</PRIVATE> <PRIVATE>true</PRIVATE>
</AND> </AND>
</match> </match>
<order>BY_NAME</order>
</rule> </rule>
</section> </section>
<section> <section>
@ -161,6 +180,7 @@
<PUBLIC>true</PUBLIC> <PUBLIC>true</PUBLIC>
</AND> </AND>
</match> </match>
<order>BY_NAME</order>
</rule> </rule>
</section> </section>
<section> <section>
@ -171,6 +191,7 @@
<PROTECTED>true</PROTECTED> <PROTECTED>true</PROTECTED>
</AND> </AND>
</match> </match>
<order>BY_NAME</order>
</rule> </rule>
</section> </section>
<section> <section>
@ -195,21 +216,12 @@
<order>BY_NAME</order> <order>BY_NAME</order>
</rule> </rule>
</section> </section>
<section>
<rule>
<match>
<AND>
<FIELD>true</FIELD>
<PRIVATE>false</PRIVATE>
</AND>
</match>
</rule>
</section>
<section> <section>
<rule> <rule>
<match> <match>
<FIELD>true</FIELD> <FIELD>true</FIELD>
</match> </match>
<order>BY_NAME</order>
</rule> </rule>
</section> </section>
<section> <section>
@ -234,6 +246,7 @@
<STATIC>true</STATIC> <STATIC>true</STATIC>
</AND> </AND>
</match> </match>
<order>BY_NAME</order>
</rule> </rule>
</section> </section>
<section> <section>

1
.idea/codeStyles/codeStyleConfig.xml generated
View file

@ -1,5 +1,6 @@
<component name="ProjectCodeStyleConfiguration"> <component name="ProjectCodeStyleConfiguration">
<state> <state>
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
<option name="PREFERRED_PROJECT_CODE_STYLE" value="Erik's Code Style" /> <option name="PREFERRED_PROJECT_CODE_STYLE" value="Erik's Code Style" />
</state> </state>
</component> </component>

1
.idea/misc.xml generated
View file

@ -1,4 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" /> <component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="FrameworkDetectionExcludesConfiguration"> <component name="FrameworkDetectionExcludesConfiguration">

18
build.gradle
View file

@ -7,13 +7,13 @@ plugins {
id 'application' id 'application'
id 'com.github.ben-manes.versions' version '0.47.0' id 'com.github.ben-manes.versions' version '0.47.0'
id 'idea' id 'idea'
id 'io.gitlab.arturbosch.detekt' version '1.23.0' id 'io.gitlab.arturbosch.detekt' version '1.23.1'
id 'java' id 'java'
id 'net.thauvin.erik.gradle.semver' version '1.0.4' id 'net.thauvin.erik.gradle.semver' version '1.0.4'
id 'org.jetbrains.kotlin.jvm' version '1.9.0' id 'org.jetbrains.kotlin.jvm' version '1.9.10'
id 'org.jetbrains.kotlin.kapt' version '1.9.0' id 'org.jetbrains.kotlin.kapt' version '1.9.10'
id 'org.jetbrains.kotlinx.kover' version '0.7.2' id 'org.jetbrains.kotlinx.kover' version '0.7.3'
id 'org.sonarqube' version '4.2.1.3168' id 'org.sonarqube' version '4.3.1.3277'
id 'pmd' id 'pmd'
} }
@ -54,20 +54,20 @@ dependencies {
// implementation fileTree(dir: 'lib', include: '*.jar') // implementation fileTree(dir: 'lib', include: '*.jar')
// Commons (mostly for PircBotX) // Commons (mostly for PircBotX)
implementation 'org.apache.commons:commons-lang3:3.12.0' implementation 'org.apache.commons:commons-lang3:3.13.0'
implementation 'org.apache.commons:commons-text:1.10.0' implementation 'org.apache.commons:commons-text:1.10.0'
implementation 'commons-codec:commons-codec:1.16.0' implementation 'commons-codec:commons-codec:1.16.0'
implementation 'commons-net:commons-net:3.9.0' implementation 'commons-net:commons-net:3.9.0'
// Google // Google
implementation 'com.google.code.gson:gson:2.10.1' implementation 'com.google.code.gson:gson:2.10.1'
implementation 'com.google.guava:guava:32.1.1-jre' implementation 'com.google.guava:guava:32.1.2-jre'
// Kotlin // Kotlin
implementation platform('org.jetbrains.kotlin:kotlin-bom') implementation platform('org.jetbrains.kotlin:kotlin-bom')
implementation 'org.jetbrains.kotlin:kotlin-stdlib' implementation 'org.jetbrains.kotlin:kotlin-stdlib'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.2' implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3'
implementation 'org.jetbrains.kotlinx:kotlinx-cli:0.3.5' implementation 'org.jetbrains.kotlinx:kotlinx-cli:0.3.6'
// Logging // Logging
implementation 'org.slf4j:slf4j-api:2.0.7' implementation 'org.slf4j:slf4j-api:2.0.7'

0
gradle.properties Normal file
View file

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View file

Binary file not shown.

2
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
networkTimeout=10000 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME

3
gradlew vendored
View file

@ -83,7 +83,8 @@ done
# This is normally unused # This is normally unused
# shellcheck disable=SC2034 # shellcheck disable=SC2034
APP_BASE_NAME=${0##*/} APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
# Use the maximum available, or set MAX_FD != -1 to use that value. # Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum MAX_FD=maximum

4
src/main/kotlin/net/thauvin/erik/mobibot/modules/Joke.kt
View file

@ -32,7 +32,7 @@ package net.thauvin.erik.mobibot.modules
import net.thauvin.erik.jokeapi.exceptions.HttpErrorException import net.thauvin.erik.jokeapi.exceptions.HttpErrorException
import net.thauvin.erik.jokeapi.exceptions.JokeException import net.thauvin.erik.jokeapi.exceptions.JokeException
import net.thauvin.erik.jokeapi.getJoke import net.thauvin.erik.jokeapi.joke
import net.thauvin.erik.jokeapi.models.Type import net.thauvin.erik.jokeapi.models.Type
import net.thauvin.erik.mobibot.Utils.bot import net.thauvin.erik.mobibot.Utils.bot
import net.thauvin.erik.mobibot.Utils.colorize import net.thauvin.erik.mobibot.Utils.colorize
@ -83,7 +83,7 @@ class Joke : AbstractModule() {
@Throws(ModuleException::class) @Throws(ModuleException::class)
fun randomJoke(): List<Message> { fun randomJoke(): List<Message> {
return try { return try {
val joke = getJoke(safe = true, type = Type.SINGLE, splitNewLine = true) val joke = joke(safe = true, type = Type.SINGLE, splitNewLine = true)
joke.joke.map { PublicMessage(it, Colors.CYAN) } joke.joke.map { PublicMessage(it, Colors.CYAN) }
} catch (e: JokeException) { } catch (e: JokeException) {
throw ModuleException("randomJoke(): ${e.additionalInfo}", e.message, e) throw ModuleException("randomJoke(): ${e.additionalInfo}", e.message, e)

2
src/test/kotlin/net/thauvin/erik/mobibot/modules/CryptoPricesTest.kt
View file

@ -72,7 +72,7 @@ class CryptoPricesTest {
@Test(groups = ["modules"]) @Test(groups = ["modules"])
fun testGetCurrencyName() { fun testGetCurrencyName() {
assertThat(getCurrencyName("USD"), "USD").isEqualTo("US Dollar") assertThat(getCurrencyName("USD"), "USD").isEqualTo("United States Dollar")
assertThat(getCurrencyName("EUR"), "EUR").isEqualTo("Euro") assertThat(getCurrencyName("EUR"), "EUR").isEqualTo("Euro")
} }
} }

6
version.properties
View file

@ -1,9 +1,9 @@
#Generated by the Semver Plugin for Gradle #Generated by the Semver Plugin for Gradle
#Thu Jul 06 10:21:40 PDT 2023 #Fri Sep 01 15:28:31 PDT 2023
version.buildmeta=20230706102140 version.buildmeta=20230901152831
version.major=0 version.major=0
version.minor=8 version.minor=8
version.patch=0 version.patch=0
version.prerelease=rc version.prerelease=rc
version.project=mobibot version.project=mobibot
version.semver=0.8.0-rc+20230706102140 version.semver=0.8.0-rc+20230901152831