diff --git a/.idea/compiler.xml b/.idea/compiler.xml index bec3928..a87304a 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -21,10 +21,6 @@ - - - - - + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 52412b4..c88ae8f 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,5 +6,5 @@ - + \ No newline at end of file diff --git a/.idea/mobibot.iml b/.idea/mobibot.iml index 771bd41..6dcb7d2 100644 --- a/.idea/mobibot.iml +++ b/.idea/mobibot.iml @@ -1,6 +1,6 @@ - - + + diff --git a/.idea/modules/mobibot.main.iml b/.idea/modules/mobibot.main.iml index 6f0fcd0..b3165e0 100644 --- a/.idea/modules/mobibot.main.iml +++ b/.idea/modules/mobibot.main.iml @@ -1,17 +1,18 @@ - + - + - + @@ -59,7 +60,7 @@ - + diff --git a/.idea/modules/mobibot.test.iml b/.idea/modules/mobibot.test.iml index cfdf045..a9fac3b 100644 --- a/.idea/modules/mobibot.test.iml +++ b/.idea/modules/mobibot.test.iml @@ -1,5 +1,5 @@ - + @@ -8,7 +8,7 @@ - + @@ -60,7 +60,7 @@ - + diff --git a/build.gradle b/build.gradle index 6c69e9e..a42e6de 100644 --- a/build.gradle +++ b/build.gradle @@ -4,11 +4,11 @@ plugins { id 'com.github.ben-manes.versions' version '0.28.0' id 'com.github.spotbugs' version '4.0.5' id 'idea' - id 'io.gitlab.arturbosch.detekt' version '1.7.2' + id 'io.gitlab.arturbosch.detekt' version '1.7.4' id 'jacoco' id 'java' id 'net.thauvin.erik.gradle.semver' version '1.0.4' - id 'org.jetbrains.kotlin.jvm' version '1.3.71' + id 'org.jetbrains.kotlin.jvm' version '1.3.72' id 'org.sonarqube' version '2.8' id 'pmd' } @@ -21,13 +21,11 @@ final def semverProcessor = "net.thauvin.erik:semver:1.2.0" mainClassName = packageName + '.Mobibot' -ext { - versions = [ - kotlin : '1.3.71', - log4j : '2.13.1', - spotbugs : '4.0.1' - ] -} +ext.versions = [ + kotlin : '1.3.72', + log4j : '2.13.1', + spotbugs: '4.0.1' +] repositories { mavenLocal() @@ -51,7 +49,7 @@ dependencies { implementation 'commons-cli:commons-cli:1.4' implementation 'commons-net:commons-net:3.6' - implementation 'com.squareup.okhttp3:okhttp:4.5.0-RC1' + implementation 'com.squareup.okhttp3:okhttp:4.5.0' implementation 'com.rometools:rome:1.12.2' @@ -125,7 +123,7 @@ tasks.withType(io.gitlab.arturbosch.detekt.Detekt) { tasks.withType(JavaCompile) { options.encoding = 'UTF-8' options.annotationProcessorGeneratedSourcesDirectory = file("${projectDir}/src/generated/java") - options.compilerArgs += [ "-Asemver.project.dir=$projectDir" ] + options.compilerArgs += ["-Asemver.project.dir=$projectDir"] } compileJava { diff --git a/detekt-baseline.xml b/detekt-baseline.xml index 8af6eed..6f5dcde 100644 --- a/detekt-baseline.xml +++ b/detekt-baseline.xml @@ -13,6 +13,7 @@ MagicNumber:Recap.kt$Recap.Companion$10 MagicNumber:UrlMgr.kt$UrlMgr$1000L MagicNumber:UrlMgr.kt$UrlMgr$60L + MagicNumber:Users.kt$Users$8 MagicNumber:View.kt$View$8 NestedBlockDepth:Comment.kt$Comment$commandResponse NestedBlockDepth:UrlMgr.kt$UrlMgr$commandResponse diff --git a/licenses/LICENSE.txt b/licenses/LICENSE.txt index 4efe703..37785b0 100644 --- a/licenses/LICENSE.txt +++ b/licenses/LICENSE.txt @@ -1,4 +1,4 @@ -Copyright (c) 2004-2019, Erik C. Thauvin (erik@thauvin.net) +Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net) All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java b/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java index 00d806e..2836f6f 100644 --- a/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java +++ b/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java @@ -14,13 +14,13 @@ import java.time.*; public final class ReleaseInfo { public static final String PROJECT = "mobibot"; public static final LocalDateTime BUILDDATE = - LocalDateTime.ofInstant(Instant.ofEpochMilli(1585467573570L), ZoneId.systemDefault()); + LocalDateTime.ofInstant(Instant.ofEpochMilli(1587078052972L), ZoneId.systemDefault()); public static final int MAJOR = 0; public static final int MINOR = 8; public static final int PATCH = 0; public static final String PRERELEASE = "alpha"; - public static final String BUILDMETA = "105"; - public static final String VERSION = "0.8.0-alpha+105"; + public static final String BUILDMETA = "294"; + public static final String VERSION = "0.8.0-alpha+294"; /** * Disables the default constructor. diff --git a/version.properties b/version.properties index 3f02b34..6e5c59b 100644 --- a/version.properties +++ b/version.properties @@ -1,9 +1,9 @@ #Generated by the Semver Plugin for Gradle -#Sun Mar 29 00:39:32 PDT 2020 -version.buildmeta=105 +#Thu Apr 16 16:00:41 PDT 2020 +version.buildmeta=294 version.major=0 version.minor=8 version.patch=0 version.prerelease=alpha version.project=mobibot -version.semver=0.8.0-alpha+105 +version.semver=0.8.0-alpha+294