Skip to content

Commit 018f87c

Browse files
committed
fix typo
1 parent 52aeaed commit 018f87c

3 files changed

Lines changed: 37 additions & 31 deletions

File tree

Tests/LinkageTest/Package.swift

Lines changed: 35 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -128,33 +128,39 @@ let javaPlatformIncludePath = "\(javaIncludePath)/win32"
128128
#endif
129129

130130
let package = Package(
131-
name: "linkage-test",
132-
dependencies: [
133-
.package(name: "swift-java-jni-core", path: "../..")
134-
],
135-
targets: [
136-
.executableTarget(
137-
name: "LinkageTest",
138-
dependencies: [
139-
.product(name: "SwiftJavaJNICore", package: "swift-java-jni-core")
140-
],
141-
swiftSettings: [
142-
.unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"])
143-
],
144-
linkerSettings: [
145-
.unsafeFlags([
146-
"-L\(javaHome)/lib/server",
147-
"-Xlinker", "-rpath",
148-
"-Xlinker", "\(javaHome)/lib/server",
149-
], .when(platforms: [.linux, .macOS])),
150-
.unsafeFlags([
151-
"-L\(javaHome)/lib"
152-
], .when(platforms: [.windows])),
153-
.linkedLibrary(
154-
"jvm",
155-
.when(platforms: [.linux, .macOS, .windows])
156-
),
157-
]
158-
)
159-
]
131+
name: "linkage-test",
132+
dependencies: [
133+
.package(name: "swift-java-jni-core", path: "../..")
134+
],
135+
targets: [
136+
.executableTarget(
137+
name: "LinkageTest",
138+
dependencies: [
139+
.product(name: "SwiftJavaJNICore", package: "swift-java-jni-core")
140+
],
141+
swiftSettings: [
142+
.unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"])
143+
],
144+
linkerSettings: [
145+
.unsafeFlags(
146+
[
147+
"-L\(javaHome)/lib/server",
148+
"-Xlinker", "-rpath",
149+
"-Xlinker", "\(javaHome)/lib/server",
150+
],
151+
.when(platforms: [.linux, .macOS])
152+
),
153+
.unsafeFlags(
154+
[
155+
"-L\(javaHome)/lib"
156+
],
157+
.when(platforms: [.windows])
158+
),
159+
.linkedLibrary(
160+
"jvm",
161+
.when(platforms: [.linux, .macOS, .windows])
162+
),
163+
]
164+
)
165+
]
160166
)

Tests/LinkageTest/Sources/linkageTest/main.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@
1515
import SwiftJavaJNICore
1616

1717
let _ = try? JavaVirtualMachine.shared()
18-
print("Linkage test passed: SwiftJavaJNICore imported successfully.")
18+
print("Linkage test passed: SwiftJavaJNICore imported successfully.")

scripts/run-linkage-test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ swift build --package-path Tests/LinkageTest
3030

3131
# Construct build path
3232
build_path=$(swift build --package-path Tests/LinkageTest --show-bin-path)
33-
binary_path=$build_path/linkageTest
33+
binary_path="$build_path/LinkageTest"
3434

3535
# Verify the binary exists
3636
if [[ ! -f "$binary_path" ]]; then

0 commit comments

Comments
 (0)