From 854d1958fffa8dedc56db0a2a2650f591949d983 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Neuville?= Date: Mon, 28 Oct 2019 17:44:16 +0100 Subject: [PATCH 1/3] Basic JPMS (modules) support through 'Automatic-Module-Name' --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index 67d8cd15..91bd5433 100644 --- a/build.gradle +++ b/build.gradle @@ -181,6 +181,7 @@ configure(subprojects.findAll { it.name != "props-core" }) { buildCommand 'org.eclipse.pde.ManifestBuilder' buildCommand 'org.eclipse.pde.SchemaBuilder' } + instruction 'Automatic-Module-Name', "functionaljava${project.name == 'core' ? '' : "-$project.name"}" } // Output MANIFEST.MF statically so eclipse can see it for plugin development From 1fed6abe362ee3a3931b11947570dd76baad9986 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Neuville?= Date: Tue, 29 Oct 2019 12:10:05 +0100 Subject: [PATCH 2/3] Fix previous commit --- build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 91bd5433..2ac9a9c0 100644 --- a/build.gradle +++ b/build.gradle @@ -169,9 +169,10 @@ configure(subprojects.findAll { it.name != "props-core" }) { instruction 'Signature-Version', project.fjVersion instruction 'Bundle-ActivationPolicy', 'lazy' instruction 'Bundle-Vendor', 'functionaljava.org' - if(project.name != "core") { - instruction 'Require-Bundle', 'org.functionaljava;bundle-version="'+project.fjBaseVersion+'"' - } + if(project.name != "core") { + instruction 'Require-Bundle', 'org.functionaljava;bundle-version="'+project.fjBaseVersion+'"' + } + instruction 'Automatic-Module-Name', "functionaljava${project.name == 'core' ? '' : "-$project.name"}" } } @@ -181,7 +182,6 @@ configure(subprojects.findAll { it.name != "props-core" }) { buildCommand 'org.eclipse.pde.ManifestBuilder' buildCommand 'org.eclipse.pde.SchemaBuilder' } - instruction 'Automatic-Module-Name', "functionaljava${project.name == 'core' ? '' : "-$project.name"}" } // Output MANIFEST.MF statically so eclipse can see it for plugin development From 57699342be52381724ac34cf2b867cbd1d4ff407 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Neuville?= Date: Tue, 29 Oct 2019 12:29:34 +0100 Subject: [PATCH 3/3] Dash character isn't allowed in modules names --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 2ac9a9c0..c9d8be40 100644 --- a/build.gradle +++ b/build.gradle @@ -172,7 +172,7 @@ configure(subprojects.findAll { it.name != "props-core" }) { if(project.name != "core") { instruction 'Require-Bundle', 'org.functionaljava;bundle-version="'+project.fjBaseVersion+'"' } - instruction 'Automatic-Module-Name', "functionaljava${project.name == 'core' ? '' : "-$project.name"}" + instruction 'Automatic-Module-Name', "functionaljava${project.name == 'core' ? '' : ".$project.name"}" } }