Skip to content

Commit b0f02a0

Browse files
maximkroukmaximkrouk
committed
feat: Extract KeyPathMapper to a separate package
1 parent 67b3e94 commit b0f02a0

21 files changed

+126
-810
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ jobs:
3434
cache-derived-data: true
3535
action: xcodebuild-test
3636
platform: ${{ matrix.platform }}
37-
scheme: swift-keypaths-extensions-Package
37+
scheme: swift-keypaths-extensions

‎.spi.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,3 @@ builder:
1616

1717
- documentation_targets:
1818
- KeyPathsExtensions
19-
- KeyPathMapper

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

Lines changed: 0 additions & 67 deletions
This file was deleted.

‎.swiftpm/xcode/xcshareddata/xcschemes/swift-keypaths-extensions-Package.xcscheme‎

Lines changed: 0 additions & 103 deletions
This file was deleted.

.swiftpm/xcode/xcshareddata/xcschemes/KeyPathsExtensions.xcscheme renamed to .swiftpm/xcode/xcshareddata/xcschemes/swift-keypaths-extensions.xcscheme

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "2600"
3+
LastUpgradeVersion = "2640"
44
version = "1.7">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -29,6 +29,18 @@
2929
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
3030
shouldUseLaunchSchemeArgsEnv = "YES"
3131
shouldAutocreateTestPlan = "YES">
32+
<Testables>
33+
<TestableReference
34+
skipped = "NO">
35+
<BuildableReference
36+
BuildableIdentifier = "primary"
37+
BlueprintIdentifier = "KeyPathsExtensionsTests"
38+
BuildableName = "KeyPathsExtensionsTests"
39+
BlueprintName = "KeyPathsExtensionsTests"
40+
ReferencedContainer = "container:">
41+
</BuildableReference>
42+
</TestableReference>
43+
</Testables>
3244
</TestAction>
3345
<LaunchAction
3446
buildConfiguration = "Debug"
@@ -39,7 +51,8 @@
3951
ignoresPersistentStateOnLaunch = "NO"
4052
debugDocumentVersioning = "YES"
4153
debugServiceExtension = "internal"
42-
allowLocationSimulation = "YES">
54+
allowLocationSimulation = "YES"
55+
queueDebuggingEnableBacktraceRecording = "Yes">
4356
</LaunchAction>
4457
<ProfileAction
4558
buildConfiguration = "Release"

‎Package.swift‎

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version: 6.0
1+
// swift-tools-version: 6.1
22

33
import PackageDescription
44

@@ -8,16 +8,13 @@ let package = Package(
88
.library(
99
name: "KeyPathsExtensions",
1010
targets: ["KeyPathsExtensions"]
11-
),
12-
.library(
13-
name: "KeyPathMapper",
14-
targets: ["KeyPathMapper"]
1511
)
1612
],
1713
dependencies: [
1814
.package(
19-
url: "https://github.com/capturecontext/swift-hashed.git",
20-
.upToNextMajor(from: "0.0.2")
15+
url: "https://github.com/capturecontext/swift-keypath-mapping.git",
16+
.upToNextMajor(from: "0.0.1"),
17+
traits: ["PredefinedConversions"]
2118
),
2219
.package(
2320
url: "https://github.com/capturecontext/swift-marker-protocols.git",
@@ -27,27 +24,17 @@ let package = Package(
2724
targets: [
2825
.target(
2926
name: "KeyPathsExtensions",
30-
dependencies: [
31-
.target(name: "KeyPathMapper"),
32-
]
33-
),
34-
.target(
35-
name: "KeyPathMapper",
3627
dependencies: [
3728
.product(
38-
name: "SwiftMarkerProtocols",
39-
package: "swift-marker-protocols"
29+
name: "KeyPathMapping",
30+
package: "swift-keypath-mapping"
4031
),
4132
.product(
42-
name: "Hashed",
43-
package: "swift-hashed"
33+
name: "SwiftMarkerProtocols",
34+
package: "swift-marker-protocols"
4435
),
4536
]
4637
),
47-
.testTarget(
48-
name: "KeyPathMapperTests",
49-
dependencies: ["KeyPathMapper"]
50-
),
5138
.testTarget(
5239
name: "KeyPathsExtensionsTests",
5340
dependencies: ["KeyPathsExtensions"]

‎Package@swift-5.9.swift‎

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,12 @@ let package = Package(
88
.library(
99
name: "KeyPathsExtensions",
1010
targets: ["KeyPathsExtensions"]
11-
),
12-
.library(
13-
name: "KeyPathMapper",
14-
targets: ["KeyPathMapper"]
1511
)
1612
],
1713
dependencies: [
1814
.package(
19-
url: "https://github.com/capturecontext/swift-hashed.git",
20-
.upToNextMajor(from: "0.0.2")
15+
url: "https://github.com/capturecontext/swift-keypath-mapping.git",
16+
.upToNextMajor(from: "0.0.1")
2117
),
2218
.package(
2319
url: "https://github.com/capturecontext/swift-marker-protocols.git",
@@ -27,30 +23,20 @@ let package = Package(
2723
targets: [
2824
.target(
2925
name: "KeyPathsExtensions",
30-
dependencies: [
31-
.target(name: "KeyPathMapper"),
32-
]
33-
),
34-
.target(
35-
name: "KeyPathMapper",
3626
dependencies: [
3727
.product(
38-
name: "SwiftMarkerProtocols",
39-
package: "swift-marker-protocols"
28+
name: "KeyPathMapping",
29+
package: "swift-keypath-mapping"
4030
),
4131
.product(
42-
name: "Hashed",
43-
package: "swift-hashed"
32+
name: "SwiftMarkerProtocols",
33+
package: "swift-marker-protocols"
4434
),
4535
]
4636
),
47-
.testTarget(
48-
name: "KeyPathMapperTests",
49-
dependencies: ["KeyPathMapper"]
50-
),
5137
.testTarget(
5238
name: "KeyPathsExtensionsTests",
5339
dependencies: ["KeyPathsExtensions"]
54-
),
40+
)
5541
]
5642
)

‎Package@swift-6.0.swift‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
// swift-tools-version: 6.0
2+
3+
import PackageDescription
4+
5+
let package = Package(
6+
name: "swift-keypaths-extensions",
7+
products: [
8+
.library(
9+
name: "KeyPathsExtensions",
10+
targets: ["KeyPathsExtensions"]
11+
)
12+
],
13+
dependencies: [
14+
.package(
15+
url: "https://github.com/capturecontext/swift-keypath-mapping.git",
16+
.upToNextMajor(from: "0.0.1")
17+
),
18+
.package(
19+
url: "https://github.com/capturecontext/swift-marker-protocols.git",
20+
.upToNextMajor(from: "1.5.1")
21+
),
22+
],
23+
targets: [
24+
.target(
25+
name: "KeyPathsExtensions",
26+
dependencies: [
27+
.product(
28+
name: "KeyPathMapping",
29+
package: "swift-keypath-mapping"
30+
),
31+
.product(
32+
name: "SwiftMarkerProtocols",
33+
package: "swift-marker-protocols"
34+
),
35+
]
36+
),
37+
.testTarget(
38+
name: "KeyPathsExtensionsTests",
39+
dependencies: ["KeyPathsExtensions"]
40+
)
41+
],
42+
swiftLanguageModes: [.v6]
43+
)

0 commit comments

Comments
 (0)