Antoine/swift6 prep (#46)

The macro expansion causes warnings with swift 6. This is problematic because it belongs to the client module and blocks downstream swift6 compilation
eure · Nov 13, 2024 · 4e0e90d · 4e0e90d
1 parent dc9f29f
commit 4e0e90d
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 1 deletion.
diff --git a/Package.swift b/Package.swift
@@ -55,5 +55,5 @@ let package = Package(
       ]
     ),
   ],
-  swiftLanguageModes: [.v6]
+  swiftLanguageModes: [.v6, .v5]
 )
diff --git a/Sources/StorybookKit/Primitives/Book.swift b/Sources/StorybookKit/Primitives/Book.swift
@@ -115,6 +115,7 @@ public struct FolderBuilder {
 
   public typealias Element = Book.Node
 
+  @MainActor
   public static func buildExpression<Provider: BookProvider>(_ expression: Provider.Type) -> [FolderBuilder.Element] {
     return [.page(expression.bookBody)]
   }

diff --git a/Sources/StorybookKit/Primitives/BookProvider.swift b/Sources/StorybookKit/Primitives/BookProvider.swift
@@ -24,6 +24,7 @@ import SwiftUI
 
 @_alwaysEmitConformanceMetadata
 public protocol BookProvider {
+  @MainActor
   static var bookBody: BookPage { get }
 }
 

diff --git a/Sources/StorybookMacrosPlugin/StorybookPageMacro.swift b/Sources/StorybookMacrosPlugin/StorybookPageMacro.swift
@@ -48,6 +48,7 @@ public struct StorybookPageMacro: DeclarationMacro {
       .init(
         stringLiteral: """
         enum \(enumName): BookProvider {
+          @MainActor
           static var bookBody: BookPage {
             .init(
               title: \(title),

diff --git a/Sources/StorybookMacrosPlugin/StorybookPreviewMacro.swift b/Sources/StorybookMacrosPlugin/StorybookPreviewMacro.swift
@@ -48,6 +48,7 @@ public struct StorybookPreviewMacro: ExpressionMacro {
       stringLiteral: """
       {
         enum \(enumName): BookProvider {
+         @MainActor
           static var bookBody: BookPage {
             .init(
               title: \(title),

diff --git a/Sources/StorybookMacrosTests/StorybookPageTests.swift b/Sources/StorybookMacrosTests/StorybookPageTests.swift
@@ -47,6 +47,7 @@ final class StorybookPageTests: XCTestCase {
     } expansion: {
       """
       enum __macro_local_20__🤖🛠️_StorybookMagic_fMu_: BookProvider {
+        @MainActor
         static var bookBody: BookPage {
           .init(
             title: _typeName(UIView.self),
@@ -74,6 +75,7 @@ final class StorybookPageTests: XCTestCase {
     } expansion: {
       """
       enum __macro_local_20__🤖🛠️_StorybookMagic_fMu_: BookProvider {
+       @MainActor
         static var bookBody: BookPage {
           .init(
             title: "Path1.Path2.Title",
@@ -105,6 +107,7 @@ final class StorybookPageTests: XCTestCase {
       """
       enum Namespace1 { enum Namespace2 { enum Namespace3 { class TestableView: UIView {} } } }
       enum __macro_local_20__🤖🛠️_StorybookMagic_fMu_: BookProvider {
+        @MainActor
         static var bookBody: BookPage {
           .init(
             title: _typeName(target: Namespace1.Namespace2.Namespace3.TestableView.self),
@@ -132,6 +135,7 @@ final class StorybookPageTests: XCTestCase {
     } expansion: {
       """
       enum __macro_local_20__🤖🛠️_StorybookMagic_fMu_: BookProvider {
+        @MainActor
         static var bookBody: BookPage {
           .init(
             title: "Path1.Path2.Title",
@@ -163,6 +167,7 @@ final class StorybookPageTests: XCTestCase {
     } expansion: {
       """
       enum __macro_local_20__🤖🛠️_StorybookMagic_fMu_: BookProvider {
+        @MainActor
         static var bookBody: BookPage {
           .init(
             title: _typeName(UIView.self),
@@ -193,6 +198,7 @@ final class StorybookPageTests: XCTestCase {
     } expansion: {
       """
       enum __macro_local_20__🤖🛠️_StorybookMagic_fMu_: BookProvider {
+        @MainActor
         static var bookBody: BookPage {
           .init(
             title: "Path1.Path2.Title",
@@ -227,6 +233,7 @@ final class StorybookPageTests: XCTestCase {
       """
       enum Namespace1 { enum Namespace2 { enum Namespace3 { class TestableView: UIView {} } } }
       enum __macro_local_20__🤖🛠️_StorybookMagic_fMu_: BookProvider {
+        @MainActor
         static var bookBody: BookPage {
           .init(
             title: _typeName(
@@ -258,6 +265,7 @@ final class StorybookPageTests: XCTestCase {
     } expansion: {
       """
       enum __macro_local_20__🤖🛠️_StorybookMagic_fMu_: BookProvider {
+        @MainActor
         static var bookBody: BookPage {
           .init(
             title: "Path1.Path2.Title",

diff --git a/Sources/StorybookMacrosTests/StorybookPreviewTests.swift b/Sources/StorybookMacrosTests/StorybookPreviewTests.swift
@@ -51,6 +51,7 @@ final class StorybookPreviewTests: XCTestCase {
       #Preview("Some title") {
         {
           enum __macro_local_20__🤖🛠️_StorybookMagic_fMu_: BookProvider {
+            @MainActor
             static var bookBody: BookPage {
               .init(
                 title: _typeName(UIView.self),
@@ -85,6 +86,7 @@ final class StorybookPreviewTests: XCTestCase {
       #Preview {
         {
           enum __macro_local_20__🤖🛠️_StorybookMagic_fMu_: BookProvider {
+            @MainActor
             static var bookBody: BookPage {
               .init(
                 title: "Path1.Path2.Title",
@@ -123,6 +125,7 @@ final class StorybookPreviewTests: XCTestCase {
       #Preview {
         {
           enum __macro_local_20__🤖🛠️_StorybookMagic_fMu_: BookProvider {
+            @MainActor
             static var bookBody: BookPage {
               .init(
                 title: _typeName(target: Namespace1.Namespace2.Namespace3.TestableView.self),
@@ -157,6 +160,7 @@ final class StorybookPreviewTests: XCTestCase {
       #Preview {
         {
           enum __macro_local_20__🤖🛠️_StorybookMagic_fMu_: BookProvider {
+            @MainActor
             static var bookBody: BookPage {
               .init(
                 title: "Path1.Path2.Title",
@@ -195,6 +199,7 @@ final class StorybookPreviewTests: XCTestCase {
       #Preview {
         {
           enum __macro_local_20__🤖🛠️_StorybookMagic_fMu_: BookProvider {
+            @MainActor
             static var bookBody: BookPage {
               .init(
                 title: _typeName(UIView.self),
@@ -232,6 +237,7 @@ final class StorybookPreviewTests: XCTestCase {
       #Preview {
         {
           enum __macro_local_20__🤖🛠️_StorybookMagic_fMu_: BookProvider {
+            @MainActor
             static var bookBody: BookPage {
               .init(
                 title: "Path1.Path2.Title",
@@ -273,6 +279,7 @@ final class StorybookPreviewTests: XCTestCase {
       #Preview {
         {
           enum __macro_local_20__🤖🛠️_StorybookMagic_fMu_: BookProvider {
+            @MainActor
             static var bookBody: BookPage {
               .init(
                 title: _typeName(
@@ -311,6 +318,7 @@ final class StorybookPreviewTests: XCTestCase {
       #Preview {
         {
           enum __macro_local_20__🤖🛠️_StorybookMagic_fMu_: BookProvider {
+            @MainActor
             static var bookBody: BookPage {
               .init(
                 title: "Path1.Path2.Title",
-Original file line number
+Diff line change
@@ Expand Up / @@ -55,5 +55,5 @@ let package = Package( @@
           ]
         ),
       ],
-      swiftLanguageModes: [.v6]
+      swiftLanguageModes: [.v6, .v5]
     )