diff --git a/.circleci/config.yml b/.circleci/config.yml
index b6d9624..a20eb37 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,3 +1,4 @@
+version: 2
defaults: &defaults
working_directory: ~/repo
environment:
@@ -28,14 +29,12 @@ defaults_gradle: &defaults_gradle
- store_test_results:
path: build/reports/
-version: 2.0
-
jobs:
build_gradle_jdk12:
<<: *defaults
docker:
- - image: circleci/openjdk:11-jdk
+ - image: openjdk:12-jdk
<<: *defaults_gradle
diff --git a/build.gradle b/build.gradle
index cf21967..6598a14 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,10 +5,10 @@ plugins {
id 'jacoco'
id 'java'
id 'pmd'
- id "com.github.ben-manes.versions" version "0.25.0"
- id "com.github.spotbugs" version "2.0.0"
+ id "com.github.ben-manes.versions" version "0.27.0"
+ id "com.github.spotbugs" version "3.0.0"
id "net.thauvin.erik.gradle.semver" version "1.0.4"
- id "org.sonarqube" version "2.7.1"
+ id "org.sonarqube" version "2.8"
}
@@ -24,9 +24,9 @@ mainClassName = packageName + '.Mobibot'
ext {
versions = [
- kotlin : '1.3.50',
- log4j : '2.12.1',
- spotbugs_annotations : '4.0.0-beta3'
+ kotlin : '1.3.61',
+ log4j : '2.13.0',
+ spotbugs : '4.0.0-RC3'
]
}
@@ -47,15 +47,16 @@ dependencies {
compile "org.apache.logging.log4j:log4j-core:$versions.log4j"
compile "org.apache.logging.log4j:log4j-slf4j-impl:$versions.log4j"
+ compile 'org.apache.commons:commons-lang3:3.9'
compile 'commons-cli:commons-cli:1.4'
compile 'commons-net:commons-net:3.6'
- compile 'com.squareup.okhttp3:okhttp:4.2.0'
+ compile 'com.squareup.okhttp3:okhttp:4.3.1'
- compile 'com.rometools:rome:1.12.1'
+ compile 'com.rometools:rome:1.12.2'
compile 'org.json:json:20190722'
- compile 'org.jsoup:jsoup:1.12.1'
+ compile 'org.jsoup:jsoup:1.12.2'
compile 'net.objecthunter:exp4j:0.4.8'
compile 'org.twitter4j:twitter4j-core:4.0.7'
@@ -66,14 +67,14 @@ dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$versions.kotlin"
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$versions.kotlin"
- testImplementation 'org.testng:testng:7.0.0'
- testImplementation 'org.assertj:assertj-core:3.13.2'
+ testImplementation 'org.testng:testng:7.1.1'
+ testImplementation 'org.assertj:assertj-core:3.15.0'
- spotbugsPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.9.0'
- spotbugsPlugins 'com.mebigfatguy.sb-contrib:sb-contrib:7.4.6'
+ spotbugsPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.10.1'
+ spotbugsPlugins 'com.mebigfatguy.sb-contrib:sb-contrib:7.4.7'
- compileOnly "com.github.spotbugs:spotbugs-annotations:$versions.spotbugs_annotations"
- testCompileOnly "com.github.spotbugs:spotbugs-annotations:$versions.spotbugs_annotations"
+ compileOnly "com.github.spotbugs:spotbugs-annotations:$versions.spotbugs"
+ testCompileOnly "com.github.spotbugs:spotbugs-annotations:$versions.spotbugs"
}
test {
@@ -82,9 +83,15 @@ test {
}
}
+spotbugs {
+ toolVersion = versions.spotbugs
+}
+
pmd {
- ruleSetFiles = files("config/pmd.xml")
+ ignoreFailures = true
ruleSets = []
+ ruleSetFiles = files("${projectDir}/config/pmd.xml")
+ consoleOutput = true
}
tasks.withType(JavaCompile) {
diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index c426276..c5f6465 100644
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -32,10 +32,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -49,10 +66,6 @@
-
-
-
-
@@ -245,11 +258,8 @@
-
-
-
@@ -262,6 +272,6 @@
-
+
diff --git a/settings.gradle b/settings.gradle
index 21faf72..48e3810 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,3 +1 @@
-enableFeaturePreview('STABLE_PUBLISHING')
-
rootProject.name = 'mobibot'