Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
4 changes: 2 additions & 2 deletions java/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ tasks.register<Copy>("copyCore"){
into(coreProject.layout.projectDirectory.dir("library"))
}

val legacyLibraries = arrayOf("io","net")
val legacyLibraries = emptyArray<String>()
legacyLibraries.forEach { library ->
tasks.register<Copy>("library-$library-extraResources"){
val build = project(":java:libraries:$library").tasks.named("build")
Expand All @@ -87,7 +87,7 @@ legacyLibraries.forEach { library ->
}
}

val libraries = arrayOf("dxf", "pdf", "serial", "svg")
val libraries = arrayOf("dxf", "io", "net", "pdf", "serial", "svg")

libraries.forEach { library ->
val name = "create-$library-library"
Expand Down
93 changes: 92 additions & 1 deletion java/libraries/io/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1 +1,92 @@
ant.importBuild("build.xml")
import com.vanniktech.maven.publish.SonatypeHost

plugins {
java
alias(libs.plugins.mavenPublish)
}

sourceSets {
main {
java {
srcDirs("src")
}
}
}

repositories {
mavenCentral()
}

dependencies {
compileOnly(project(":core"))
}

tasks.register<Copy>("createLibrary") {
dependsOn("jar")
into(layout.buildDirectory.dir("library"))

from(layout.projectDirectory) {
include("library.properties")
include("examples/**")
}

from(configurations.runtimeClasspath) {
into("library")
}

from(tasks.jar) {
into("library")
rename { "io.jar" }
}

from(layout.projectDirectory.dir("library")) {
include("linux-arm64/**")
include("linux-armv6hf/**")
include("linux32/**")
include("linux64/**")
into("library")
}
}

publishing {
repositories {
maven {
name = "App"
url = uri(project(":app").layout.buildDirectory.dir("resources-bundled/common/repository").get().asFile.absolutePath)
}
}
}

mavenPublishing {
coordinates("$group.core", name, version.toString())
publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL, automaticRelease = true)

signAllPublications()

pom {
name.set("Processing IO")
description.set("Processing IO")
url.set("https://processing.org")
licenses {
license {
name.set("LGPL")
url.set("https://www.gnu.org/licenses/lgpl-2.1.html")
}
}
developers {
developer {
id.set("steftervelde")
name.set("Stef Tervelde")
}
developer {
id.set("benfry")
name.set("Ben Fry")
}
}
scm {
url.set("https://github.com/processing/processing4")
connection.set("scm:git:git://github.com/processing/processing4.git")
developerConnection.set("scm:git:ssh://git@github.com/processing/processing4.git")
}
}
}
49 changes: 47 additions & 2 deletions java/libraries/serial/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
import com.vanniktech.maven.publish.SonatypeHost

plugins {
java
alias(libs.plugins.mavenPublish)
}

sourceSets {
Expand All @@ -16,8 +19,7 @@ repositories {

dependencies {
compileOnly(project(":core"))
// TODO: https://github.com/java-native/jssc
implementation(files("library/jssc.jar"))
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#1106 please see here why this was this way

implementation("io.github.java-native:jssc:2.10.2")
}

tasks.register<Copy>("createLibrary") {
Expand All @@ -34,4 +36,47 @@ tasks.register<Copy>("createLibrary") {
into("library")
rename { "serial.jar" }
}
}

publishing {
repositories {
maven {
name = "App"
url = uri(project(":app").layout.buildDirectory.dir("resources-bundled/common/repository").get().asFile.absolutePath)
}
}
}

mavenPublishing {
coordinates("$group.core", name, version.toString())
publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL, automaticRelease = true)

signAllPublications()

pom {
name.set("Processing Serial")
description.set("Processing Serial")
url.set("https://processing.org")
licenses {
license {
name.set("LGPL")
url.set("https://www.gnu.org/licenses/lgpl-2.1.html")
}
}
developers {
developer {
id.set("steftervelde")
name.set("Stef Tervelde")
}
developer {
id.set("benfry")
name.set("Ben Fry")
}
}
scm {
url.set("https://github.com/processing/processing4")
connection.set("scm:git:git://github.com/processing/processing4.git")
developerConnection.set("scm:git:ssh://git@github.com/processing/processing4.git")
}
}
}
6 changes: 5 additions & 1 deletion java/libraries/serial/src/processing/serial/Serial.java
Original file line number Diff line number Diff line change
Expand Up @@ -259,8 +259,12 @@ public boolean getDSR() {
}


/**
* @deprecated No longer supported
*/
@Deprecated
public static Map<String, String> getProperties(String portName) {
return SerialPortList.getPortProperties(portName);
return new java.util.HashMap<>();
}


Expand Down