Merge pull request #12 from GoodRequest/feature/swift6

task: Swift 6 support

Author: plajdo

GoodExtensions-iOS/GoodExtensions-iOS.xcodeproj/project.pbxproj

@@ -10,9 +10,7 @@
 		5D740E8029B0BACE00975B8C /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5D740E7F29B0BACE00975B8C /* AppDelegate.swift */; };
 		5D740E8B29B0BACF00975B8C /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 5D740E8A29B0BACF00975B8C /* Assets.xcassets */; };
 		5D740E8E29B0BACF00975B8C /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 5D740E8C29B0BACF00975B8C /* LaunchScreen.storyboard */; };
-		5D740E9B29B0BB4900975B8C /* GoodCombineExtensions in Frameworks */ = {isa = PBXBuildFile; productRef = 5D740E9A29B0BB4900975B8C /* GoodCombineExtensions */; };
 		5D740E9D29B0BB4900975B8C /* GoodExtensions in Frameworks */ = {isa = PBXBuildFile; productRef = 5D740E9C29B0BB4900975B8C /* GoodExtensions */; };
-		5D740E9F29B0BB4900975B8C /* GoodStructs in Frameworks */ = {isa = PBXBuildFile; productRef = 5D740E9E29B0BB4900975B8C /* GoodStructs */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -29,9 +27,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				5D740E9B29B0BB4900975B8C /* GoodCombineExtensions in Frameworks */,
 				5D740E9D29B0BB4900975B8C /* GoodExtensions in Frameworks */,
-				5D740E9F29B0BB4900975B8C /* GoodStructs in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -99,9 +95,7 @@
 			);
 			name = "GoodExtensions-iOS";
 			packageProductDependencies = (
-				5D740E9A29B0BB4900975B8C /* GoodCombineExtensions */,
 				5D740E9C29B0BB4900975B8C /* GoodExtensions */,
-				5D740E9E29B0BB4900975B8C /* GoodStructs */,
 			);
 			productName = "GoodExtensions-iOS";
 			productReference = 5D740E7C29B0BACE00975B8C /* GoodExtensions-iOS.app */;
@@ -312,7 +306,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.goodrequest.GoodExtensions-iOS";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -340,7 +334,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.goodrequest.GoodExtensions-iOS";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
@@ -369,18 +363,10 @@
 /* End XCConfigurationList section */
 
 /* Begin XCSwiftPackageProductDependency section */
-		5D740E9A29B0BB4900975B8C /* GoodCombineExtensions */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = GoodCombineExtensions;
-		};
 		5D740E9C29B0BB4900975B8C /* GoodExtensions */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = GoodExtensions;
 		};
-		5D740E9E29B0BB4900975B8C /* GoodStructs */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = GoodStructs;
-		};
 /* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 5D740E7429B0BACE00975B8C /* Project object */;

GoodExtensions-iOS/GoodExtensions-iOS.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -5,11 +5,9 @@
 //  Created by Andrej Jasso on 02/03/2023.
 //
 
-import UIKit
 import Combine
 import GoodExtensions
-import GoodStructs
-import GoodCombineExtensions
+import UIKit
 
 @main
 class AppDelegate: UIResponder, UIApplicationDelegate {

GoodExtensions-iOS/GoodExtensions-iOS/AppDelegate.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.9
+// swift-tools-version:6.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -30,29 +30,37 @@ let package = Package(
     ],
     dependencies: [
         .package(url: "https://github.com/CombineCommunity/CombineExt.git", from: "1.0.0"),
-        .package(url: "https://github.com/apple/swift-syntax.git", from: "509.0.2")
+        .package(url: "https://github.com/apple/swift-syntax.git", from: "600.0.0-latest")
     ],
     targets: [
         .target(
             name: "GoodExtensions",
             dependencies: ["GoodStructs"],
-            path: "./Sources/GoodExtensions"
+            path: "./Sources/GoodExtensions",
+            swiftSettings: [.swiftLanguageMode(.v6)]
         ),
         .target(
              name: "GoodAsyncExtensions",
              dependencies: [
                  .product(name: "CombineExt", package: "CombineExt")
-             ]
+             ],
+             swiftSettings: [.swiftLanguageMode(.v6)]
          ),
         .target(
             name: "GoodStructs",
             dependencies: [],
-            path: "./Sources/GoodStructs"
+            path: "./Sources/GoodStructs",
+            swiftSettings: [.swiftLanguageMode(.v6)]
         ),
         .target(
             name: "GoodMacros",
             dependencies: ["MacroCollection"],
-            path: "./Sources/GoodMacros"
+            path: "./Sources/GoodMacros",
+            swiftSettings: [
+                .swiftLanguageMode(.v6),
+                .enableUpcomingFeature("BodyMacros"),
+                .enableExperimentalFeature("BodyMacros")
+            ]
         ),
         .macro(
             name: "MacroCollection",
@@ -69,15 +77,30 @@ let package = Package(
             [
                 .copy("Resources/EmptyElement.json"),
                 .copy("Resources/ArrayNil.json")
-            ]
+            ],
+            swiftSettings: [.swiftLanguageMode(.v6)]
         ),
         .testTarget(
             name: "GoodStructsTests",
-            dependencies: ["GoodStructs"]
+            dependencies: ["GoodStructs"],
+            swiftSettings: [.swiftLanguageMode(.v6)]
         ),
         .testTarget(
             name: "GoodAsyncExtensionsTests",
-            dependencies: ["GoodAsyncExtensions"]
+            dependencies: ["GoodAsyncExtensions"],
+            swiftSettings: [.swiftLanguageMode(.v6)]
+        ),
+        .testTarget(
+            name: "GoodMacrosTests",
+            dependencies: [
+                "GoodMacros",
+                .product(name: "SwiftSyntaxMacrosTestSupport", package: "swift-syntax"),
+            ],
+            swiftSettings: [
+                .swiftLanguageMode(.v6),
+                .enableUpcomingFeature("BodyMacros"),
+                .enableExperimentalFeature("BodyMacros")
+            ]
         )
     ]
 )