diff options
| -rw-r--r-- | build.gradle | 2 | ||||
| -rw-r--r-- | gradle/buildscript.gradle | 15 | ||||
| -rw-r--r-- | gradle/check.gradle | 7 | ||||
| -rw-r--r-- | gradle/convention.gradle | 21 | ||||
| -rw-r--r-- | gradle/github.gradle | 11 |
5 files changed, 38 insertions, 18 deletions
diff --git a/build.gradle b/build.gradle index 0f0d31e..c69b70a 100644 --- a/build.gradle +++ b/build.gradle @@ -18,8 +18,6 @@ dependencies { compile 'org.apache.ant:ant:1.7.0' compile 'com.github.zafarkhaja:java-semver:0.8.0' - runtime 'org.slf4j:slf4j-simple:1.7.7' - testCompile 'com.google.guava:guava:18.0' } diff --git a/gradle/buildscript.gradle b/gradle/buildscript.gradle index 50a1d9c..5b32f4e 100644 --- a/gradle/buildscript.gradle +++ b/gradle/buildscript.gradle @@ -1,19 +1,22 @@ // Executed in context of buildscript repositories { // mavenLocal() + // maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' } mavenCentral() - // jcenter() + jcenter() } dependencies { classpath 'nl.javadude.gradle.plugins:license-gradle-plugin:0.10.0' // classpath 'com.mapvine:gradle-cobertura-plugin:0.1' - classpath "net.saliman:gradle-cobertura-plugin:2.2.5" + classpath 'net.saliman:gradle-cobertura-plugin:2.2.5' // classpath 'gradle-release:gradle-release:1.1.5' - classpath 'org.ajoberstar:gradle-git:0.12.0' - classpath 'net.ltgt.gradle:gradle-errorprone-plugin:0.0.5' - classpath('com.netflix.nebula:gradle-info-plugin:1.12.5') { + classpath 'org.ajoberstar:gradle-git:1.0.0' + // classpath 'net.ltgt.gradle:gradle-errorprone-plugin:0.0.5' + classpath('com.netflix.nebula:gradle-info-plugin:2.2.0') { exclude group: 'com.perforce' } - classpath 'com.bmuschko:gradle-nexus-plugin:2.2' + classpath 'com.bmuschko:gradle-nexus-plugin:2.3.1' + classpath 'be.insaneprogramming.gradle:animalsniffer-gradle-plugin:1.4.0' + classpath 'com.github.ben-manes:gradle-versions-plugin:0.8' } diff --git a/gradle/check.gradle b/gradle/check.gradle index ad1f9fc..50bceae 100644 --- a/gradle/check.gradle +++ b/gradle/check.gradle @@ -27,3 +27,10 @@ } } } + + apply plugin: "be.insaneprogramming.gradle.animalsniffer" + animalsniffer { + signature = "org.codehaus.mojo.signature:java15:+@signature" + // ignores = ["my.package.name"] + // annotations = [] // supported annotations to signal Animal Sniffer to ignore annotated elements + } diff --git a/gradle/convention.gradle b/gradle/convention.gradle index d0ed864..abda03e 100644 --- a/gradle/convention.gradle +++ b/gradle/convention.gradle @@ -1,6 +1,7 @@ apply plugin: 'java' // Plugin as major conventions - apply plugin: 'errorprone' + // apply plugin: 'errorprone' apply plugin: 'info' + apply plugin: 'com.github.ben-manes.versions' sourceCompatibility = 1.5 @@ -15,11 +16,11 @@ dependencies { compile 'com.google.code.findbugs:jsr305:2.0.2' - compile 'org.slf4j:slf4j-api:1.7.7' + compile 'org.slf4j:slf4j-api:1.7.12' - testCompile 'junit:junit:4.11' + testCompile 'junit:junit:4.12' - testRuntime 'org.slf4j:slf4j-simple:1.7.7' + testRuntime 'ch.qos.logback:logback-classic:1.1.3' } tasks.withType(JavaCompile) { @@ -27,9 +28,14 @@ } javadoc { - options.links "http://docs.oracle.com/javase/7/docs/api/", - "http://docs.oracle.com/javaee/7/api/", - "http://docs.guava-libraries.googlecode.com/git/javadoc/" + if (!gradle.startParameter.offline) + options.links "http://docs.oracle.com/javase/7/docs/api/", + "http://docs.oracle.com/javaee/7/api/", + "http://docs.guava-libraries.googlecode.com/git/javadoc/" + + if (false) + if (JavaVersion.current().isJava8Compatible()) + options.addStringOption('Xdoclint:none', '-quiet') } test { @@ -60,6 +66,7 @@ apply plugin: 'build-announcements' apply plugin: 'build-dashboard' +apply plugin: 'project-report' // Generate wrapper, which is distributed as part of source to alleviate the need of installing gradle wrapper { diff --git a/gradle/github.gradle b/gradle/github.gradle index 64a8fee..4a6f935 100644 --- a/gradle/github.gradle +++ b/gradle/github.gradle @@ -8,9 +8,14 @@ def docTasks = [:] def docTask = task "aggregate${shortName.capitalize()}"(type: docClass, description: "Aggregate subproject ${shortName}s") { source = allSources destinationDir = file("${project.buildDir}/docs/${shortName}") - options.links "http://docs.oracle.com/javase/7/docs/api/", - "http://docs.oracle.com/javaee/7/api/", - "http://docs.guava-libraries.googlecode.com/git/javadoc/" + if (delegate.hasProperty('options')) { // Groovydoc has no options + options.links "http://docs.oracle.com/javase/7/docs/api/", + "http://docs.oracle.com/javaee/7/api/", + "http://docs.guava-libraries.googlecode.com/git/javadoc/" + options.linkSource true + if (JavaVersion.current().isJava8Compatible()) + options.addStringOption('Xdoclint:none', '-quiet') + } doFirst { def classpaths = allprojects.findAll { it.plugins.hasPlugin(JavaPlugin) }.collect { it.sourceSets.main.compileClasspath } classpath = files(classpaths) |