Skip to content

Commit 5a5821f

Browse files
committed
🚧 WIP Fix some rebase issues
1 parent 739ec70 commit 5a5821f

File tree

3 files changed

+27
-100
lines changed

3 files changed

+27
-100
lines changed

‎.swiftpm/xcode/xcshareddata/xcschemes/swift-geo-Package.xcscheme

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,20 @@
202202
ReferencedContainer = "container:">
203203
</BuildableReference>
204204
</BuildActionEntry>
205+
<BuildActionEntry
206+
buildForTesting = "YES"
207+
buildForRunning = "YES"
208+
buildForProfiling = "YES"
209+
buildForArchiving = "YES"
210+
buildForAnalyzing = "YES">
211+
<BuildableReference
212+
BuildableIdentifier = "primary"
213+
BlueprintIdentifier = "GeoJSON"
214+
BuildableName = "GeoJSON"
215+
BlueprintName = "GeoJSON"
216+
ReferencedContainer = "container:">
217+
</BuildableReference>
218+
</BuildActionEntry>
205219
</BuildActionEntries>
206220
</BuildAction>
207221
<TestAction
@@ -310,6 +324,16 @@
310324
ReferencedContainer = "container:">
311325
</BuildableReference>
312326
</TestableReference>
327+
<TestableReference
328+
skipped = "NO">
329+
<BuildableReference
330+
BuildableIdentifier = "primary"
331+
BlueprintIdentifier = "GeoJSONTests"
332+
BuildableName = "GeoJSONTests"
333+
BlueprintName = "GeoJSONTests"
334+
ReferencedContainer = "container:">
335+
</BuildableReference>
336+
</TestableReference>
313337
</Testables>
314338
</TestAction>
315339
<LaunchAction

‎Package.swift

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ let package = Package(
1717
.library(name: "WGS84", targets: ["WGS84"]),
1818
.library(name: "GeodeticGeometry", targets: ["GeodeticGeometry"]),
1919
.library(name: "Turf", targets: ["Turf"]),
20+
.library(name: "GeoJSON", targets: ["GeoJSON"]),
2021
],
2122
dependencies: [
2223
.package(url: "https://github.com/apple/swift-algorithms", .upToNextMajor(from: "1.0.0")),
@@ -142,8 +143,8 @@ let package = Package(
142143
.target(
143144
name: "GeoJSON",
144145
dependencies: [
145-
.target(name: "GeoModels"),
146-
.target(name: "Turf"),
146+
.target(name: "GeodeticGeometry"),
147+
.target(name: "WGS84Turf"),
147148
.product(name: "NonEmpty", package: "swift-nonempty"),
148149
]
149150
),

‎Sources/Turf/Boundable.swift

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

0 commit comments

Comments
 (0)