erik/mobibot
erik/mobibot
1
1
Fork 0
Code Issues Releases Activity

Upgraded to Kotlin 1.4.0.

Browse source
This commit is contained in:
Erik C. Thauvin 2020-08-17 14:30:24 -07:00
parent d7bfd70fa9
commit 44de253040
11 changed files with 91 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

53
build.gradle
View file

@ -4,11 +4,11 @@ plugins {
id 'com.github.ben-manes.versions' version '0.29.0'
id 'com.github.spotbugs' version '4.5.0'
id 'idea'
id 'io.gitlab.arturbosch.detekt' version '1.11.0-RC2'
id 'io.gitlab.arturbosch.detekt' version '1.11.0'
id 'jacoco'
id 'java'
id 'net.thauvin.erik.gradle.semver' version '1.0.4'
id 'org.jetbrains.kotlin.jvm' version '1.4.0-rc'
id 'org.jetbrains.kotlin.jvm' version '1.4.0'
id 'org.sonarqube' version '3.0'
id 'pmd'
}
@ -36,6 +36,8 @@ dependencies {
annotationProcessor semverProcessor
compileOnly semverProcessor
implementation(platform("org.jetbrains.kotlin:kotlin-bom"))
implementation 'pircbot:pircbot:1.5.0'
compileOnly 'pircbot:pircbot:1.5.0:sources'
@ -44,11 +46,9 @@ dependencies {
implementation "org.apache.logging.log4j:log4j-slf4j-impl:$versions.log4j"
implementation 'org.apache.commons:commons-lang3:3.11'
//implementation 'org.apache.commons:commons-text:1.8'
implementation 'commons-cli:commons-cli:1.4'
implementation 'commons-net:commons-net:3.7'
//implementation 'com.squareup.okhttp3:okhttp:4.7.2'
implementation 'com.rometools:rome:1.15.0'
@ -61,7 +61,7 @@ dependencies {
implementation 'net.aksingh:owm-japis:2.5.3.0'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8-1.4.0-rc-218'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9'
testImplementation 'org.testng:testng:7.3.0'
testImplementation 'org.assertj:assertj-core:3.16.1'
@ -84,7 +84,18 @@ java {
targetCompatibility = JavaVersion.VERSION_11
}
compileKotlin {
tasks.withType(JavaCompile) {
options.encoding = 'UTF-8'
options.annotationProcessorGeneratedSourcesDirectory = file("${projectDir}/src/generated/java")
options.compilerArgs += ["-Asemver.project.dir=$projectDir"]
}
compileJava {
dependsOn('incrementBuildMeta')
options.compilerArgs += ['-Xlint:unchecked', '-Xlint:deprecation']
}
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
kotlinOptions {
jvmTarget = '11'
}
@ -92,14 +103,17 @@ compileKotlin {
spotbugs {
toolVersion.set("$versions.spotbugs")
}
tasks.withType(com.github.spotbugs.snom.SpotBugsTask) {
reports {
xml.enabled = true
html.enabled = true
}
excludeFilter.set(file("$projectDir/config/spotbugs/excludeFilter.xml"))
tasks.spotbugsMain {
reports.create("html") {
enabled = true
}
}
tasks.spotbugsTest {
reports.create("html") {
enabled = true
}
}
}
pmd {
@ -111,18 +125,7 @@ pmd {
}
detekt {
baseline = file("detekt-baseline.xml")
}
tasks.withType(JavaCompile) {
options.encoding = 'UTF-8'
options.annotationProcessorGeneratedSourcesDirectory = file("${projectDir}/src/generated/java")
options.compilerArgs += ["-Asemver.project.dir=$projectDir"]
}
compileJava {
dependsOn('incrementBuildMeta')
options.compilerArgs += ['-Xlint:unchecked', '-Xlint:deprecation']
baseline = file("${projectDir}/config/detekt/baseline.xml")
}
javadoc {