diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index d0652e5..0ffd2d5 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -12,6 +12,10 @@
-
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 4f4003c..21062cd 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 204a365..ff7c6e0 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 2746ab0..8c73c3a 100644
--- a/.idea/modules/mobibot.main.iml
+++ b/.idea/modules/mobibot.main.iml
@@ -1,6 +1,6 @@
-
-
+
+
@@ -14,34 +14,34 @@
-
-
-
+
+
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
\ No newline at end of file
diff --git a/.idea/modules/mobibot.test.iml b/.idea/modules/mobibot.test.iml
index c6b402b..1811810 100644
--- a/.idea/modules/mobibot.test.iml
+++ b/.idea/modules/mobibot.test.iml
@@ -1,6 +1,6 @@
-
-
+
+
@@ -11,46 +11,50 @@
-
-
-
+
+
+
-
+
-
+
-
-
-
-
+
+
+
+
-
+
-
+
-
+
+
-
-
+
-
-
+
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 04db9d4..1e84027 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,13 +5,13 @@ plugins {
id 'jacoco'
id 'java'
id 'pmd'
- id "com.github.ben-manes.versions" version "0.27.0"
- id "com.github.spotbugs" version "3.0.0"
+ 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.SpotBugsTask
+import com.github.spotbugs.snom.SpotBugsTask
defaultTasks 'deploy'
@@ -23,9 +23,9 @@ mainClassName = packageName + '.Mobibot'
ext {
versions = [
- kotlin : '1.3.61',
- log4j : '2.13.0',
- spotbugs : '4.0.0-RC3'
+ kotlin : '1.3.70',
+ log4j : '2.13.1',
+ spotbugs : '4.0.0'
]
}
@@ -39,34 +39,34 @@ dependencies {
annotationProcessor semverProcessor
compileOnly semverProcessor
- compile 'pircbot:pircbot:1.5.0'
+ implementation 'pircbot:pircbot:1.5.0'
compileOnly 'pircbot:pircbot:1.5.0:sources'
- compile "org.apache.logging.log4j:log4j-api:$versions.log4j"
- compile "org.apache.logging.log4j:log4j-core:$versions.log4j"
- compile "org.apache.logging.log4j:log4j-slf4j-impl:$versions.log4j"
+ implementation "org.apache.logging.log4j:log4j-api:$versions.log4j"
+ implementation "org.apache.logging.log4j:log4j-core:$versions.log4j"
+ implementation "org.apache.logging.log4j:log4j-slf4j-impl:$versions.log4j"
- compile 'org.apache.commons:commons-lang3:3.9'
- compile 'commons-cli:commons-cli:1.4'
+ implementation 'org.apache.commons:commons-lang3:3.9'
+ implementation 'commons-cli:commons-cli:1.4'
- compile 'commons-net:commons-net:3.6'
- compile 'com.squareup.okhttp3:okhttp:4.3.1'
+ implementation 'commons-net:commons-net:3.6'
+ implementation 'com.squareup.okhttp3:okhttp:4.4.1'
- compile 'com.rometools:rome:1.12.2'
+ implementation 'com.rometools:rome:1.12.2'
- compile 'org.json:json:20190722'
- compile 'org.jsoup:jsoup:1.12.2'
- compile 'net.objecthunter:exp4j:0.4.8'
+ implementation 'org.json:json:20190722'
+ implementation 'org.jsoup:jsoup:1.13.1'
+ implementation 'net.objecthunter:exp4j:0.4.8'
- compile 'org.twitter4j:twitter4j-core:4.0.7'
- compile 'net.thauvin.erik:pinboard-poster:1.0.1'
+ implementation 'org.twitter4j:twitter4j-core:4.0.7'
+ implementation 'net.thauvin.erik:pinboard-poster:1.0.1'
- compile 'net.aksingh:owm-japis:2.5.3.0'
+ implementation 'net.aksingh:owm-japis:2.5.3.0'
// Override own-japis dependencies with newer version of Kotlin
- compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$versions.kotlin"
- compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$versions.kotlin"
+ implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$versions.kotlin"
+ implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$versions.kotlin"
- testImplementation 'org.testng:testng:7.1.1'
+ testImplementation 'org.testng:testng:7.2.0'
testImplementation 'org.assertj:assertj-core:3.15.0'
spotbugsPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.10.1'
@@ -78,15 +78,24 @@ dependencies {
test {
useTestNG() {
- suites('src/test/resources/testng.xml')
+ options.suites('src/test/resources/testng.xml')
}
}
spotbugs {
- toolVersion = versions.spotbugs
+ toolVersion.set("$versions.spotbugs")
+}
+
+tasks.withType(SpotBugsTask) {
+ reports {
+ xml.enabled = false
+ html.enabled = true
+ }
+ excludeFilter.set(file("$projectDir/config/spotbugs/excludeFilter.xml"))
}
pmd {
+ toolVersion = '6.22.0'
ignoreFailures = true
ruleSets = []
ruleSetFiles = files("${projectDir}/config/pmd.xml")
@@ -113,7 +122,6 @@ javadoc {
jar {
manifest.attributes('Main-Class': mainClassName,
'Class-Path': '. ./lib/' + configurations.compile.collect { it.getName() }.join(' ./lib/'))
-
archiveVersion.set("")
}
@@ -150,14 +158,6 @@ jacocoTestReport {
}
}
-tasks.withType(SpotBugsTask) {
- reports {
- xml.enabled = false
- html.enabled = true
- }
- excludeFilter = file("$projectDir/config/spotbugs/excludeFilter.xml")
-}
-
tasks.withType(Checkstyle) {
reports {
xml.enabled = false
@@ -176,7 +176,7 @@ task copyToDeploy(type: Copy) {
}
task copyToDeployLib(type: Copy) {
- from(configurations.runtime) {
+ from(configurations.runtimeClasspath) {
exclude 'annotations-*.jar'
}
into deployDir + '/lib'
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index f3d88b1..490fda8 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 1b16c34..6b63449 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Wed Mar 18 14:49:13 PDT 2020
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-rc-3-all.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip
-zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew.bat b/gradlew.bat
index 9618d8d..62bd9b9 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
diff --git a/src/test/resources/testng.xml b/src/test/resources/testng.xml
index 544049c..0486058 100644
--- a/src/test/resources/testng.xml
+++ b/src/test/resources/testng.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/version.properties b/version.properties
index b18aedb..a198481 100644
--- a/version.properties
+++ b/version.properties
@@ -1,9 +1,9 @@
#Generated by the Semver Plugin for Gradle
-#Tue Mar 17 18:30:32 PDT 2020
-version.buildmeta=566
+#Wed Mar 18 15:07:49 PDT 2020
+version.buildmeta=574
version.major=0
version.minor=7
version.patch=3
version.prerelease=beta
version.project=mobibot
-version.semver=0.7.3-beta+566
+version.semver=0.7.3-beta+574