From 08aa1e3391882e39900d36beb52296085ad572e8 Mon Sep 17 00:00:00 2001 From: Madhav Majumdar <161720210+madhav2348@users.noreply.github.com> Date: Fri, 16 May 2025 16:37:49 +0530 Subject: [PATCH 1/6] Update build.gradle.kts --- java/libraries/serial/build.gradle.kts | 40 +++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/java/libraries/serial/build.gradle.kts b/java/libraries/serial/build.gradle.kts index a176f03df7..d575cd0823 100644 --- a/java/libraries/serial/build.gradle.kts +++ b/java/libraries/serial/build.gradle.kts @@ -1 +1,39 @@ -ant.importBuild("build.xml") \ No newline at end of file +plugins { + java +} + +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(17)) + } +} + +val coreJarPath = layout.projectDirectory.file("../../../core/library/core.jar") +val jsscJarPath = layout.projectDirectory.file("library/jssc.jar") +val binDir = layout.projectDirectory.dir("bin") +val serialJarOutputDir = layout.projectDirectory.dir("library") + +dependencies { + implementation(files(coreJarPath)) + implementation(files(jsscJarPath)) +} + +tasks.register("checkCore") { + doFirst { + if (!coreJarPath.asFile.exists()) { + throw GradleException("Missing core.jar at $coreJarPath. Please build the core module first.") + } + } +} + +tasks.register("buildSerial") { + dependsOn("compileSerial") + archiveFileName.set("serial.jar") + destinationDirectory.set(file("library")) + from(sourceSets.main.get().output) +} + +tasks.named("clean") { + delete(binDir) + delete(serialJarOutputDir.file("serial.jar")) +} From f151d13c8f743d9de29cdd500cdd2d2fe0cef211 Mon Sep 17 00:00:00 2001 From: Madhav Majumdar <161720210+madhav2348@users.noreply.github.com> Date: Fri, 16 May 2025 16:39:09 +0530 Subject: [PATCH 2/6] Update build.gradle.kts --- java/libraries/serial/build.gradle.kts | 40 +++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/java/libraries/serial/build.gradle.kts b/java/libraries/serial/build.gradle.kts index a176f03df7..d575cd0823 100644 --- a/java/libraries/serial/build.gradle.kts +++ b/java/libraries/serial/build.gradle.kts @@ -1 +1,39 @@ -ant.importBuild("build.xml") \ No newline at end of file +plugins { + java +} + +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(17)) + } +} + +val coreJarPath = layout.projectDirectory.file("../../../core/library/core.jar") +val jsscJarPath = layout.projectDirectory.file("library/jssc.jar") +val binDir = layout.projectDirectory.dir("bin") +val serialJarOutputDir = layout.projectDirectory.dir("library") + +dependencies { + implementation(files(coreJarPath)) + implementation(files(jsscJarPath)) +} + +tasks.register("checkCore") { + doFirst { + if (!coreJarPath.asFile.exists()) { + throw GradleException("Missing core.jar at $coreJarPath. Please build the core module first.") + } + } +} + +tasks.register("buildSerial") { + dependsOn("compileSerial") + archiveFileName.set("serial.jar") + destinationDirectory.set(file("library")) + from(sourceSets.main.get().output) +} + +tasks.named("clean") { + delete(binDir) + delete(serialJarOutputDir.file("serial.jar")) +} From 46cc1d1474e62657de16ee4f39ef11f1416ded34 Mon Sep 17 00:00:00 2001 From: Madhav Majumdar <161720210+madhav2348@users.noreply.github.com> Date: Fri, 16 May 2025 17:02:30 +0530 Subject: [PATCH 3/6] fix build.gradle.kts --- java/libraries/serial/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/libraries/serial/build.gradle.kts b/java/libraries/serial/build.gradle.kts index d575cd0823..24447873d6 100644 --- a/java/libraries/serial/build.gradle.kts +++ b/java/libraries/serial/build.gradle.kts @@ -27,7 +27,7 @@ tasks.register("checkCore") { } tasks.register("buildSerial") { - dependsOn("compileSerial") + dependsOn("checkCore") archiveFileName.set("serial.jar") destinationDirectory.set(file("library")) from(sourceSets.main.get().output) From 1f210b83a48592be27b332342faae8d9e9368a91 Mon Sep 17 00:00:00 2001 From: Madhav Majumdar <161720210+madhav2348@users.noreply.github.com> Date: Fri, 16 May 2025 20:48:07 +0530 Subject: [PATCH 4/6] Resolving issue 1099 - Add settings.gradle.kts - Update build.gradle.kts --- java/libraries/serial/.gitignore | 1 + java/libraries/serial/build.gradle.kts | 27 ++++++++++---------------- java/settings.gradle.kts | 16 +++++++++++++++ 3 files changed, 27 insertions(+), 17 deletions(-) create mode 100644 java/settings.gradle.kts diff --git a/java/libraries/serial/.gitignore b/java/libraries/serial/.gitignore index ba077a4031..87fe527b4a 100644 --- a/java/libraries/serial/.gitignore +++ b/java/libraries/serial/.gitignore @@ -1 +1,2 @@ bin +build \ No newline at end of file diff --git a/java/libraries/serial/build.gradle.kts b/java/libraries/serial/build.gradle.kts index d575cd0823..59fcfbc82d 100644 --- a/java/libraries/serial/build.gradle.kts +++ b/java/libraries/serial/build.gradle.kts @@ -8,32 +8,25 @@ java { } } -val coreJarPath = layout.projectDirectory.file("../../../core/library/core.jar") -val jsscJarPath = layout.projectDirectory.file("library/jssc.jar") -val binDir = layout.projectDirectory.dir("bin") -val serialJarOutputDir = layout.projectDirectory.dir("library") +val coreJar = file("../../../core/library/core.jar") dependencies { - implementation(files(coreJarPath)) - implementation(files(jsscJarPath)) + + implementation(project(":core")) + implementation(files("library/jssc.jar")) } tasks.register("checkCore") { doFirst { - if (!coreJarPath.asFile.exists()) { - throw GradleException("Missing core.jar at $coreJarPath. Please build the core module first.") + if (!coreJar.exists()) { + throw GradleException("Missing core.jar at $coreJar. Please build the core module first.") } } } -tasks.register("buildSerial") { - dependsOn("compileSerial") - archiveFileName.set("serial.jar") +tasks.register("serialJar") { + dependsOn("checkCore", "classes") + archiveBaseName.set("serial") destinationDirectory.set(file("library")) from(sourceSets.main.get().output) -} - -tasks.named("clean") { - delete(binDir) - delete(serialJarOutputDir.file("serial.jar")) -} +} \ No newline at end of file diff --git a/java/settings.gradle.kts b/java/settings.gradle.kts new file mode 100644 index 0000000000..ca2bb5a728 --- /dev/null +++ b/java/settings.gradle.kts @@ -0,0 +1,16 @@ +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0" +} + +rootProject.name = "processing" + +include(":app") +include(":core") +include(":java:preprocessor") + +include(":java:libraries:dxf") +include(":java:libraries:io") +include(":java:libraries:net") +include(":java:libraries:pdf") +include(":java:libraries:serial") +include(":java:libraries:svg") \ No newline at end of file From 53e10082ed9f3679a7d01a6781233e7384f7d5e8 Mon Sep 17 00:00:00 2001 From: Madhav Majumdar <161720210+madhav2348@users.noreply.github.com> Date: Fri, 16 May 2025 21:30:02 +0530 Subject: [PATCH 5/6] foojay-resolver-convention updated to latest version --- java/settings.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/settings.gradle.kts b/java/settings.gradle.kts index ca2bb5a728..ccaf0b628a 100644 --- a/java/settings.gradle.kts +++ b/java/settings.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0" + id("org.gradle.toolchains.foojay-resolver-convention") version "0.10.0" } rootProject.name = "processing" From 24b7c3580b6fb43761f680c2514532d156563ad6 Mon Sep 17 00:00:00 2001 From: Madhav Majumdar <161720210+madhav2348@users.noreply.github.com> Date: Fri, 25 Jul 2025 17:35:37 +0530 Subject: [PATCH 6/6] update migration code and revert unnecessary commits --- java/libraries/serial/.gitignore | 1 - java/libraries/serial/build.gradle.kts | 44 ++++++++++++++------------ java/settings.gradle.kts | 16 ---------- 3 files changed, 23 insertions(+), 38 deletions(-) delete mode 100644 java/settings.gradle.kts diff --git a/java/libraries/serial/.gitignore b/java/libraries/serial/.gitignore index 87fe527b4a..ba077a4031 100644 --- a/java/libraries/serial/.gitignore +++ b/java/libraries/serial/.gitignore @@ -1,2 +1 @@ bin -build \ No newline at end of file diff --git a/java/libraries/serial/build.gradle.kts b/java/libraries/serial/build.gradle.kts index ca13f43876..15fd5e1203 100644 --- a/java/libraries/serial/build.gradle.kts +++ b/java/libraries/serial/build.gradle.kts @@ -2,33 +2,35 @@ plugins { java } -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(17)) +sourceSets { + main { + java { + srcDirs("src") + } } } -val coreJar = file("../../../core/library/core.jar") +repositories { + mavenCentral() +} dependencies { - - implementation(project(":core")) + compileOnly(project(":core")) + // TODO: https://github.com/java-native/jssc implementation(files("library/jssc.jar")) } -tasks.register("checkCore") { - doFirst { - - if (!coreJar.exists()) { - throw GradleException("Missing core.jar at $coreJar. Please build the core module first.") - } +tasks.register("createLibrary") { + dependsOn("jar") + into(layout.buildDirectory.dir("library")) + from(layout.projectDirectory) { + include("library.properties") + include("examples/**") } -} - -tasks.register("serialJar") { - dependsOn("checkCore", "classes") - archiveBaseName.set("serial") - destinationDirectory.set(file("library")) - from(sourceSets.main.get().output) -} - + from(configurations.runtimeClasspath) { + into("library") + } + from(tasks.jar) { + into("library") + } +} \ No newline at end of file diff --git a/java/settings.gradle.kts b/java/settings.gradle.kts deleted file mode 100644 index ccaf0b628a..0000000000 --- a/java/settings.gradle.kts +++ /dev/null @@ -1,16 +0,0 @@ -plugins { - id("org.gradle.toolchains.foojay-resolver-convention") version "0.10.0" -} - -rootProject.name = "processing" - -include(":app") -include(":core") -include(":java:preprocessor") - -include(":java:libraries:dxf") -include(":java:libraries:io") -include(":java:libraries:net") -include(":java:libraries:pdf") -include(":java:libraries:serial") -include(":java:libraries:svg") \ No newline at end of file