Skip to content

Commit efab049

Browse files
committed
Update dependencies
1 parent 21b4756 commit efab049

File tree

1 file changed

+1
-40
lines changed

1 file changed

+1
-40
lines changed

Package.swift

Lines changed: 1 addition & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,6 @@
11
// swift-tools-version: 6.0
2-
// The swift-tools-version declares the minimum version of Swift required to build this package.
3-
4-
import CompilerPluginSupport
52
import PackageDescription
63

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-
#elseif os(Windows)
39-
let javaPlatformIncludePath = "\(javaIncludePath)/win32"
40-
#endif
41-
424
let package = Package(
435
name: "Kotlin",
446
platforms: [
@@ -57,7 +19,7 @@ let package = Package(
5719
dependencies: [
5820
.package(
5921
url: "https://github.com/PureSwift/swift-java.git",
60-
branch: "feature/android-shim"
22+
branch: "feature/android"
6123
),
6224
.package(
6325
url: "https://github.com/PureSwift/JavaLang.git",
@@ -108,7 +70,6 @@ let package = Package(
10870
exclude: ["swift-java.config"],
10971
swiftSettings: [
11072
.swiftLanguageMode(.v5),
111-
.unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"]),
11273
]
11374
),
11475
.testTarget(

0 commit comments

Comments
 (0)