From a5021509036042f48fb0b79afc52e296620eb547 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 2 Nov 2018 17:35:02 -0700 Subject: [PATCH] Updated dependencies. --- build.gradle | 12 ++++++------ examples/java/build.gradle | 6 +++--- examples/kotlin/build.gradle.kts | 12 ++++++------ kobalt/src/Build.kt | 5 +++-- 4 files changed, 18 insertions(+), 17 deletions(-) diff --git a/build.gradle b/build.gradle index 1818ab9..459e421 100644 --- a/build.gradle +++ b/build.gradle @@ -1,11 +1,10 @@ plugins { id 'java' id 'maven-publish' - id "com.jfrog.bintray" version "1.8.3" + id "com.jfrog.bintray" version "1.8.4" id "com.github.ben-manes.versions" version "0.20.0" - id "net.thauvin.erik.gradle.semver" version "0.9.5-beta" - id "com.github.spotbugs" version "1.6.2" - id "net.ltgt.errorprone" version "0.0.14" + id "net.thauvin.erik.gradle.semver" version "0.9.8-beta" + id "com.github.spotbugs" version "1.6.5" } @@ -39,7 +38,7 @@ repositories { dependencies { compile 'com.github.spullara.mustache.java:compiler:0.9.5' - spotbugsPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.7.1' + compileOnly 'com.github.spotbugs:spotbugs-annotations:3.1.8' testCompile 'org.testng:testng:6.14.3' } @@ -149,6 +148,7 @@ tasks.withType(SpotBugsTask) { } excludeFilter = file("$projectDir/config/spotbugs/excludeFilter.xml") } + compileJava { options.compilerArgs.add('-proc:none') } @@ -183,4 +183,4 @@ task pandoc(type: Exec) { ext.output = { return standardOutput.toString() } -} \ No newline at end of file +} diff --git a/examples/java/build.gradle b/examples/java/build.gradle index 78c81a4..031d82e 100644 --- a/examples/java/build.gradle +++ b/examples/java/build.gradle @@ -5,12 +5,12 @@ apply plugin: 'application' defaultTasks 'run' -def semverProcessor = 'net.thauvin.erik:semver:1.0.1' +def semverProcessor = 'net.thauvin.erik:semver:1.1.0-beta' sourceCompatibility = 1.8 targetCompatibility = 1.8 -compileJava.options.annotationProcessorGeneratedSourcesDirectory = file("${projectDir}/src/generated") +compileJava.options.annotationProcessorGeneratedSourcesDirectory = file("${projectDir}/src/generated/java") mainClassName = 'com.example.Example' @@ -22,4 +22,4 @@ repositories { dependencies { annotationProcessor semverProcessor compileOnly semverProcessor -} \ No newline at end of file +} diff --git a/examples/kotlin/build.gradle.kts b/examples/kotlin/build.gradle.kts index cfaca3a..86bc0e2 100644 --- a/examples/kotlin/build.gradle.kts +++ b/examples/kotlin/build.gradle.kts @@ -1,7 +1,7 @@ plugins { - kotlin("jvm") version "1.2.50" + kotlin("jvm") version "1.3.0" application - id("org.jetbrains.kotlin.kapt") version "1.2.50" + id("org.jetbrains.kotlin.kapt") version "1.3.0" } // ./gradlew @@ -10,7 +10,7 @@ plugins { defaultTasks(ApplicationPlugin.TASK_RUN_NAME) -var semverProcessor = "net.thauvin.erik:semver:1.0.1" +var semverProcessor = "net.thauvin.erik:semver:1.1.0-beta" dependencies { kapt(semverProcessor) @@ -29,8 +29,8 @@ application { } tasks { - val runJava by creating(JavaExec::class) { + register("runJava", JavaExec::class) { main = "com.example.Example" - classpath = java.sourceSets["main"].runtimeClasspath + classpath = sourceSets["main"].runtimeClasspath } -} \ No newline at end of file +} diff --git a/kobalt/src/Build.kt b/kobalt/src/Build.kt index f0c3b06..34c9ad8 100644 --- a/kobalt/src/Build.kt +++ b/kobalt/src/Build.kt @@ -75,10 +75,11 @@ val semver = project { dependencies { compile("com.github.spullara.mustache.java:compiler:0.9.5") compileOnly("org.jetbrains.kotlin:kotlin-stdlib:1.2.10") + compileOnly("com.github.spotbugs:spotbugs-annotations:3.1.8") } dependenciesTest { - compile("org.testng:testng:6.13.1") + compile("org.testng:testng:6.14.3") } javaCompiler { @@ -137,4 +138,4 @@ val semver = project { pom2xml { } -} \ No newline at end of file +}