remove jextract generated files and use new src/generated target dir

Author: ktoso

.gitignore

@@ -25,5 +25,5 @@ BuildLogic/out/
 .gradletasknamecache
 
 # Ignore generated sources
-JavaSwiftKitDemo/src/main/java/com/example/swift/generated/*
-JavaSwiftKitDemo/src/generated/**
+JavaSwiftKitDemo/src/generated/*
+SwiftKitExample/src/generated/**/*

BuildLogic/build.gradle.kts renamed to BuildLogic/build.gradle

@@ -71,9 +71,11 @@ generate-all: generate-JavaKit generate-JavaKitReflection generate-JavaKitJar ge
 			  jextract-swift
 clean:
 	rm -rf .build
+	rm -rf
 
 format:
-	swift format --recursive . -i
+	swift format --recursive . -i \
+	rm -rf SwiftKitExample/src/generated/java
 
 #################################################
 ### "SwiftKit" is the "call swift from java"  ###
@@ -105,10 +107,10 @@ generate-JExtract-interface-files: $(BUILD_DIR)/debug/libJavaKit.$(LIB_SUFFIX)
 jextract-run: jextract-swift generate-JExtract-interface-files
 	swift run jextract-swift  \
 		--package-name com.example.swift.generated \
-		--swift-module JavaKitExample \
-		--output-directory JavaSwiftKitDemo/src/main/java \
-		$(BUILD_DIR)/jextract/JavaKitExample/MySwiftLibrary.swiftinterface \
-		$(BUILD_DIR)/jextract/JavaKitExample/SwiftKit.swiftinterface
+		--swift-module SwiftKitExample \
+		--output-directory SwiftKitExample/src/generated/java \
+		$(BUILD_DIR)/jextract/ExampleSwiftLibrary/MySwiftLibrary.swiftinterface \
+		$(BUILD_DIR)/jextract/ExampleSwiftLibrary/SwiftKit.swiftinterface
 
 
 jextract-run-java: jextract-swift generate-JExtract-interface-files

BuildLogic/settings.gradle.kts renamed to BuildLogic/settings.gradle

@@ -50,6 +50,7 @@ let package = Package(
     .macCatalyst(.v13),
   ],
   products: [
+    // ==== JavaKit (i.e. calling Java directly Swift utilities)
     .library(
       name: "JavaKit",
       type: .dynamic,
@@ -74,12 +75,6 @@ let package = Package(
       targets: ["JavaKitReflection"]
     ),
 
-    .library(
-      name: "JavaKitExample",
-      type: .dynamic,
-      targets: ["JavaKitExample"]
-    ),
-
     .library(
       name: "JavaKitVM",
       type: .dynamic,
@@ -92,21 +87,44 @@ let package = Package(
       targets: ["JavaTypes"]
     ),
 
-    .library(
-      name: "JExtractSwift",
-      type: .dynamic,
-      targets: ["JExtractSwift"]
-    ),
-
     .executable(
       name: "Java2Swift",
       targets: ["Java2Swift"]
     ),
 
+    // ==== jextract-swift (extract Java accessors from Swift interface files)
+
     .executable(
       name: "jextract-swift",
       targets: ["JExtractSwiftTool"]
     ),
+
+    // Support library written in Swift for SwiftKit "Java"
+    .library(
+      name: "SwiftKitSwift",
+      type: .dynamic,
+      targets: ["SwiftKitSwift"]
+    ),
+
+    .library(
+      name: "JExtractSwift",
+      type: .dynamic,
+      targets: ["JExtractSwift"]
+    ),
+
+    // ==== Examples
+
+    .library(
+      name: "JavaKitExample",
+      type: .dynamic,
+      targets: ["JavaKitExample"]
+    ),
+    .library(
+      name: "ExampleSwiftLibrary",
+      type: .dynamic,
+      targets: ["ExampleSwiftLibrary"]
+    ),
+
   ],
   dependencies: [
     .package(url: "https://github.com/swiftlang/swift-syntax.git", branch: "main"),
@@ -194,6 +212,22 @@ let package = Package(
         .unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"])
       ]
     ),
+    .target(
+      name: "ExampleSwiftLibrary",
+      dependencies: [],
+      swiftSettings: [
+        .swiftLanguageMode(.v5),
+        .unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"])
+      ]
+    ),
+    .target(
+      name: "SwiftKitSwift",
+      dependencies: [],
+      swiftSettings: [
+        .swiftLanguageMode(.v5),
+        .unsafeFlags(["-I\(javaIncludePath)", "-I\(javaPlatformIncludePath)"])
+      ]
+    ),
 
     .target(
       name: "JavaRuntime",

Makefile

@@ -1,120 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// 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
-//
-//===----------------------------------------------------------------------===//
-
-import JavaKit
-import JavaRuntime
-
-enum SwiftWrappedError: Error {
-  case message(String)
-}
-
-@JavaClass("com.example.swift.HelloSwift")
-struct HelloSwift {
-  @JavaMethod
-  init(environment: JNIEnvironment)
-
-  @JavaMethod
-  func sayHelloBack(_ i: Int32) -> Double
-
-  @JavaMethod
-  func greet(_ name: String)
-
-  @JavaMethod
-  func doublesToStrings(doubles: [Double]) -> [String]
-
-  @JavaMethod
-  func throwMessage(message: String) throws
-
-  @JavaField
-  var value: Double
-
-  @JavaField
-  var name: String
-
-  @ImplementsJava
-  func sayHello(i: Int32, _ j: Int32) -> Int32 {
-    print("Hello from Swift!")
-    let answer = self.sayHelloBack(i + j)
-    print("Swift got back \(answer) from Java")
-
-    print("We expect the above value to be the initial value, \(self.javaClass.initialValue)")
-
-    print("Updating Java field value to something different")
-    self.value = 2.71828
-
-    let newAnswer = self.sayHelloBack(17)
-    print("Swift got back updated \(newAnswer) from Java")
-
-    let newHello = HelloSwift(environment: javaEnvironment)
-    print("Swift created a new Java instance with the value \(newHello.value)")
-
-    let name = newHello.name
-    print("Hello to \(name)")
-    newHello.greet("Swift 👋🏽 How's it going")
-
-    self.name = "a 🗑️-collected language"
-    _ = self.sayHelloBack(42)
-
-    let strings = doublesToStrings(doubles: [3.14159, 2.71828])
-    print("Converting doubles to strings: \(strings)")
-
-    // Try downcasting
-    if let helloSub = self.as(HelloSubclass.self) {
-      print("Hello from the subclass!")
-      helloSub.greetMe()
-
-      assert(helloSub.super.value == 2.71828)
-    } else {
-      fatalError("Expected subclass here")
-    }
-
-    // Check "is" behavior
-    assert(newHello.is(HelloSwift.self))
-    assert(!newHello.is(HelloSubclass.self))
-
-    // Create a new instance.
-    let helloSubFromSwift = HelloSubclass(greeting: "Hello from Swift", environment: javaEnvironment)
-    helloSubFromSwift.greetMe()
-
-    do {
-      try throwMessage(message: "I am an error")
-    } catch {
-      print("Caught Java error: \(error)")
-    }
-
-    return i * j
-  }
-
-  @ImplementsJava
-  func throwMessageFromSwift(message: String) throws -> String {
-    throw SwiftWrappedError.message(message)
-  }
-}
-
-extension JavaClass<HelloSwift> {
-  @JavaField
-  var initialValue: Double
-}
-
-@JavaClass("com.example.swift.HelloSubclass", extends: HelloSwift.self)
-struct HelloSubclass {
-  @JavaField
-  var greeting: String
-
-  @JavaMethod
-  func greetMe()
-
-  @JavaMethod
-  init(greeting: String, environment: JNIEnvironment)
-}