Move macro to separate repository

futuredapp · Aug 3, 2024 · 24ccf4f · 24ccf4f
1 parent 05eec5a
commit 24ccf4f
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 155 deletions.
diff --git a/Package.resolved b/Package.resolved
@@ -18,6 +18,15 @@
         "version" : "0.2.0"
       }
     },
+    {
+      "identity" : "futured-macros",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/futuredapp/futured-macros",
+      "state" : {
+        "branch" : "main",
+        "revision" : "e2d832df517e1dd00be6c45a1560b349ca9d337f"
+      }
+    },
     {
       "identity" : "swift-syntax",
       "kind" : "remoteSourceControl",

diff --git a/Package.swift b/Package.swift
@@ -14,10 +14,7 @@ let package = Package(
     products: [
         .library(
             name: "FuturedArchitecture",
-            targets: [
-                "FuturedArchitecture",
-                "EnumIdentifiersGenerator"
-            ]
+            targets: ["FuturedArchitecture"]
         ),
         .library(
             name: "FuturedHelpers",
@@ -27,25 +24,15 @@ let package = Package(
     dependencies: [
         .package(url: "https://github.com/mkj-is/BindingKit", from: "1.0.0"),
         .package(url: "https://github.com/JohnSundell/CollectionConcurrencyKit", from: "0.1.0"),
-        .package(url: "https://github.com/apple/swift-syntax.git", from: "509.0.0")
+        .package(url: "https://github.com/futuredapp/futured-macros", branch: "main")
     ],
     targets: [
         .target(
-            name: "EnumIdentifiersGenerator",
-            dependencies: [
-                "EnumIdentifiersGeneratorMacro"
-            ]
-        ),
-        .macro(
-            name: "EnumIdentifiersGeneratorMacro",
+            name: "FuturedArchitecture",
             dependencies: [
-                .product(name: "SwiftSyntaxMacros", package: "swift-syntax"),
-                .product(name: "SwiftCompilerPlugin", package: "swift-syntax")
+                .product(name: "FuturedMacros", package: "futured-macros")
             ]
         ),
-        .target(
-            name: "FuturedArchitecture"
-        ),
         .target(
             name: "FuturedHelpers",
             dependencies: [

diff --git a/Sources/EnumIdentifiersGenerator/EnumIdentifiersGenerator.swift b/Sources/EnumIdentifiersGenerator/EnumIdentifiersGenerator.swift
diff --git a/Sources/EnumIdentifiersGeneratorMacro/EnumIdentifiersGeneratorMacro.swift b/Sources/EnumIdentifiersGeneratorMacro/EnumIdentifiersGeneratorMacro.swift
diff --git a/Sources/FuturedArchitecture/Architecture/ModalCoverModel.swift b/Sources/FuturedArchitecture/Architecture/ModalCoverModel.swift
@@ -1,5 +1,5 @@
 //
-//  File.swift
+//  ModalCoverModel.swift
 //  
 //
 //  Created by Simon Sestak on 01/08/2024.

diff --git a/...Flow Coordinator.xctemplate/___VARIABLE_flowCoordinatorIdentifier___FlowCoordinator.swift b/...Flow Coordinator.xctemplate/___VARIABLE_flowCoordinatorIdentifier___FlowCoordinator.swift
@@ -1,6 +1,6 @@
 //  ___FILEHEADER___
 
-import EnumIdentifiersGenerator
+import EnumIdentable
 import FuturedArchitecture
 import SwiftUI
 
@@ -30,7 +30,7 @@ final class ___VARIABLE_flowCoordinatorIdentifier___FlowCoordinator: NavigationS
 }
 
 extension ___VARIABLE_flowCoordinatorIdentifier___FlowCoordinator {
-    @EnumIdentifiersGenerator
+    @EnumIdentable
     enum Destination: String, Hashable, Identifiable {
         case destination
     }

diff --git a/Templates/SwiftUI App.xctemplate/ExampleFlowCoordinator.swift b/Templates/SwiftUI App.xctemplate/ExampleFlowCoordinator.swift
@@ -1,6 +1,6 @@
 //  ___FILEHEADER___
 
-import EnumIdentifiersGenerator
+import EnumIdentable
 import FuturedArchitecture
 import SwiftUI
 
@@ -38,7 +38,7 @@ final class ExampleFlowCoordinator: NavigationStackCoordinator {
 }
 
 extension ExampleFlowCoordinator {
-    @EnumIdentifiersGenerator
+    @EnumIdentable
     enum Destination: String, Hashable, Identifiable {
         case destination
     }