Commit 4a9415f6 authored by Eric Bruneton's avatar Eric Bruneton

Switch to Gradle 5.0.

parent 77d7d6aa
Pipeline #3598 passed with stage
in 9 minutes and 2 seconds
image: gradle:4.10.2-jdk8-alpine
image: gradle:5.0-jdk8-alpine
variables:
# Set the location of the dependency cache to a local directory, so that it
......
......@@ -31,8 +31,8 @@ buildscript {
dependencies { classpath 'org.netbeans.tools:sigtest-maven-plugin:1.0' }
}
plugins { id 'biz.aQute.bnd.builder' version '4.0.0' apply false }
plugins { id 'com.github.sherter.google-java-format' version '0.7.1' apply false }
plugins { id 'biz.aQute.bnd.builder' version '4.1.0' apply false }
plugins { id 'com.github.sherter.google-java-format' version '0.8' apply false }
plugins { id 'me.champeau.gradle.jmh' version '0.4.7' apply false }
plugins { id 'org.sonarqube' version '2.6.2' apply false }
......@@ -208,6 +208,7 @@ def jacocoClasses(project) {
// and uploaded to Maven with a POM, sources and Javadoc.
configure(subprojects.findAll { it.provides }) {
// Code coverage configuration.
jacoco.toolVersion = '0.8.1'
jacocoTestReport {
afterEvaluate { classDirectories = jacocoClasses(project) }
}
......@@ -275,7 +276,6 @@ configure(subprojects.findAll { it.provides }) {
if (name != 'asm-test') {
apply plugin: 'biz.aQute.bnd.builder'
jar.dependsOn ':tools:bnd-module-plugin:jar'
jar.bndfile = "${rootDir}/tools/bnd.bnd" // Avoids a Gradle 5.0 warning.
jar.manifest.attributes(
'-classpath': sourceSets.main.output.classesDirs.asPath,
'-plugin': 'org.objectweb.asm.tools.ModuleInfoBndPlugin;',
......@@ -421,4 +421,3 @@ configure(subprojects.findAll { it.provides }) {
}
}
}
......@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-bin.zip
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment