Skip to content

Commit 33630de

Browse files
plajdoplajdo
authored
Merge pull request #2 from GoodRequest/feature/swift6
GoodCoordinator v3
2 parents 237b698 + cb3e8ef commit 33630de

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+1152
-1523
lines changed

‎.swiftpm/configuration/Package.resolved‎

Lines changed: 42 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.swiftpm/xcode/xcshareddata/xcschemes/GoodCoordinator.xcscheme‎

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1610"
4+
version = "1.7">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES"
8+
buildArchitectures = "Automatic">
9+
<BuildActionEntries>
10+
<BuildActionEntry
11+
buildForTesting = "YES"
12+
buildForRunning = "YES"
13+
buildForProfiling = "YES"
14+
buildForArchiving = "YES"
15+
buildForAnalyzing = "YES">
16+
<BuildableReference
17+
BuildableIdentifier = "primary"
18+
BlueprintIdentifier = "GoodCoordinator"
19+
BuildableName = "GoodCoordinator"
20+
BlueprintName = "GoodCoordinator"
21+
ReferencedContainer = "container:">
22+
</BuildableReference>
23+
</BuildActionEntry>
24+
</BuildActionEntries>
25+
</BuildAction>
26+
<TestAction
27+
buildConfiguration = "Debug"
28+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
29+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
30+
shouldUseLaunchSchemeArgsEnv = "YES"
31+
shouldAutocreateTestPlan = "YES">
32+
<Testables>
33+
<TestableReference
34+
skipped = "NO">
35+
<BuildableReference
36+
BuildableIdentifier = "primary"
37+
BlueprintIdentifier = "MacroCollectionTests"
38+
BuildableName = "MacroCollectionTests"
39+
BlueprintName = "MacroCollectionTests"
40+
ReferencedContainer = "container:">
41+
</BuildableReference>
42+
</TestableReference>
43+
<TestableReference
44+
skipped = "NO">
45+
<BuildableReference
46+
BuildableIdentifier = "primary"
47+
BlueprintIdentifier = "GoodCoordinatorMacroCollectionTests"
48+
BuildableName = "GoodCoordinatorMacroCollectionTests"
49+
BlueprintName = "GoodCoordinatorMacroCollectionTests"
50+
ReferencedContainer = "container:">
51+
</BuildableReference>
52+
</TestableReference>
53+
</Testables>
54+
</TestAction>
55+
<LaunchAction
56+
buildConfiguration = "Debug"
57+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
58+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
59+
launchStyle = "0"
60+
useCustomWorkingDirectory = "NO"
61+
ignoresPersistentStateOnLaunch = "NO"
62+
debugDocumentVersioning = "YES"
63+
debugServiceExtension = "internal"
64+
allowLocationSimulation = "YES">
65+
</LaunchAction>
66+
<ProfileAction
67+
buildConfiguration = "Release"
68+
shouldUseLaunchSchemeArgsEnv = "YES"
69+
savedToolIdentifier = ""
70+
useCustomWorkingDirectory = "NO"
71+
debugDocumentVersioning = "YES">
72+
<MacroExpansion>
73+
<BuildableReference
74+
BuildableIdentifier = "primary"
75+
BlueprintIdentifier = "GoodCoordinator"
76+
BuildableName = "GoodCoordinator"
77+
BlueprintName = "GoodCoordinator"
78+
ReferencedContainer = "container:">
79+
</BuildableReference>
80+
</MacroExpansion>
81+
</ProfileAction>
82+
<AnalyzeAction
83+
buildConfiguration = "Debug">
84+
</AnalyzeAction>
85+
<ArchiveAction
86+
buildConfiguration = "Release"
87+
revealArchiveInOrganizer = "YES">
88+
</ArchiveAction>
89+
</Scheme>

‎Package.resolved‎

Lines changed: 78 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Package.swift‎

Lines changed: 38 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,58 @@
1-
// swift-tools-version: 5.8
1+
// swift-tools-version: 6.0
22
// The swift-tools-version declares the minimum version of Swift required to build this package.
33

44
import PackageDescription
5+
import CompilerPluginSupport
56

67
let package = Package(
7-
name: "GoodCoordinator",
8-
platforms: [.iOS(.v14)],
8+
name: "GoodCoordinator_v3",
9+
platforms: [
10+
.iOS(.v16),
11+
.macOS(.v13)
12+
],
913
products: [
10-
// Products define the executables and libraries a package produces, and make them visible to other packages.
1114
.library(
1215
name: "GoodCoordinator",
13-
targets: ["GoodCoordinator"]),
16+
targets: ["GoodCoordinator"]
17+
),
1418
],
1519
dependencies: [
16-
// Dependencies declare other packages that this package depends on.
17-
// .package(url: /* package url */, from: "1.0.0"),
20+
.package(url: "https://github.com/goodrequest/GoodReactor.git", .upToNextMajor(from: "2.0.0")),
21+
.package(url: "https://github.com/apple/swift-collections.git", .upToNextMajor(from: "1.1.3")),
22+
.package(url: "https://github.com/apple/swift-syntax.git", from: "600.0.0-latest"),
23+
.package(url: "https://github.com/pointfreeco/swift-macro-testing.git", from: "0.5.2")
1824
],
1925
targets: [
20-
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
21-
// Targets can depend on other targets in this package, and on products in packages this package depends on.
2226
.target(
2327
name: "GoodCoordinator",
24-
dependencies: [],
25-
path: "Sources"
28+
dependencies: [
29+
.target(name: "GoodCoordinatorMacros"),
30+
.product(name: "GoodReactor", package: "GoodReactor"),
31+
.product(name: "Collections", package: "swift-collections")
32+
],
33+
swiftSettings: [
34+
.swiftLanguageMode(.v6),
35+
.enableUpcomingFeature("BodyMacros"),
36+
.enableExperimentalFeature("BodyMacros")
37+
]
38+
),
39+
.macro(
40+
name: "GoodCoordinatorMacros",
41+
dependencies: [
42+
.product(name: "SwiftSyntaxMacros", package: "swift-syntax"),
43+
.product(name: "SwiftCompilerPlugin", package: "swift-syntax")
44+
],
45+
swiftSettings: [
46+
.swiftLanguageMode(.v6)
47+
]
2648
),
2749
.testTarget(
2850
name: "GoodCoordinatorTests",
29-
dependencies: ["GoodCoordinator"],
30-
path: "Tests"
51+
dependencies: [
52+
.target(name: "GoodCoordinator"),
53+
.product(name: "MacroTesting", package: "swift-macro-testing")
54+
],
55+
path: "./Tests"
3156
)
3257
]
3358
)

0 commit comments

Comments
 (0)