diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 0000000..d91f848
--- /dev/null
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/copyright/Erik_s_Copyright_Notice.xml b/.idea/copyright/Erik_s_Copyright_Notice.xml
new file mode 100644
index 0000000..b9f5293
--- /dev/null
+++ b/.idea/copyright/Erik_s_Copyright_Notice.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
new file mode 100644
index 0000000..1419e40
--- /dev/null
+++ b/.idea/copyright/profiles_settings.xml
@@ -0,0 +1,3 @@
+
+
+
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
new file mode 100644
index 0000000..dc2dcae
--- /dev/null
+++ b/.idea/inspectionProfiles/profiles_settings.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 21062cd..52412b4 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 ee01481..b51eeda 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 b44442f..81ea0b8 100644
--- a/.idea/modules/mobibot.main.iml
+++ b/.idea/modules/mobibot.main.iml
@@ -1,5 +1,40 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -15,7 +50,7 @@
-
+
diff --git a/.idea/modules/mobibot.test.iml b/.idea/modules/mobibot.test.iml
index 9b82227..e065203 100644
--- a/.idea/modules/mobibot.test.iml
+++ b/.idea/modules/mobibot.test.iml
@@ -1,5 +1,46 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -27,7 +68,7 @@
-
+
diff --git a/README.md b/README.md
index 7e3e3d6..4b2ed1c 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[](http://opensource.org/licenses/BSD-3-Clause) [](https://snyk.io/test/github/ethauvin/mobibot?targetFile=build.gradle) [](https://travis-ci.org/ethauvin/mobibot) [](https://circleci.com/gh/ethauvin/mobibot/tree/master)
+[](http://opensource.org/licenses/BSD-3-Clause) [](https://snyk.io/test/github/ethauvin/mobibot?targetFile=build.gradle) [](https://travis-ci.com/ethauvin/mobibot) [](https://circleci.com/gh/ethauvin/mobibot/tree/master)
Some very basic instructions:
@@ -24,4 +24,4 @@ Some very basic instructions:
{ launch }
/usr/bin/nohup java -jar mobibot.jar &
-```
\ No newline at end of file
+```
diff --git a/build.gradle b/build.gradle
index b7a400e..46d3c27 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,14 +1,16 @@
plugins {
- id 'checkstyle'
id 'application'
+ id 'checkstyle'
+ id 'com.github.ben-manes.versions' version '0.28.0'
+ id 'com.github.spotbugs' version '4.0.4'
id 'idea'
+ id 'io.gitlab.arturbosch.detekt' version '1.7.0-beta2'
id 'jacoco'
id 'java'
+ id 'net.thauvin.erik.gradle.semver' version '1.0.4'
+ id 'org.jetbrains.kotlin.jvm' version '1.3.70'
+ id 'org.sonarqube' version '2.8'
id 'pmd'
- id "com.github.ben-manes.versions" version "0.28.0"
- id "com.github.spotbugs" version "4.0.4"
- id "net.thauvin.erik.gradle.semver" version "1.0.4"
- id "org.sonarqube" version "2.8"
}
import com.github.spotbugs.snom.SpotBugsTask
@@ -25,7 +27,7 @@ ext {
versions = [
kotlin : '1.3.70',
log4j : '2.13.1',
- spotbugs : '4.0.0'
+ spotbugs : '4.0.1'
]
}
@@ -62,7 +64,7 @@ dependencies {
implementation 'net.thauvin.erik:pinboard-poster:1.0.1'
implementation 'net.aksingh:owm-japis:2.5.3.0'
- // Override own-japis dependencies with newer version of Kotlin
+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$versions.kotlin"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$versions.kotlin"
@@ -102,6 +104,10 @@ pmd {
consoleOutput = true
}
+detekt {
+ baseline = file("detekt-baseline.xml")
+}
+
tasks.withType(JavaCompile) {
options.encoding = 'UTF-8'
options.annotationProcessorGeneratedSourcesDirectory = file("${projectDir}/src/generated/java")
@@ -151,6 +157,10 @@ sonarqube {
}
}
+jacoco {
+ toolVersion = '0.8.5'
+}
+
jacocoTestReport {
reports {
html.enabled = true
@@ -194,7 +204,7 @@ task deploy(dependsOn: ['clean', 'build', 'jar']) {
mustRunAfter clean
}
-task release(dependsOn: ['wrapper', 'clean', 'deploy']) {
+task release(dependsOn: ['wrapper', 'deploy']) {
group = 'Publishing'
description = 'Releases new version.'
}
diff --git a/detekt-baseline.xml b/detekt-baseline.xml
new file mode 100644
index 0000000..fee5cbc
--- /dev/null
+++ b/detekt-baseline.xml
@@ -0,0 +1,37 @@
+
+
+
+
+
+
+
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 6b63449..5f7d5c4 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,37 @@
-#Wed Mar 18 14:49:13 PDT 2020
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-rc-3-all.zip
+#
+# gradle-wrapper.properties
+#
+# Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# Redistributions of source code must retain the above copyright notice, this
+# list of conditions and the following disclaimer.
+#
+# Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+#
+# Neither the name of this project nor the names of its contributors may be
+# used to endorse or promote products derived from this software without
+# specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-rc-3-bin.zip
zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists