@@ -65,17 +65,17 @@ jar.doFirst {
6565
6666jar. manifest {
6767 attributes (
68- ' Bundle-Description' : " ${ project.description} " ,
69- ' Bundle-DocURL' : " https://${ project.git_url} " ,
70- ' Bundle-License' : " https://${ project.git_url} /blob/v${ version} /LICENSE" ,
71- ' Bundle-ManifestVersion' : " ${ osgi_manifest_ver} " ,
72- ' Bundle-SymbolicName' : " ${ project.group} .${ project.name} " ,
73- ' Bundle-Vendor' : " ${ project.org} " ,
74- ' Bundle-Version' : " ${ project.version} " ,
75- ' Export-Package' : " matlabcontrol;version=\" ${ project.version} \" ,matlabcontrol.demo;version=\" ${ project.version} \" ,matlabcontrol.extensions;uses:=matlabcontrol;version=\" ${ project.version} \" ,matlabcontrol.internal;version=\" ${ project.version} \" ,matlabcontrol.link;uses:=matlabcontrol;version=\" ${ project.version} \" " ,
76- ' Main-Class' : ' matlabcontrol.demo.DemoMain' ,
77- ' Require-Capability' : ' osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.7))"'
78- )
68+ ' Bundle-Description' : " ${ project.description} " ,
69+ ' Bundle-DocURL' : " https://${ project.git_url} " ,
70+ ' Bundle-License' : " https://${ project.git_url} /blob/v${ version} /LICENSE" ,
71+ ' Bundle-ManifestVersion' : " ${ osgi_manifest_ver} " ,
72+ ' Bundle-SymbolicName' : " ${ project.group} .${ project.name} " ,
73+ ' Bundle-Vendor' : " ${ project.org} " ,
74+ ' Bundle-Version' : " ${ project.version} " ,
75+ ' Export-Package' : " matlabcontrol;version=\" ${ project.version} \" ,matlabcontrol.demo;version=\" ${ project.version} \" ,matlabcontrol.extensions;uses:=matlabcontrol;version=\" ${ project.version} \" ,matlabcontrol.internal;version=\" ${ project.version} \" ,matlabcontrol.link;uses:=matlabcontrol;version=\" ${ project.version} \" " ,
76+ ' Main-Class' : ' matlabcontrol.demo.DemoMain' ,
77+ ' Require-Capability' : ' osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.7))"'
78+ )
7979}
8080
8181// //////////
@@ -114,13 +114,12 @@ task unzipJRE6(dependsOn: verifyJRE6, type: Copy) {
114114 into JDK6_DIR
115115}
116116
117- // Best bet is to stay at 1.6
118- sourceCompatibility = 1.6
119- targetCompatibility = 1.6
120- def sep = System . getProperty(' path.separator' )
121- def bootClasspathStr = project. files(" ${ JRE6_HOME} /lib/rt.jar${ sep}${ JRE6_HOME} /lib/jsse.jar" )
117+ // Best bet is to stay at 1.6, but Java 11+ requires 1.8 minimum
118+ sourceCompatibility = 1.8
119+ targetCompatibility = 1.8
120+ def bootClasspathFiles = project. files(" ${ JRE6_HOME} /lib/rt.jar" , " ${ JRE6_HOME} /lib/jsse.jar" )
122121project. tasks. withType(AbstractCompile , { AbstractCompile ac ->
123- ac. options. bootstrapClasspath = bootClasspathStr // options is always there but not defined on AbstractCompile so going to hit it anyway
122+ ac. options. bootstrapClasspath = bootClasspathFiles // options is always there but not defined on AbstractCompile so going to hit it anyway
124123 ac. dependsOn(unzipJRE6)
125124})
126125
@@ -140,17 +139,17 @@ task sourcesJar(type: Jar) {
140139 exclude(JMI_STUB )
141140 manifest {
142141 attributes (
143- ' Bundle-Description' : " ${ project.description} " ,
144- ' Bundle-DocURL' : " https://${ project.git_url} " ,
145- ' Bundle-License' : " https://${ project.git_url} /blob/v${ version} /LICENSE" ,
146- ' Bundle-ManifestVersion' : " ${ osgi_manifest_ver} " ,
147- ' Bundle-SymbolicName' : " ${ project.group} .${ project.name} " ,
148- ' Bundle-Vendor' : " ${ project.org} " ,
149- ' Bundle-Version' : " ${ project.version} " ,
150- ' Export-Package' : " matlabcontrol;version=\" ${ project.version} \" ,matlabcontrol.demo;version=\" ${ project.version} \" ,matlabcontrol.extensions;uses:=matlabcontrol;version=\" ${ project.version} \" ,matlabcontrol.internal;version=\" ${ project.version} \" ,matlabcontrol.link;uses:=matlabcontrol;version=\" ${ project.version} \" " ,
151- ' Main-Class' : ' matlabcontrol.demo.DemoMain' ,
152- ' Require-Capability' : ' osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.7))"'
153- )
142+ ' Bundle-Description' : " ${ project.description} " ,
143+ ' Bundle-DocURL' : " https://${ project.git_url} " ,
144+ ' Bundle-License' : " https://${ project.git_url} /blob/v${ version} /LICENSE" ,
145+ ' Bundle-ManifestVersion' : " ${ osgi_manifest_ver} " ,
146+ ' Bundle-SymbolicName' : " ${ project.group} .${ project.name} " ,
147+ ' Bundle-Vendor' : " ${ project.org} " ,
148+ ' Bundle-Version' : " ${ project.version} " ,
149+ ' Export-Package' : " matlabcontrol;version=\" ${ project.version} \" ,matlabcontrol.demo;version=\" ${ project.version} \" ,matlabcontrol.extensions;uses:=matlabcontrol;version=\" ${ project.version} \" ,matlabcontrol.internal;version=\" ${ project.version} \" ,matlabcontrol.link;uses:=matlabcontrol;version=\" ${ project.version} \" " ,
150+ ' Main-Class' : ' matlabcontrol.demo.DemoMain' ,
151+ ' Require-Capability' : ' osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.7))"'
152+ )
154153 }
155154}
156155
@@ -174,7 +173,7 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
174173}
175174
176175artifacts {
177- archives sourcesJar
176+ archives sourcesJar
178177}
179178
180179// it all needs to get published and formatted
0 commit comments