Updated pf4j library to the newest version.

Fixed compliation errors.
Added "copyPlugins" gradle task which copies all plugins into the proper directory.

diff --git a/demo_gradle/.gitignore b/demo_gradle/.gitignore
index 91ea7410d8977ededc4a968849a65b194e570976..ad93baf416f774fbf4b0be8e9f0274acc63681aa 100644 (file)
--- a/demo_gradle/.gitignore
+++ b/demo_gradle/.gitignore
@@ -1,2 +1,4 @@
 build
 .gradle
+.idea
+app/plugins/

diff --git a/demo_gradle/app/build.gradle b/demo_gradle/app/build.gradle
index c349034e5a8ab4ef81694b4abf5918def66cf0dc..029779d640213171711af9f05e7815e9ab8bf49d 100644 (file)
--- a/demo_gradle/app/build.gradle
+++ b/demo_gradle/app/build.gradle
@@ -4,7 +4,7 @@ mainClassName = 'ro.fortsoft.pf4j.demo.Boot'
 
 dependencies {
   compile project(':api')
-  compile 'ro.fortsoft.pf4j:pf4j:0.4'
+  compile 'ro.fortsoft.pf4j:pf4j:1.1.1'
   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'

diff --git a/demo_gradle/build.gradle b/demo_gradle/build.gradle
index 51cbce54f93b836ff8001b4d4e1a11271fcd1605..d2537c1bf420341c0cb2ffe83494950c232126e8 100644 (file)
--- a/demo_gradle/build.gradle
+++ b/demo_gradle/build.gradle
@@ -5,9 +5,20 @@ subprojects {
     mavenLocal()
     mavenCentral()
   }
+}
 
+task copyPlugins() << {
+  delete 'app/plugins'
+  mkdir 'app/plugins'
 
-  task wrapper(type: Wrapper) {
-      gradleVersion = '1.11'
+  subprojects.each { p ->
+    if (p.path.contains(":plugins/")) {
+      System.out.println("Copying plugin from " +  p.path);
+      copy {
+        from p.projectDir.toString() + '/build/libs'
+        into 'app/plugins'
+        include '*.zip'
+      }
+    }
   }
-}
\ No newline at end of file
+}

diff --git a/demo_gradle/plugins/plugin1/build.gradle b/demo_gradle/plugins/plugin1/build.gradle
index 24403c27de3ea6509262a6ae871f6bf0922366a3..6a9dd89bc11798d1513094d2c657f2e240116596 100644 (file)
--- a/demo_gradle/plugins/plugin1/build.gradle
+++ b/demo_gradle/plugins/plugin1/build.gradle
@@ -4,7 +4,7 @@ jar {
   manifest {
     attributes 'Plugin-Class' : 'ro.fortsoft.pf4j.demo.welcome.WelcomePlugin',
       'Plugin-Id' : 'WelcomePlugin',
-      'Plugin-Version' : '1.0',
+      'Plugin-Version' : '1.0.0',
       'Plugin-Provider' : 'Decebal Suiu'
   }
 }
@@ -24,7 +24,7 @@ assemble.dependsOn plugin
 
 dependencies {
   compile project(':api')
-  compile 'ro.fortsoft.pf4j:pf4j:0.4'
+  compile 'ro.fortsoft.pf4j:pf4j:1.1.1'
   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
index 7dee83d0deebb7456616d21d09759a4e5254f813..4e380d59034eb422dfa86286811a61161ac2b6c9 100644 (file)
--- a/demo_gradle/plugins/plugin2/build.gradle
+++ b/demo_gradle/plugins/plugin2/build.gradle
@@ -2,9 +2,9 @@ jar {
   baseName = 'HelloPlugin'
   version = '0.1.0'
   manifest {
-    attributes 'Plugin-Class' : 'ro.fortsoft.pf4j.demo.welcome.HelloPlugin',
+    attributes 'Plugin-Class' : 'ro.fortsoft.pf4j.demo.hello.HelloPlugin',
       'Plugin-Id' : 'HelloPlugin',
-      'Plugin-Version' : '1.0',
+      'Plugin-Version' : '1.0.0',
       'Plugin-Provider' : 'Decebal Suiu'
   }
 }
@@ -24,7 +24,7 @@ assemble.dependsOn plugin
 
 dependencies {
   compile project(':api')
-  compile 'ro.fortsoft.pf4j:pf4j:0.4'
+  compile 'ro.fortsoft.pf4j:pf4j:1.1.1'
   compile 'org.apache.commons:commons-lang3:3.0'
   testCompile group: 'junit', name: 'junit', version: '4.+'
 }