Merge pull request #392 from functionaljava/auto-mod-name

jbgi · web-flow · commit de992c38122e · 2019-11-03T15:14:23.000+01:00
Basic JPMS (modules) support through 'Automatic-Module-Name'
diff --git 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"}"
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -169,9 +169,10 @@ configure(subprojects.findAll { it.name != "props-core" }) {`
`169`	`169`	`instruction 'Signature-Version', project.fjVersion`
`170`	`170`	`instruction 'Bundle-ActivationPolicy', 'lazy'`
`171`	`171`	`instruction 'Bundle-Vendor', 'functionaljava.org'`
`172`		`- if(project.name != "core") {`
`173`		`- instruction 'Require-Bundle', 'org.functionaljava;bundle-version="'+project.fjBaseVersion+'"'`
`174`		`- }`
	`172`	`+ if(project.name != "core") {`
	`173`	`+ instruction 'Require-Bundle', 'org.functionaljava;bundle-version="'+project.fjBaseVersion+'"'`
	`174`	`+ }`
	`175`	`+ instruction 'Automatic-Module-Name', "functionaljava${project.name == 'core' ? '' : ".$project.name"}"`
`175`	`176`	`}`
`176`	`177`	`}`
`177`	`178`