Merge pull request #104 from ecumene-software/ecu-gradle-fixes

Fix for issue #103 and added the SLF4 Simple dependency
pf4j · Jun 30, 2016 · 89b598c · 89b598c
2 parents e42154f + e96afce
commit 89b598c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/demo_gradle/app/build.gradle b/demo_gradle/app/build.gradle
@@ -7,6 +7,7 @@ dependencies {
   compile 'ro.fortsoft.pf4j:pf4j:0.4'
   compile 'org.apache.commons:commons-lang3:3.0'
   testCompile group: 'junit', name: 'junit', version: '4.+'
+  compile group: 'org.slf4j', name: 'slf4j-simple', version: '1.6.1'
 }
 
 jar {

diff --git a/demo_gradle/plugins/plugin1/build.gradle b/demo_gradle/plugins/plugin1/build.gradle
@@ -12,14 +12,19 @@ jar {
 task plugin(type: Jar) {
   baseName = 'WelcomePlugin'
   version = '0.1.0'
-  into('classes')
+  into('classes'){
+     with jar
+  }
+  into('lib'){
+    from configurations.compile
+  }
   extension('zip')
-  with jar
 }
+assemble.dependsOn plugin
 
 dependencies {
   compile project(':api')
   compile 'ro.fortsoft.pf4j:pf4j:0.4'
   compile 'org.apache.commons:commons-lang3:3.0'
   testCompile group: 'junit', name: 'junit', version: '4.+'
-}
+}
diff --git a/demo_gradle/plugins/plugin2/build.gradle b/demo_gradle/plugins/plugin2/build.gradle
@@ -12,14 +12,19 @@ jar {
 task plugin(type: Jar) {
   baseName = 'HelloPlugin'
   version = '0.1.0'
-  into('classes')
+  into('classes'){
+     with jar
+  }
+  into('lib'){
+    from configurations.compile
+  }
   extension('zip')
-  with jar
 }
+assemble.dependsOn plugin
 
 dependencies {
   compile project(':api')
   compile 'ro.fortsoft.pf4j:pf4j:0.4'
   compile 'org.apache.commons:commons-lang3:3.0'
   testCompile group: 'junit', name: 'junit', version: '4.+'
-}
+}