Updated dependencides for Java 14.

This commit is contained in:
Erik C. Thauvin 2020-03-18 15:25:41 -07:00
parent 17aa4f4bd6
commit acc7c42112
11 changed files with 90 additions and 78 deletions

View file

@ -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'