Merge pull request #12 from kabiroberai/swift-5-9

Swift 5.9 Overhaul
kabiroberai · Sep 22, 2023 · f181b8f · f181b8f
2 parents 1783450 + 0e8cd4b
commit f181b8f
Show file tree

Hide file tree

Showing 49 changed files with 1,454 additions and 2,763 deletions.
diff --git a/NodeSwiftHost/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/NodeSwiftHost/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
diff --git a/NodeSwiftHost/Package.swift b/NodeSwiftHost/Package.swift
diff --git a/NodeSwiftHost/ctor.c b/NodeSwiftHost/ctor.c
diff --git a/Package.resolved b/Package.resolved
@@ -0,0 +1,14 @@
+{
+  "pins" : [
+    {
+      "identity" : "swift-syntax",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-syntax.git",
+      "state" : {
+        "revision" : "74203046135342e4a4a627476dd6caf8b28fe11b",
+        "version" : "509.0.0"
+      }
+    }
+  ],
+  "version" : 2
+}
diff --git a/Package.swift b/Package.swift
@@ -1,6 +1,7 @@
-// swift-tools-version:5.3
+// swift-tools-version:5.9
 
 import PackageDescription
+import CompilerPluginSupport
 import Foundation
 
 let buildDynamic = ProcessInfo.processInfo.environment["NODE_SWIFT_BUILD_DYNAMIC"] == "1"
@@ -12,24 +13,44 @@ let baseSwiftSettings: [SwiftSetting] = [
 
 let package = Package(
     name: "node-swift",
+    platforms: [
+        .macOS(.v10_15), .iOS(.v13),
+    ],
     products: [
         .library(
             name: "NodeAPI",
             type: buildDynamic ? .dynamic : nil,
             targets: ["NodeAPI"]
-        )
+        ),
+        .library(
+            name: "NodeModuleSupport",
+            targets: ["NodeModuleSupport"]
+        ),
+    ],
+    dependencies: [
+        .package(url: "https://github.com/apple/swift-syntax.git", from: "509.0.0"),
     ],
-    dependencies: [],
     targets: [
         .target(name: "CNodeAPI"),
+        .macro(
+            name: "NodeAPIMacros",
+            dependencies: [
+                .product(name: "SwiftSyntaxMacros", package: "swift-syntax"),
+                .product(name: "SwiftCompilerPlugin", package: "swift-syntax"),
+            ],
+            swiftSettings: baseSwiftSettings
+        ),
         .target(
             name: "NodeAPI",
-            dependencies: ["CNodeAPI"],
-            exclude: ["Sugar.swift.gyb"],
+            dependencies: ["CNodeAPI", "NodeAPIMacros"],
             swiftSettings: baseSwiftSettings + (enableEvolution ? [
                 .unsafeFlags(["-enable-library-evolution"])
             ] : [])
-        )
+        ),
+        .target(
+            name: "NodeModuleSupport",
+            dependencies: ["CNodeAPI"]
+        ),
     ],
     cxxLanguageStandard: .cxx14
 )