Skip to content

Commit 45c4fdb

Browse files
marcpruxmarcprux
committed
Remove unnecessary import of CSwiftJavaJNI and need for JAVA_HOME include path
1 parent f347054 commit 45c4fdb

File tree

7 files changed

+1
-118
lines changed

7 files changed

+1
-118
lines changed

‎Benchmarks/Package.swift‎

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -2,42 +2,6 @@
22

33
import PackageDescription
44

5-
import class Foundation.FileManager
6-
import class Foundation.ProcessInfo
7-
8-
// Note: the JAVA_HOME environment variable must be set to point to where
9-
// Java is installed, e.g.,
10-
// Library/Java/JavaVirtualMachines/openjdk-21.jdk/Contents/Home.
11-
func findJavaHome() -> String {
12-
if let home = ProcessInfo.processInfo.environment["JAVA_HOME"] {
13-
return home
14-
}
15-
16-
// This is a workaround for envs (some IDEs) which have trouble with
17-
// picking up env variables during the build process
18-
let path = "\(FileManager.default.homeDirectoryForCurrentUser.path()).java_home"
19-
if let home = try? String(contentsOfFile: path, encoding: .utf8) {
20-
if let lastChar = home.last, lastChar.isNewline {
21-
return String(home.dropLast())
22-
}
23-
24-
return home
25-
}
26-
27-
fatalError("Please set the JAVA_HOME environment variable to point to where Java is installed.")
28-
}
29-
let javaHome = findJavaHome()
30-
31-
let javaIncludePath = "\(javaHome)/include"
32-
#if os(Linux)
33-
let javaPlatformIncludePath = "\(javaIncludePath)/linux"
34-
#elseif os(macOS)
35-
let javaPlatformIncludePath = "\(javaIncludePath)/darwin"
36-
#else
37-
// TODO: Handle windows as well
38-
#error("Currently only macOS and Linux platforms are supported, this may change in the future.")
39-
#endif
40-
415
let package = Package(
426
name: "benchmarks",
437
platforms: [
@@ -51,14 +15,12 @@ let package = Package(
5115
.executableTarget(
5216
name: "JavaApiCallBenchmarks",
5317
dependencies: [
54-
.product(name: "CSwiftJavaJNI", package: "swift-java"),
5518
.product(name: "SwiftJava", package: "swift-java"),
5619
.product(name: "JavaNet", package: "swift-java"),
5720
.product(name: "Benchmark", package: "package-benchmark"),
5821
],
5922
path: "Benchmarks/JavaApiCallBenchmarks",
6023
swiftSettings: [
61-
.unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"]),
6224
.swiftLanguageMode(.v5),
6325
],
6426
plugins: [

‎Samples/JavaDependencySampleApp/Package.swift‎

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -4,42 +4,6 @@
44
import CompilerPluginSupport
55
import PackageDescription
66

7-
import class Foundation.FileManager
8-
import class Foundation.ProcessInfo
9-
10-
// Note: the JAVA_HOME environment variable must be set to point to where
11-
// Java is installed, e.g.,
12-
// Library/Java/JavaVirtualMachines/openjdk-21.jdk/Contents/Home.
13-
func findJavaHome() -> String {
14-
if let home = ProcessInfo.processInfo.environment["JAVA_HOME"] {
15-
return home
16-
}
17-
18-
// This is a workaround for envs (some IDEs) which have trouble with
19-
// picking up env variables during the build process
20-
let path = "\(FileManager.default.homeDirectoryForCurrentUser.path()).java_home"
21-
if let home = try? String(contentsOfFile: path, encoding: .utf8) {
22-
if let lastChar = home.last, lastChar.isNewline {
23-
return String(home.dropLast())
24-
}
25-
26-
return home
27-
}
28-
29-
fatalError("Please set the JAVA_HOME environment variable to point to where Java is installed.")
30-
}
31-
let javaHome = findJavaHome()
32-
33-
let javaIncludePath = "\(javaHome)/include"
34-
#if os(Linux)
35-
let javaPlatformIncludePath = "\(javaIncludePath)/linux"
36-
#elseif os(macOS)
37-
let javaPlatformIncludePath = "\(javaIncludePath)/darwin"
38-
#else
39-
// TODO: Handle windows as well
40-
#error("Currently only macOS and Linux platforms are supported, this may change in the future.")
41-
#endif
42-
437
let package = Package(
448
name: "JavaDependencySampleApp",
459
platforms: [
@@ -65,13 +29,11 @@ let package = Package(
6529
name: "JavaDependencySample",
6630
dependencies: [
6731
.product(name: "SwiftJava", package: "swift-java"),
68-
.product(name: "CSwiftJavaJNI", package: "swift-java"),
6932
.product(name: "JavaUtilFunction", package: "swift-java"),
7033
"JavaCommonsCSV"
7134
],
7235
exclude: ["swift-java.config"],
7336
swiftSettings: [
74-
.unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"]),
7537
.swiftLanguageMode(.v5),
7638
],
7739
plugins: [
@@ -90,7 +52,6 @@ let package = Package(
9052
],
9153
exclude: ["swift-java.config"],
9254
swiftSettings: [
93-
.unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"]),
9455
.swiftLanguageMode(.v5),
9556
],
9657
plugins: [

‎Samples/SwiftJavaExtractFFMSampleApp/Package.swift‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ let package = Package(
6464
name: "MySwiftLibrary",
6565
dependencies: [
6666
.product(name: "SwiftJava", package: "swift-java"),
67-
.product(name: "CSwiftJavaJNI", package: "swift-java"),
6867
.product(name: "SwiftKitSwift", package: "swift-java"),
6968
],
7069
exclude: [

‎Samples/SwiftJavaExtractFFMSampleApp/Sources/MySwiftLibrary/jni/JNIImplementations.swift‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
//===----------------------------------------------------------------------===//
1414

1515
import SwiftJava
16-
import CSwiftJavaJNI
1716

1817
@JavaClass("com.example.swift.HelloJava2Swift")
1918
open class HelloJava2Swift: JavaObject {

‎Samples/SwiftJavaExtractJNISampleApp/Package.swift‎

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -4,42 +4,6 @@
44
import CompilerPluginSupport
55
import PackageDescription
66

7-
import class Foundation.FileManager
8-
import class Foundation.ProcessInfo
9-
10-
// Note: the JAVA_HOME environment variable must be set to point to where
11-
// Java is installed, e.g.,
12-
// Library/Java/JavaVirtualMachines/openjdk-21.jdk/Contents/Home.
13-
func findJavaHome() -> String {
14-
if let home = ProcessInfo.processInfo.environment["JAVA_HOME"] {
15-
return home
16-
}
17-
18-
// This is a workaround for envs (some IDEs) which have trouble with
19-
// picking up env variables during the build process
20-
let path = "\(FileManager.default.homeDirectoryForCurrentUser.path()).java_home"
21-
if let home = try? String(contentsOfFile: path, encoding: .utf8) {
22-
if let lastChar = home.last, lastChar.isNewline {
23-
return String(home.dropLast())
24-
}
25-
26-
return home
27-
}
28-
29-
fatalError("Please set the JAVA_HOME environment variable to point to where Java is installed.")
30-
}
31-
let javaHome = findJavaHome()
32-
33-
let javaIncludePath = "\(javaHome)/include"
34-
#if os(Linux)
35-
let javaPlatformIncludePath = "\(javaIncludePath)/linux"
36-
#elseif os(macOS)
37-
let javaPlatformIncludePath = "\(javaIncludePath)/darwin"
38-
#else
39-
// TODO: Handle windows as well
40-
#error("Currently only macOS and Linux platforms are supported, this may change in the future.")
41-
#endif
42-
437
let package = Package(
448
name: "JExtractJNISampleApp",
459
platforms: [
@@ -61,15 +25,13 @@ let package = Package(
6125
name: "MySwiftLibrary",
6226
dependencies: [
6327
.product(name: "SwiftJava", package: "swift-java"),
64-
.product(name: "CSwiftJavaJNI", package: "swift-java"),
6528
.product(name: "SwiftKitSwift", package: "swift-java"),
6629
],
6730
exclude: [
6831
"swift-java.config"
6932
],
7033
swiftSettings: [
7134
.swiftLanguageMode(.v5),
72-
.unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"]),
7335
],
7436
plugins: [
7537
.plugin(name: "JExtractSwiftPlugin", package: "swift-java")

‎swift-jni/Sources/CSwiftJavaJNI/include/jni.h‎ renamed to ‎swift-jni/Sources/CSwiftJavaJNI/include/CSwiftJavaJNI.h‎

File renamed without changes.

‎swift-jni/Sources/CSwiftJavaJNI/include/module.modulemap‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
module CSwiftJavaJNI {
2-
umbrella header "jni.h"
2+
umbrella header "CSwiftJavaJNI.h"
33
export *
44
}

0 commit comments

Comments
 (0)