Fix build error

Author: helmetcrest

Benchmarks/JavaApiCallBenchmarks/JavaApiCallBenchmarks.swift renamed to Benchmarks/Benchmarks/JavaApiCallBenchmarks/JavaApiCallBenchmarks.swift

@@ -0,0 +1,69 @@
+// swift-tools-version: 6.0
+
+import PackageDescription
+
+import class Foundation.FileManager
+import class Foundation.ProcessInfo
+
+// Note: the JAVA_HOME environment variable must be set to point to where
+// Java is installed, e.g.,
+//   Library/Java/JavaVirtualMachines/openjdk-21.jdk/Contents/Home.
+func findJavaHome() -> String {
+  if let home = ProcessInfo.processInfo.environment["JAVA_HOME"] {
+    return home
+  }
+
+  // This is a workaround for envs (some IDEs) which have trouble with
+  // picking up env variables during the build process
+  let path = "\(FileManager.default.homeDirectoryForCurrentUser.path()).java_home"
+  if let home = try? String(contentsOfFile: path, encoding: .utf8) {
+    if let lastChar = home.last, lastChar.isNewline {
+      return String(home.dropLast())
+    }
+
+    return home
+  }
+
+  fatalError("Please set the JAVA_HOME environment variable to point to where Java is installed.")
+}
+let javaHome = findJavaHome()
+
+let javaIncludePath = "\(javaHome)/include"
+#if os(Linux)
+  let javaPlatformIncludePath = "\(javaIncludePath)/linux"
+#elseif os(macOS)
+  let javaPlatformIncludePath = "\(javaIncludePath)/darwin"
+#else
+  // TODO: Handle windows as well
+  #error("Currently only macOS and Linux platforms are supported, this may change in the future.")
+#endif
+
+let package = Package(
+  name: "benchmarks",
+  platforms: [
+    .macOS("15.03")
+  ],
+  dependencies: [
+    .package(path: "../"),
+    .package(url: "https://github.com/ordo-one/package-benchmark", .upToNextMajor(from: "1.4.0")),
+  ],
+  targets: [
+    .executableTarget(
+      name: "JavaApiCallBenchmarks",
+      dependencies: [
+        .product(name: "JavaRuntime", package: "swift-java"),
+        .product(name: "JavaKit", package: "swift-java"),
+        .product(name: "JavaKitNetwork", package: "swift-java"),
+        .product(name: "Benchmark", package: "package-benchmark"),
+      ],
+      path: "Benchmarks/JavaApiCallBenchmarks",
+      swiftSettings: [
+        .unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"]),
+        .swiftLanguageMode(.v5),
+      ],
+      plugins: [
+        .plugin(name: "BenchmarkPlugin", package: "package-benchmark")
+      ]
+    )
+  ]
+)

Benchmarks/Package.swift

@@ -374,24 +374,6 @@ let package = Package(
         .swiftLanguageMode(.v5),
         .unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"])
       ]
-    ),
-
-    .executableTarget(
-      name: "JavaApiCallBenchmarks",
-      dependencies: [
-        "JavaRuntime",
-        "JavaKit",
-        "JavaKitNetwork",
-        .product(name: "Benchmark", package: "package-benchmark"),
-      ],
-      path: "Benchmarks/JavaApiCallBenchmarks",
-      swiftSettings: [
-        .unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"]),
-        .swiftLanguageMode(.v5),
-      ],
-      plugins: [
-        .plugin(name: "BenchmarkPlugin", package: "package-benchmark")
-      ],
-    ),
+    )
   ]
 )

Package.swift

@@ -16,7 +16,7 @@ import org.swift.swiftkit.gradle.BuildUtils
 
 plugins {
     id("build-logic.java-application-conventions")
-    id "me.champeau.jmh" version "0.7.2"
+    id("me.champeau.jmh") version "0.7.2"
 }
 
 group = "org.swift.swiftkit"
@@ -91,4 +91,4 @@ jmh {
     jvmArgsAppend = [
         "-Djava.library.path=" + BuildUtils.javaLibraryPaths(rootDir).join(":"),
     ]
-}
+}

Samples/SwiftKitSampleApp/build.gradle

@@ -11,7 +11,9 @@ RUN apt-get update && apt-get install -y \
     locales locales-all \
     make \
     libc6-dev \
-    curl
+    curl \
+    libjemalloc2 \
+    libjemalloc-dev
 ENV LC_ALL=en_US.UTF-8
 ENV LANG=en_US.UTF-8
 ENV LANGUAGE=en_US.UTF-8