diff --git a/build.gradle b/build.gradle index 5d47df2..d89fbb1 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ plugins { id 'pmd' id "com.github.ben-manes.versions" version "0.21.0" id "com.github.spotbugs" version "2.0.0" - id "net.thauvin.erik.gradle.semver" version "1.0.2" + id "net.thauvin.erik.gradle.semver" version "1.0.4" id "org.sonarqube" version "2.7.1" } @@ -21,14 +21,10 @@ final def deployDir = 'deploy' final def semverProcessor = "net.thauvin.erik:semver:1.2.0" mainClassName = packageName + '.Mobibot' -[compileJava, compileTestJava]*.options*.encoding = 'UTF-8' - -compileJava.options.annotationProcessorGeneratedSourcesDirectory = file("${projectDir}/src/generated/java") - ext { - log4j = '2.11.2' - spotbugs_annotations = '4.0.0-beta2' + log4j = '2.12.0' + spotbugs_annotations = '4.0.0-beta3' } repositories { @@ -51,9 +47,9 @@ dependencies { compile 'commons-cli:commons-cli:1.4' compile 'commons-net:commons-net:3.6' - compile 'com.squareup.okhttp3:okhttp:3.14.2' + compile 'com.squareup.okhttp3:okhttp:4.0.1' - compile 'com.rometools:rome:1.12.0' + compile 'com.rometools:rome:1.12.1' compile 'org.json:json:20180813' compile 'org.jsoup:jsoup:1.12.1' @@ -68,7 +64,7 @@ dependencies { testImplementation 'org.assertj:assertj-core:3.12.2' spotbugsPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.9.0' - spotbugsPlugins 'com.mebigfatguy.fb-contrib:fb-contrib:7.4.5' + spotbugsPlugins 'com.mebigfatguy.fb-contrib:fb-contrib:7.4.6' compileOnly "com.github.spotbugs:spotbugs-annotations:$spotbugs_annotations" testCompileOnly "com.github.spotbugs:spotbugs-annotations:$spotbugs_annotations" @@ -85,9 +81,17 @@ pmd { ruleSets = [] } +tasks.withType(JavaCompile) { + options.encoding = 'UTF-8' + options.annotationProcessorGeneratedSourcesDirectory = file("${projectDir}/src/generated/java") + if (JavaVersion.current().isJava12Compatible()) { + options.compilerArgs += [ "-Asemver.project.dir=$projectDir" ] + } +} + compileJava { dependsOn('incrementBuildMeta') - options.compilerArgs += ['-Xlint:unchecked', '-Xlint:deprecation', "-Asemver.project.dir=$projectDir"] + options.compilerArgs += ['-Xlint:unchecked', '-Xlint:deprecation'] } javadoc {