Skip to content

Commit 24b7c35

Browse files
committed
update migration code and revert unnecessary commits
1 parent b43c409 commit 24b7c35

File tree

3 files changed

+23
-38
lines changed

3 files changed

+23
-38
lines changed

java/libraries/serial/.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
bin
2-
build

java/libraries/serial/build.gradle.kts

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,33 +2,35 @@ plugins {
22
java
33
}
44

5-
java {
6-
toolchain {
7-
languageVersion.set(JavaLanguageVersion.of(17))
5+
sourceSets {
6+
main {
7+
java {
8+
srcDirs("src")
9+
}
810
}
911
}
1012

11-
val coreJar = file("../../../core/library/core.jar")
13+
repositories {
14+
mavenCentral()
15+
}
1216

1317
dependencies {
14-
15-
implementation(project(":core"))
18+
compileOnly(project(":core"))
19+
// TODO: https://github.com/java-native/jssc
1620
implementation(files("library/jssc.jar"))
1721
}
1822

19-
tasks.register("checkCore") {
20-
doFirst {
21-
22-
if (!coreJar.exists()) {
23-
throw GradleException("Missing core.jar at $coreJar. Please build the core module first.")
24-
}
23+
tasks.register<Copy>("createLibrary") {
24+
dependsOn("jar")
25+
into(layout.buildDirectory.dir("library"))
26+
from(layout.projectDirectory) {
27+
include("library.properties")
28+
include("examples/**")
2529
}
26-
}
27-
28-
tasks.register<Jar>("serialJar") {
29-
dependsOn("checkCore", "classes")
30-
archiveBaseName.set("serial")
31-
destinationDirectory.set(file("library"))
32-
from(sourceSets.main.get().output)
33-
}
34-
30+
from(configurations.runtimeClasspath) {
31+
into("library")
32+
}
33+
from(tasks.jar) {
34+
into("library")
35+
}
36+
}

java/settings.gradle.kts

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)