Package: bnd / 2.4.1-6

transition_Gradle_3.1.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
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
+  }
 }