Skip to content

Update build #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Update build #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8afcd14
Bump Gradle to 8.10.2, `gradlew check` works again.
May 27, 2025
643d612
Bump to our latest publishing scripts.
May 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 28 additions & 29 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,17 +65,17 @@ jar.doFirst {

jar.manifest {
attributes (
'Bundle-Description': "${project.description}",
'Bundle-DocURL': "https://${project.git_url}",
'Bundle-License': "https://${project.git_url}/blob/v${version}/LICENSE",
'Bundle-ManifestVersion': "${osgi_manifest_ver}",
'Bundle-SymbolicName': "${project.group}.${project.name}",
'Bundle-Vendor': "${project.org}",
'Bundle-Version': "${project.version}",
'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}\"",
'Main-Class': 'matlabcontrol.demo.DemoMain',
'Require-Capability': 'osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.7))"'
)
'Bundle-Description': "${project.description}",
'Bundle-DocURL': "https://${project.git_url}",
'Bundle-License': "https://${project.git_url}/blob/v${version}/LICENSE",
'Bundle-ManifestVersion': "${osgi_manifest_ver}",
'Bundle-SymbolicName': "${project.group}.${project.name}",
'Bundle-Vendor': "${project.org}",
'Bundle-Version': "${project.version}",
'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}\"",
'Main-Class': 'matlabcontrol.demo.DemoMain',
'Require-Capability': 'osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.7))"'
)
}

////////////
Expand Down Expand Up @@ -114,13 +114,12 @@ task unzipJRE6(dependsOn: verifyJRE6, type: Copy) {
into JDK6_DIR
}

// Best bet is to stay at 1.6
sourceCompatibility = 1.6
targetCompatibility = 1.6
def sep = System.getProperty('path.separator')
def bootClasspathStr = project.files("${JRE6_HOME}/lib/rt.jar${sep}${JRE6_HOME}/lib/jsse.jar")
// Best bet is to stay at 1.6, but Java 11+ requires 1.8 minimum
sourceCompatibility = 1.8
targetCompatibility = 1.8
def bootClasspathFiles = project.files("${JRE6_HOME}/lib/rt.jar", "${JRE6_HOME}/lib/jsse.jar")
project.tasks.withType(AbstractCompile, { AbstractCompile ac ->
ac.options.bootstrapClasspath = bootClasspathStr // options is always there but not defined on AbstractCompile so going to hit it anyway
ac.options.bootstrapClasspath = bootClasspathFiles // options is always there but not defined on AbstractCompile so going to hit it anyway
ac.dependsOn(unzipJRE6)
})

Expand All @@ -140,17 +139,17 @@ task sourcesJar(type: Jar) {
exclude(JMI_STUB)
manifest {
attributes (
'Bundle-Description': "${project.description}",
'Bundle-DocURL': "https://${project.git_url}",
'Bundle-License': "https://${project.git_url}/blob/v${version}/LICENSE",
'Bundle-ManifestVersion': "${osgi_manifest_ver}",
'Bundle-SymbolicName': "${project.group}.${project.name}",
'Bundle-Vendor': "${project.org}",
'Bundle-Version': "${project.version}",
'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}\"",
'Main-Class': 'matlabcontrol.demo.DemoMain',
'Require-Capability': 'osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.7))"'
)
'Bundle-Description': "${project.description}",
'Bundle-DocURL': "https://${project.git_url}",
'Bundle-License': "https://${project.git_url}/blob/v${version}/LICENSE",
'Bundle-ManifestVersion': "${osgi_manifest_ver}",
'Bundle-SymbolicName': "${project.group}.${project.name}",
'Bundle-Vendor': "${project.org}",
'Bundle-Version': "${project.version}",
'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}\"",
'Main-Class': 'matlabcontrol.demo.DemoMain',
'Require-Capability': 'osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.7))"'
)
}
}

Expand All @@ -174,7 +173,7 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
}

artifacts {
archives sourcesJar
archives sourcesJar
}

// it all needs to get published and formatted
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
14 changes: 7 additions & 7 deletions settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,21 @@ pluginManagement {
}
plugins {
// https://github.com/diffplug/blowdryer/blob/main/CHANGELOG.md
id 'com.diffplug.blowdryerSetup' version '1.7.0'
id 'com.diffplug.blowdryerSetup' version '1.7.1'
// https://github.com/diffplug/spotless/blob/main/plugin-gradle/CHANGES.md
id 'com.diffplug.spotless' version '6.19.0' apply false
id 'com.diffplug.spotless' version '7.0.3' apply false
// https://github.com/diffplug/spotless-changelog/blob/main/CHANGELOG.md
id 'com.diffplug.spotless-changelog' version '3.0.2' apply false
id 'com.diffplug.spotless-changelog' version '3.1.2' apply false
// https://plugins.gradle.org/plugin/com.gradle.plugin-publish
id 'com.gradle.plugin-publish' version '1.2.0' apply false
id 'com.gradle.plugin-publish' version '1.3.1' apply false
// https://github.com/equodev/equo-ide/blob/main/plugin-gradle/CHANGELOG.md
id 'dev.equo.ide' version '1.3.0' apply false
id 'dev.equo.ide' version '1.7.8' apply false
// https://github.com/gradle-nexus/publish-plugin/releases
id 'io.github.gradle-nexus.publish-plugin' version '1.3.0' apply false
id 'io.github.gradle-nexus.publish-plugin' version '2.0.0' apply false
}

blowdryerSetup {
github 'diffplug/blowdryer-diffplug', 'tag', '7.1.0'
github 'diffplug/blowdryer-diffplug', 'tag', '9.0.0'
//devLocal '../blowdryer-diffplug'
setPluginsBlockTo {
it.file 'plugin.versions'
Expand Down
Loading