replicate impl in build conventions

Author: ktoso

BuildLogic/build.gradle.kts

@@ -12,25 +12,15 @@
 //
 //===----------------------------------------------------------------------===//
 
-import org.apache.tools.ant.filters.*
-import org.jetbrains.kotlin.ir.backend.js.compile
-
 repositories {
     gradlePluginPortal()
     mavenCentral()
 }
 
-plugins {
-    `kotlin-dsl`
-}
-
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-stdlib")
-    // for parsing Swift compiler information
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.0")
+    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.7.3")
 }
 
-
-kotlin {
-    jvmToolchain(17)
+plugins {
+    `kotlin-dsl`
 }

BuildLogic/src/main/kotlin/build-logic.java-common-conventions.gradle.kts

@@ -12,8 +12,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-import org.swift.swiftjava.gradle.JavaLibraryPathUtils.javaLibraryPaths
+import java.util.*
 import java.io.*
+import kotlin.system.exitProcess
+import kotlinx.serialization.json.*
 
 plugins {
     java
@@ -43,6 +45,62 @@ tasks.withType(JavaCompile::class).forEach {
     it.options.compilerArgs.add("-Xlint:preview")
 }
 
+
+fun getSwiftRuntimeLibraryPaths(): List<String> {
+    val process = ProcessBuilder("swiftc", "-print-target-info")
+        .redirectError(ProcessBuilder.Redirect.INHERIT)
+        .start()
+
+    val output = process.inputStream.bufferedReader().use { it.readText() }
+    val exitCode = process.waitFor()
+    if (exitCode != 0) {
+        System.err.println("Error executing swiftc -print-target-info")
+        exitProcess(exitCode)
+    }
+
+    val json = Json.parseToJsonElement(output)
+    val runtimeLibraryPaths = json.jsonObject["paths"]?.jsonObject?.get("runtimeLibraryPaths")?.jsonArray
+    return runtimeLibraryPaths?.map { it.jsonPrimitive.content } ?: emptyList()
+}
+
+/**
+ * Find library paths for 'java.library.path' when running or testing projects inside this build.
+ */
+// TODO: can't figure out how to share this code between BuildLogic/ and buildSrc/
+fun javaLibraryPaths(rootDir: File): List<String> {
+    val osName = System.getProperty("os.name").lowercase(Locale.getDefault())
+    val osArch = System.getProperty("os.arch")
+    val isLinux = osName.contains("linux")
+    val base = rootDir.path.let { "$it/" }
+
+    val projectBuildOutputPath =
+        if (isLinux) {
+            if (osArch == "amd64" || osArch == "x86_64")
+                "$base.build/x86_64-unknown-linux-gnu"
+            else
+                "$base.build/${osArch}-unknown-linux-gnu"
+        } else {
+            if (osArch == "aarch64")
+                "$base.build/arm64-apple-macosx"
+            else
+                "$base.build/${osArch}-apple-macosx"
+        }
+    val parentParentBuildOutputPath =
+        "../../$projectBuildOutputPath"
+
+
+    val swiftBuildOutputPaths = listOf(
+        projectBuildOutputPath,
+        parentParentBuildOutputPath
+    )
+
+    val debugBuildOutputPaths = swiftBuildOutputPaths.map { "$it/debug" }
+    val releaseBuildOutputPaths = swiftBuildOutputPaths.map { "$it/release" }
+    val swiftRuntimePaths = getSwiftRuntimeLibraryPaths()
+
+    return debugBuildOutputPaths + releaseBuildOutputPaths + swiftRuntimePaths
+}
+
 // Configure paths for native (Swift) libraries
 tasks.test {
     jvmArgs(

BuildLogic/src/main/kotlin/org/swift/swiftjava/gradle/DO_NOT_EDIT.txt

@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import org.swift.swiftjava.gradle.JavaLibraryPathUtils
+import org.swift.swiftkit.gradle.BuildUtils
 
 import java.nio.file.*
 
@@ -136,8 +136,8 @@ application {
 
         // Include the library paths where our dylibs are that we want to load and call
         "-Djava.library.path=" +
-                (JavaLibraryPathUtils.javaLibraryPaths(rootDir) +
-                        JavaLibraryPathUtils.javaLibraryPaths(project.projectDir)).join(":"),
+                (BuildUtils.javaLibraryPaths(rootDir) +
+                 BuildUtils.javaLibraryPaths(project.projectDir)).join(":"),
 
 
         // Enable tracing downcalls (to Swift)
@@ -148,7 +148,7 @@ application {
 jmh {
     jvmArgsAppend = [
         "-Djava.library.path=" +
-                (JavaLibraryPathUtils.javaLibraryPaths(rootDir) +
-                        JavaLibraryPathUtils.javaLibraryPaths(project.projectDir)).join(":"),
+                (BuildUtils.javaLibraryPaths(rootDir) +
+                 BuildUtils.javaLibraryPaths(project.projectDir)).join(":"),
     ]
 }

BuildLogic/src/main/kotlin/org/swift/swiftjava/gradle/JavaLibraryPathUtils.kt

@@ -36,8 +36,7 @@ public ConfinedSwiftMemorySession(Thread owner) {
 
     public void checkValid() throws RuntimeException {
         if (this.owner != null && this.owner != Thread.currentThread()) {
-            throw new WrongThreadException("ConfinedSwift arena is confined to %s but was closed from %s!"
-                    .formatted(this.owner, Thread.currentThread()));
+            throw new WrongThreadException("ConfinedSwift arena is confined to %s but was closed from %s!".formatted(this.owner, Thread.currentThread()));
         } else if (this.state.get() < ACTIVE) {
             throw new RuntimeException("SwiftArena is already closed!");
         }

Samples/SwiftKitSampleApp/build.gradle

@@ -12,19 +12,19 @@
 //
 //===----------------------------------------------------------------------===//
 
-plugins {
-    kotlin("jvm") version "1.9.10"
-}
-
 repositories {
     mavenCentral()
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-stdlib")
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.0")
+    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.7.3")
 }
 
-kotlin {
-    jvmToolchain(17)
+def cleanSwift = tasks.register("cleanSwift", Exec) {
+    workingDir = layout.projectDirectory
+    commandLine "swift"
+    args("package", "clean")
+}
+tasks.clean {
+    dependsOn("cleanSwift")
 }

SwiftKit/src/main/java/org/swift/swiftkit/ConfinedSwiftMemorySession.java

@@ -0,0 +1,60 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2024 Apple Inc. and the Swift.org project authors
+// Licensed under Apache License v2.0
+//
+// See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift.org project authors
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+//===----------------------------------------------------------------------===//
+
+package org.swift.swiftkit.gradle
+
+import groovy.json.JsonSlurper
+
+final class BuildUtils {
+
+    static List<String> getSwiftRuntimeLibraryPaths() {
+        def process = ['swiftc', '-print-target-info'].execute()
+        def output = new StringWriter()
+        process.consumeProcessOutput(output, System.err)
+        process.waitFor()
+
+        def json = new JsonSlurper().parseText(output.toString())
+        def runtimeLibraryPaths = json.paths.runtimeLibraryPaths
+        return runtimeLibraryPaths
+    }
+
+    /// Find library paths for 'java.library.path' when running or testing projects inside this build.
+    static def javaLibraryPaths(File rootDir) {
+        def osName = System.getProperty("os.name")
+        def osArch = System.getProperty("os.arch")
+        def isLinux = osName.toLowerCase(Locale.getDefault()).contains("linux")
+        def base = rootDir == null ? "" : "${rootDir}/"
+
+        def debugPaths = [
+                isLinux ?
+                        /* Linux */ (osArch == "amd64" || osArch == "x86_64" ?
+                        "${base}.build/x86_64-unknown-linux-gnu/debug/" :
+                        "${base}.build/${osArch}-unknown-linux-gnu/debug/") :
+                        /* macOS */ (osArch == "aarch64" ?
+                        "${base}.build/arm64-apple-macosx/debug/" :
+                        "${base}.build/${osArch}-apple-macosx/debug/"),
+                isLinux ?
+                        /* Linux */ (osArch == "amd64" || osArch == "x86_64" ?
+                        "${base}../../.build/x86_64-unknown-linux-gnu/debug/" :
+                        "${base}../../.build/${osArch}-unknown-linux-gnu/debug/") :
+                        /* macOS */ (osArch == "aarch64" ?
+                        "${base}../../.build/arm64-apple-macosx/debug/" :
+                        "${base}../../.build/${osArch}-apple-macosx/debug/"),
+        ]
+        def releasePaths = debugPaths.collect { it.replaceAll("debug", "release") }
+        def swiftRuntimePaths = getSwiftRuntimeLibraryPaths()
+
+        return releasePaths + debugPaths + swiftRuntimePaths
+    }
+}