This is an automated email from the git hooks/post-receive script. seamlik-guest pushed a commit to branch master in repository bnd.
commit b1cbb5f8b74f82fa0875e1e057768a65c2ee75e1 Author: Kai-Chung Yan (殷啟聰) <[email protected]> Date: Fri Nov 4 22:50:24 2016 +0800 Transition to Gradle 3.1 --- debian/bootstrap.xml | 2 +- debian/patches/series | 1 + debian/patches/transition_Gradle_3.1.patch | 40 ++++++++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 1 deletion(-) diff --git a/debian/bootstrap.xml b/debian/bootstrap.xml index b136d1c..d1d3e8f 100644 --- a/debian/bootstrap.xml +++ b/debian/bootstrap.xml @@ -31,7 +31,7 @@ <!-- Build the Gradle plugin --> <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpath="/usr/share/java/groovy-all.jar"/> - <groovyc srcdir="biz.aQute.bnd.gradle/src" destdir="bootstrap/build" classpath="bootstrap/build:/usr/share/java/gradle-core.jar"></groovyc> + <groovyc srcdir="biz.aQute.bnd.gradle/src" destdir="bootstrap/build" classpath="bootstrap/build:/usr/share/java/slf4j-api.jar:/usr/share/java/gradle-base-services.jar:/usr/share/java/gradle-base-services-groovy.jar:/usr/share/java/gradle-process-services.jar:/usr/share/java/gradle-core.jar:/usr/share/java/gradle-logging.jar"></groovyc> <jar destfile="bootstrap/bnd.jar"> <fileset dir="bootstrap/build/"/> diff --git a/debian/patches/series b/debian/patches/series index 63b0db0..b9ec3aa 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -12,3 +12,4 @@ use-bootstrapped-gradle-plugin.patch remove-recursion-in-macro-warning.patch reproducible-timestamps.patch reproducible-packages-list.patch +transition_Gradle_3.1.patch diff --git a/debian/patches/transition_Gradle_3.1.patch b/debian/patches/transition_Gradle_3.1.patch new file mode 100644 index 0000000..e03cb71 --- /dev/null +++ b/debian/patches/transition_Gradle_3.1.patch @@ -0,0 +1,40 @@ +Description: Transition to Gradle 3.1 +Author: Kai-Chung Yan (殷啟聰) +Lst-Update: 2016-11-04 +--- a/biz.aQute.bnd.gradle/src/aQute/bnd/gradle/BndPlugin.groovy ++++ b/biz.aQute.bnd.gradle/src/aQute/bnd/gradle/BndPlugin.groovy +@@ -57,7 +57,6 @@ + } + this.preCompileRefresh = project.hasProperty('bnd_preCompileRefresh') ? parseBoolean(bnd_preCompileRefresh) : false + extensions.create('bnd', BndProperties, bndProject) +- bnd.ext.project = bndProject + convention.plugins.bnd = new BndPluginConvention(this) + + buildDir = relativePath(bndProject.targetDir) +@@ -100,7 +99,7 @@ + output.classesDir = output.resourcesDir = relativePath(bndProject.testOutput) + } + } +- bnd.ext.allSrcDirs = files(bndProject.allsourcepath) ++ bnd.allSrcDirs = files(bndProject.allsourcepath) + /* Set up compile tasks */ + sourceCompatibility = bnd('javac.source', sourceCompatibility) + def javacTarget = bnd('javac.target', targetCompatibility) +--- a/biz.aQute.bnd.gradle/src/aQute/bnd/gradle/BndProperties.groovy ++++ b/biz.aQute.bnd.gradle/src/aQute/bnd/gradle/BndProperties.groovy +@@ -9,6 +9,7 @@ + + class BndProperties { + private final bndProject ++ public allSrcDirs + BndProperties(bndProject) { + this.bndProject = bndProject + } +@@ -36,4 +37,7 @@ + } + return value + } ++ def getProject() { ++ bndProject ++ } + } -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/bnd.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
