From 540fc40a4f0f0ac6927d264cc13f820bdf9481b8 Mon Sep 17 00:00:00 2001 From: Michael Weinberger Date: Thu, 16 Feb 2017 12:56:46 +0100 Subject: [PATCH] Updated pf4j library to the newest version. Fixed compliation errors. Added "copyPlugins" gradle task which copies all plugins into the proper directory. --- demo_gradle/.gitignore | 2 ++ demo_gradle/app/build.gradle | 2 +- demo_gradle/build.gradle | 17 ++++++++++++++--- demo_gradle/plugins/plugin1/build.gradle | 4 ++-- demo_gradle/plugins/plugin2/build.gradle | 6 +++--- 5 files changed, 22 insertions(+), 9 deletions(-) diff --git a/demo_gradle/.gitignore b/demo_gradle/.gitignore index 91ea741..ad93baf 100644 --- 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 c349034..029779d 100644 --- 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 51cbce5..d2537c1 100644 --- 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 24403c2..6a9dd89 100644 --- 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 7dee83d..4e380d5 100644 --- 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.+' } -- 2.39.5