diff --git a/.idea/mobibot.iml b/.idea/mobibot.iml index 910a915..5d44a1f 100644 --- a/.idea/mobibot.iml +++ b/.idea/mobibot.iml @@ -1,5 +1,5 @@ - + diff --git a/.idea/modules/mobibot.main.iml b/.idea/modules/mobibot.main.iml index 02b91f8..23cf1cb 100644 --- a/.idea/modules/mobibot.main.iml +++ b/.idea/modules/mobibot.main.iml @@ -1,5 +1,5 @@ - + @@ -8,24 +8,24 @@ @@ -48,37 +48,37 @@ + + + - + - + - - - - + + + + + + + + - - - - - - - - + \ No newline at end of file diff --git a/.idea/modules/mobibot.test.iml b/.idea/modules/mobibot.test.iml index f7f2246..28d189b 100644 --- a/.idea/modules/mobibot.test.iml +++ b/.idea/modules/mobibot.test.iml @@ -1,36 +1,38 @@ - + - + - @@ -52,47 +54,43 @@ + + + - + - - - - - - + + - - - - - + - + + + + + - + - - - - + diff --git a/build.gradle b/build.gradle index 270e19b..302e536 100644 --- a/build.gradle +++ b/build.gradle @@ -4,11 +4,11 @@ plugins { id 'com.github.ben-manes.versions' version '0.29.0' id 'com.github.spotbugs' version '4.5.0' id 'idea' - id 'io.gitlab.arturbosch.detekt' version '1.11.0-RC2' + id 'io.gitlab.arturbosch.detekt' version '1.11.0' id 'jacoco' id 'java' id 'net.thauvin.erik.gradle.semver' version '1.0.4' - id 'org.jetbrains.kotlin.jvm' version '1.4.0-rc' + id 'org.jetbrains.kotlin.jvm' version '1.4.0' id 'org.sonarqube' version '3.0' id 'pmd' } @@ -36,6 +36,8 @@ dependencies { annotationProcessor semverProcessor compileOnly semverProcessor + implementation(platform("org.jetbrains.kotlin:kotlin-bom")) + implementation 'pircbot:pircbot:1.5.0' compileOnly 'pircbot:pircbot:1.5.0:sources' @@ -44,11 +46,9 @@ dependencies { implementation "org.apache.logging.log4j:log4j-slf4j-impl:$versions.log4j" implementation 'org.apache.commons:commons-lang3:3.11' - //implementation 'org.apache.commons:commons-text:1.8' implementation 'commons-cli:commons-cli:1.4' implementation 'commons-net:commons-net:3.7' - //implementation 'com.squareup.okhttp3:okhttp:4.7.2' implementation 'com.rometools:rome:1.15.0' @@ -61,7 +61,7 @@ dependencies { implementation 'net.aksingh:owm-japis:2.5.3.0' - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8-1.4.0-rc-218' + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9' testImplementation 'org.testng:testng:7.3.0' testImplementation 'org.assertj:assertj-core:3.16.1' @@ -84,7 +84,18 @@ java { targetCompatibility = JavaVersion.VERSION_11 } -compileKotlin { +tasks.withType(JavaCompile) { + options.encoding = 'UTF-8' + options.annotationProcessorGeneratedSourcesDirectory = file("${projectDir}/src/generated/java") + options.compilerArgs += ["-Asemver.project.dir=$projectDir"] +} + +compileJava { + dependsOn('incrementBuildMeta') + options.compilerArgs += ['-Xlint:unchecked', '-Xlint:deprecation'] +} + +tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach { kotlinOptions { jvmTarget = '11' } @@ -92,14 +103,17 @@ compileKotlin { spotbugs { toolVersion.set("$versions.spotbugs") -} - -tasks.withType(com.github.spotbugs.snom.SpotBugsTask) { - reports { - xml.enabled = true - html.enabled = true - } excludeFilter.set(file("$projectDir/config/spotbugs/excludeFilter.xml")) + tasks.spotbugsMain { + reports.create("html") { + enabled = true + } + } + tasks.spotbugsTest { + reports.create("html") { + enabled = true + } + } } pmd { @@ -111,18 +125,7 @@ pmd { } detekt { - baseline = file("detekt-baseline.xml") -} - -tasks.withType(JavaCompile) { - options.encoding = 'UTF-8' - options.annotationProcessorGeneratedSourcesDirectory = file("${projectDir}/src/generated/java") - options.compilerArgs += ["-Asemver.project.dir=$projectDir"] -} - -compileJava { - dependsOn('incrementBuildMeta') - options.compilerArgs += ['-Xlint:unchecked', '-Xlint:deprecation'] + baseline = file("${projectDir}/config/detekt/baseline.xml") } javadoc { diff --git a/detekt-baseline.xml b/config/detekt/baseline.xml similarity index 100% rename from detekt-baseline.xml rename to config/detekt/baseline.xml diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 62d4c05..e708b1c 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index bb8b2fc..6c9a224 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index fbd7c51..4f906e0 100755 --- a/gradlew +++ b/gradlew @@ -130,7 +130,7 @@ fi if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - + JAVACMD=`cygpath --unix "$JAVACMD"` # We build the pattern for arguments to be converted via cygpath diff --git a/gradlew.bat b/gradlew.bat index 5093609..107acd3 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -54,7 +54,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -64,21 +64,6 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - :execute @rem Setup the command line @@ -86,7 +71,7 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell diff --git a/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java b/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java index f1d555b..e67eedf 100644 --- a/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java +++ b/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java @@ -13,14 +13,14 @@ import java.time.*; */ public final class ReleaseInfo { public static final String PROJECT = "mobibot"; - public static final String VERSION = "0.8.0-beta+085"; + public static final String VERSION = "0.8.0-beta+104"; public static final LocalDateTime BUILDDATE = - LocalDateTime.ofInstant(Instant.ofEpochMilli(1595378887339L), ZoneId.systemDefault()); + LocalDateTime.ofInstant(Instant.ofEpochMilli(1597698016009L), ZoneId.systemDefault()); public static final int MAJOR = 0; public static final int MINOR = 8; public static final int PATCH = 0; - public static final String BUILDMETA = "085"; + public static final String BUILDMETA = "104"; public static final String PRERELEASE = "beta"; public static final String WEBSITE = "https://www.mobitopia.org/mobibot/"; diff --git a/version.properties b/version.properties index beae2a7..c710651 100644 --- a/version.properties +++ b/version.properties @@ -1,9 +1,9 @@ #Generated by the Semver Plugin for Gradle -#Fri Jun 19 18:39:50 PDT 2020 -version.buildmeta=047 +#Mon Aug 17 14:00:15 PDT 2020 +version.buildmeta=104 version.major=0 version.minor=8 version.patch=0 version.prerelease=beta version.project=mobibot -version.semver=0.8.0-beta+047 +version.semver=0.8.0-beta+104