updated gradle wrappter to version 4, made compatibility changes in build file

pull/3/head
Stefan Feuerhahn 8 years ago
parent 0fb4083d38
commit c3a4868140

@ -5,14 +5,12 @@ buildscript {
} }
} }
dependencies { dependencies {
classpath "net.saliman:gradle-cobertura-plugin:2.2.8"
classpath group: "org.asciidoctor", name: "asciidoctorj-pdf", version: "1.5.0-alpha.11" classpath group: "org.asciidoctor", name: "asciidoctorj-pdf", version: "1.5.0-alpha.11"
classpath "biz.aQute.bnd:biz.aQute.bnd.gradle:3.0.0" classpath "biz.aQute.bnd:biz.aQute.bnd.gradle:3.0.0"
} }
} }
plugins { plugins {
id "org.sonarqube" version "1.0"
id "org.asciidoctor.convert" version "1.5.3" id "org.asciidoctor.convert" version "1.5.3"
} }
@ -46,7 +44,6 @@ configure(javaProjects) {
apply plugin: "osgi" apply plugin: "osgi"
apply plugin: "maven" apply plugin: "maven"
apply plugin: "signing" apply plugin: "signing"
apply plugin: "net.saliman.cobertura"
apply plugin: "biz.aQute.bnd.builder" apply plugin: "biz.aQute.bnd.builder"
uploadArchives.enabled = false uploadArchives.enabled = false
@ -85,29 +82,6 @@ configure(javaProjects) {
} }
} }
cobertura {
dependencies {
testCompile "org.slf4j:slf4j-simple:1.6.1"
}
coverageFormats = ["html", "xml"]
coverageIgnoreTrivial = true
coverageIgnores = ["org.slf4j.Logger.*"]
coverageReportDir = new File("$buildDir/reports/cobertura")
coverageTestTasks {
project.tasks.withType(Test).matching {it.name == "test"}
}
}
sonarqube {
properties {
property "sonar.exclusions", "src/main/java-gen/**/*,**/app/**/*"
property "sonar.java.coveragePlugin", "cobertura"
property "sonar.cobertura.reportPath", "build/reports/cobertura/coverage.xml"
}
}
task jarAll(type: Copy) { task jarAll(type: Copy) {
dependsOn(configurations.default.getAllArtifacts().getBuildDependencies()) dependsOn(configurations.default.getAllArtifacts().getBuildDependencies())

Binary file not shown.

@ -1,6 +1,6 @@
#Tue Apr 25 13:05:33 CEST 2017 #Wed Jul 19 14:47:51 CEST 2017
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-4.0.1-bin.zip

6
gradlew vendored

@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
# Use the maximum available, or set MAX_FD != -1 to use that value. # Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum" MAX_FD="maximum"
warn ( ) { warn () {
echo "$*" echo "$*"
} }
die ( ) { die () {
echo echo
echo "$*" echo "$*"
echo echo
@ -155,7 +155,7 @@ if $cygwin ; then
fi fi
# Escape application args # Escape application args
save ( ) { save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " " echo " "
} }

Loading…
Cancel
Save