Skip to content

Commit

Permalink
🚧 WIP Fix some rebase issues
Browse files Browse the repository at this point in the history
  • Loading branch information
RemiBardon committed Feb 2, 2023
1 parent 739ec70 commit 5a5821f
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 100 deletions.
24 changes: 24 additions & 0 deletions .swiftpm/xcode/xcshareddata/xcschemes/swift-geo-Package.xcscheme
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,20 @@
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "GeoJSON"
BuildableName = "GeoJSON"
BlueprintName = "GeoJSON"
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
Expand Down Expand Up @@ -310,6 +324,16 @@
ReferencedContainer = "container:">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "GeoJSONTests"
BuildableName = "GeoJSONTests"
BlueprintName = "GeoJSONTests"
ReferencedContainer = "container:">
</BuildableReference>
</TestableReference>
</Testables>
</TestAction>
<LaunchAction
Expand Down
5 changes: 3 additions & 2 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ let package = Package(
.library(name: "WGS84", targets: ["WGS84"]),
.library(name: "GeodeticGeometry", targets: ["GeodeticGeometry"]),
.library(name: "Turf", targets: ["Turf"]),
.library(name: "GeoJSON", targets: ["GeoJSON"]),
],
dependencies: [
.package(url: "https://github.com/apple/swift-algorithms", .upToNextMajor(from: "1.0.0")),
Expand Down Expand Up @@ -142,8 +143,8 @@ let package = Package(
.target(
name: "GeoJSON",
dependencies: [
.target(name: "GeoModels"),
.target(name: "Turf"),
.target(name: "GeodeticGeometry"),
.target(name: "WGS84Turf"),
.product(name: "NonEmpty", package: "swift-nonempty"),
]
),
Expand Down
98 changes: 0 additions & 98 deletions Sources/Turf/Boundable.swift

This file was deleted.

0 comments on commit 5a5821f

Please sign in to comment.