Merge branch 'swiftlang:main' into main

Author: bo2themax

Benchmarks/Package.swift

@@ -51,7 +51,7 @@ let package = Package(
     .executableTarget(
       name: "JavaApiCallBenchmarks",
       dependencies: [
-        .product(name: "CJNI", package: "swift-java"),
+        .product(name: "CSwiftJavaJNI", package: "swift-java"),
         .product(name: "SwiftJava", package: "swift-java"),
         .product(name: "JavaNet", package: "swift-java"),
         .product(name: "Benchmark", package: "package-benchmark"),

Package.swift

@@ -101,8 +101,8 @@ let package = Package(
     ),
 
     .library(
-      name: "CJNI",
-      targets: ["CJNI"]
+      name: "CSwiftJavaJNI",
+      targets: ["CSwiftJavaJNI"]
     ),
 
     .library(
@@ -237,7 +237,7 @@ let package = Package(
     .target(
       name: "SwiftJava",
       dependencies: [
-        "CJNI",
+        "CSwiftJavaJNI",
         "SwiftJavaMacros",
         "JavaTypes",
         "SwiftJavaConfigurationShared", // for Configuration reading at runtime
@@ -359,7 +359,7 @@ let package = Package(
     ),
 
     .target(
-      name: "CJNI",
+      name: "CSwiftJavaJNI",
       swiftSettings: [
         .swiftLanguageMode(.v5),
         .unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"])

README.md

@@ -138,7 +138,7 @@ cd Samples/JavaKitSampleApp
 To run a simple example app showcasing the jextract (Java calling Swift) approach you can:
 
 ```bash
-./gradlew Samples:SwiftKitSampleApp:run
+./gradlew Samples:SwiftJavaExtractFFMSampleApp:run
 ```
 
 This will also generate the necessary sources (by invoking jextract, extracting the `Sources/ExampleSwiftLibrary`) 
@@ -152,7 +152,7 @@ Please refer to the [Samples](Samples) directory for more sample apps which show
 
 You can run Swift [ordo-one/package-benchmark](https://github.com/ordo-one/package-benchmark) and OpenJDK [JMH](https://github.com/openjdk/jmh) benchmarks in this project.
 
-Swift benchmarks are located under `Benchmarks/` and JMH benchmarks are currently part of the SwiftKit sample project: `Samples/SwiftKitSampleApp/src/jmh` because they depend on generated sources from the sample.
+Swift benchmarks are located under `Benchmarks/` and JMH benchmarks are currently part of the SwiftKit sample project: `Samples/SwiftJavaExtractFFMSampleApp/src/jmh` because they depend on generated sources from the sample.
 
 ### Swift benchmarks
 
@@ -168,8 +168,8 @@ swift package benchmark
 In order to run JMH benchmarks you can:
 
 ```bash
-cd Samples/SwiftKitSampleApp
-gradle jmh
+cd Samples/SwiftJavaExtractFFMSampleApp
+./gradlew jmh
 ```
 
 Please read documentation of both performance testing tools and understand that results must be interpreted and not just taken at face value. Benchmarking is tricky and environment sensitive task, so please be careful when constructing and reading benchmarks and their results. If in doubt, please reach out on the forums.
@@ -183,8 +183,8 @@ To view the rendered docc documentation you can use the docc preview command:
 ```bash
 xcrun docc preview Sources/SwiftJavaDocumentation/Documentation.docc
 
-# OR JavaKit to view JavaKit documentation:
-# xcrun docc preview Sources/SwiftJNI/Documentation.docc
+# OR SwiftJava to view SwiftJava documentation:
+# xcrun docc preview Sources/SwiftJava/Documentation.docc
 
 # ========================================
 # Starting Local Preview Server

Samples/JavaDependencySampleApp/Package.swift

@@ -65,7 +65,7 @@ let package = Package(
       name: "JavaDependencySample",
       dependencies: [
         .product(name: "SwiftJava", package: "swift-java"),
-        .product(name: "CJNI", package: "swift-java"),
+        .product(name: "CSwiftJavaJNI", package: "swift-java"),
         .product(name: "JavaUtilFunction", package: "swift-java"),
         "JavaCommonsCSV",
         "OrgAndrejsJson",

Samples/SwiftJavaExtractFFMSampleApp/Package.swift

@@ -64,7 +64,7 @@ let package = Package(
       name: "MySwiftLibrary",
       dependencies: [
         .product(name: "SwiftJava", package: "swift-java"),
-        .product(name: "CJNI", package: "swift-java"),
+        .product(name: "CSwiftJavaJNI", package: "swift-java"),
         .product(name: "SwiftKitSwift", package: "swift-java"),
       ],
       exclude: [

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

@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 import SwiftJava
-import CJNI
+import CSwiftJavaJNI
 
 @JavaClass("com.example.swift.HelloJava2Swift")
 open class HelloJava2Swift: JavaObject {

Samples/SwiftJavaExtractJNISampleApp/Package.swift

@@ -61,7 +61,7 @@ let package = Package(
       name: "MySwiftLibrary",
       dependencies: [
         .product(name: "SwiftJava", package: "swift-java"),
-        .product(name: "CJNI", package: "swift-java"),
+        .product(name: "CSwiftJavaJNI", package: "swift-java"),
         .product(name: "SwiftKitSwift", package: "swift-java"),
       ],
       exclude: [

Samples/SwiftJavaExtractJNISampleApp/Sources/MySwiftLibrary/ConcreteProtocolAB.swift

@@ -0,0 +1,28 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2025 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
+//
+//===----------------------------------------------------------------------===//
+
+public class ConcreteProtocolAB: ProtocolA, ProtocolB {
+  public let constantA: Int64
+  public let constantB: Int64
+  public var mutable: Int64 = 0
+
+  public func name() -> String {
+    return "ConcreteProtocolAB"
+  }
+
+  public init(constantA: Int64, constantB: Int64) {
+    self.constantA = constantA
+    self.constantB = constantB
+  }
+}

Samples/SwiftJavaExtractJNISampleApp/Sources/MySwiftLibrary/ProtocolA.swift

@@ -0,0 +1,24 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2025 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
+//
+//===----------------------------------------------------------------------===//
+
+public protocol ProtocolA {
+  var constantA: Int64 { get }
+  var mutable: Int64 { get set }
+
+  func name() -> String
+}
+
+public func takeProtocol(_ proto1: any ProtocolA, _ proto2: some ProtocolA) -> Int64 {
+  return proto1.constantA + proto2.constantA
+}

Samples/SwiftJavaExtractJNISampleApp/Sources/MySwiftLibrary/ProtocolB.swift

@@ -0,0 +1,29 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2025 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
+//
+//===----------------------------------------------------------------------===//
+
+public protocol ProtocolB {
+  var constantB: Int64 { get }
+}
+
+public func takeCombinedProtocol(_ proto: some ProtocolA & ProtocolB) -> Int64 {
+  return proto.constantA + proto.constantB
+}
+
+public func takeGenericProtocol<First: ProtocolA, Second: ProtocolB>(_ proto1: First, _ proto2: Second) -> Int64 {
+  return proto1.constantA + proto2.constantB
+}
+
+public func takeCombinedGenericProtocol<T: ProtocolA & ProtocolB>(_ proto: T) -> Int64 {
+  return proto.constantA + proto.constantB
+}