Merge pull request #7 from GEOSwift/feature/swift-pm

macdrevx · web-flow · commit 3c293964c8d4 · 2019-11-10T21:50:57.000-05:00
Add support for Swift PM
diff --git a/.gitignore b/.gitignore
@@ -30,3 +30,4 @@ Carthage/Build
 # Swift Package Manager
 
 .build/
+.swiftpm/
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 1.2.0
+
+* [#7](https://github.com/GEOSwift/GEOSwiftMapKit/pull/7) Swift PM Support
+    * Add support for Swift PM on iOS, tvOS, and macOS (Fixes
+      [#4](https://github.com/GEOSwift/GEOSwiftMapKit/issues/4))
+
 ## 1.1.0
 
 * Relaxed GEOSwift dependency requirement for CocoaPods
diff --git a/Cartfile b/Cartfile
@@ -1 +1 @@
-github "GEOSwift/GEOSwift" ~> 5.0
+github "GEOSwift/GEOSwift" ~> 6.0
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,2 +1,2 @@
-github "GEOSwift/GEOSwift" "5.2.0"
-github "GEOSwift/geos" "4.0.3"
+github "GEOSwift/GEOSwift" "6.0.0"
+github "GEOSwift/geos" "4.1.0"
diff --git a/GEOSwiftMapKit.podspec b/GEOSwiftMapKit.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name = 'GEOSwiftMapKit'
-  s.version = '1.1.0'
-  s.swift_version = '5.0'
+  s.version = '1.2.0'
+  s.swift_version = '5.1'
   s.cocoapods_version = '>= 1.4.0'
   s.summary = 'MapKit support for GEOSwift'
   s.description  = <<~DESC
@@ -22,5 +22,5 @@ Pod::Spec.new do |s|
   }
   s.source_files = 'GEOSwiftMapKit/*.{swift,h}'
   s.macos.exclude_files = 'GEOSwiftMapKit/GEOSwift+MapKitQuickLook.swift'
-  s.dependency 'GEOSwift', '~> 5.0'
+  s.dependency 'GEOSwift', '~> 6.0'
 end
diff --git a/GEOSwiftMapKit.xcodeproj/project.pbxproj b/GEOSwiftMapKit.xcodeproj/project.pbxproj
@@ -17,6 +17,10 @@
 		493F2D3D22DC4A3C00BE38EA /* multilinestring.png in Resources */ = {isa = PBXBuildFile; fileRef = 493F2D3B22DC4A3C00BE38EA /* multilinestring.png */; };
 		493F2D4022DC4A3C00BE38EA /* multipolygon.png in Resources */ = {isa = PBXBuildFile; fileRef = 493F2D3C22DC4A3C00BE38EA /* multipolygon.png */; };
 		493F2D4422DC4BEB00BE38EA /* envelope.png in Resources */ = {isa = PBXBuildFile; fileRef = 493F2D4322DC4BEB00BE38EA /* envelope.png */; };
+		49A3DE2C2378E6520031B8CD /* QuickLookTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 49CF3D7222D10BDB0076F6E5 /* QuickLookTests.swift */; };
+		49A3DE2D2378E6550031B8CD /* QuickLookTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 49CF3D7222D10BDB0076F6E5 /* QuickLookTests.swift */; };
+		49A3DE2E2378E65A0031B8CD /* GEOSwift+MapKitQuickLook.swift in Sources */ = {isa = PBXBuildFile; fileRef = 49B1182F22C96BC100E638D7 /* GEOSwift+MapKitQuickLook.swift */; };
+		49A3DE2F2378E65B0031B8CD /* GEOSwift+MapKitQuickLook.swift in Sources */ = {isa = PBXBuildFile; fileRef = 49B1182F22C96BC100E638D7 /* GEOSwift+MapKitQuickLook.swift */; };
 		49B1182C22C96B4E00E638D7 /* GEOSwift+MapKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 49B1182B22C96B4E00E638D7 /* GEOSwift+MapKit.swift */; };
 		49B1182D22C96B4E00E638D7 /* GEOSwift+MapKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 49B1182B22C96B4E00E638D7 /* GEOSwift+MapKit.swift */; };
 		49B1182E22C96B4E00E638D7 /* GEOSwift+MapKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 49B1182B22C96B4E00E638D7 /* GEOSwift+MapKit.swift */; };
@@ -628,6 +632,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				49A3DE2E2378E65A0031B8CD /* GEOSwift+MapKitQuickLook.swift in Sources */,
 				49B1182D22C96B4E00E638D7 /* GEOSwift+MapKit.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -637,6 +642,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				49CF3D7022D10BC10076F6E5 /* MapKit+Equatable.swift in Sources */,
+				49A3DE2C2378E6520031B8CD /* QuickLookTests.swift in Sources */,
 				49CF3D7822D10BDB0076F6E5 /* GEOSwift+MapKitTests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -645,6 +651,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				49A3DE2F2378E65B0031B8CD /* GEOSwift+MapKitQuickLook.swift in Sources */,
 				49B1182E22C96B4E00E638D7 /* GEOSwift+MapKit.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -654,6 +661,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				49CF3D7122D10BC10076F6E5 /* MapKit+Equatable.swift in Sources */,
+				49A3DE2D2378E6550031B8CD /* QuickLookTests.swift in Sources */,
 				49CF3D7922D10BDB0076F6E5 /* GEOSwift+MapKitTests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
diff --git a/GEOSwiftMapKit/GEOSwift+MapKitQuickLook.swift b/GEOSwiftMapKit/GEOSwift+MapKitQuickLook.swift
@@ -1,3 +1,5 @@
+#if os(iOS)
+
 import UIKit
 import MapKit
 import GEOSwift
@@ -178,3 +180,5 @@ private extension MKMapView {
         return snapshotImage
     }
 }
+
+#endif
diff --git a/GEOSwiftMapKit/Info.plist b/GEOSwiftMapKit/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.0</string>
+	<string>1.2.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 </dict>
diff --git a/GEOSwiftMapKitTests/QuickLookTests.swift b/GEOSwiftMapKitTests/QuickLookTests.swift
@@ -1,3 +1,6 @@
+// Exclude these tests when running in Swift PM because it doesn't support bundle resources yet
+#if !SWIFT_PACKAGE && os(iOS)
+
 import XCTest
 import MapKit
 import GEOSwift
@@ -156,3 +159,5 @@ final class QuickLookTests: XCTestCase {
         }
     }
 }
+
+#endif
diff --git a/Package.resolved b/Package.resolved
diff --git a/Package.swift b/Package.swift
@@ -0,0 +1,24 @@
+// swift-tools-version:5.1
+import PackageDescription
+
+let package = Package(
+  name: "GEOSwiftMapKit",
+  products: [
+    .library(name: "GEOSwiftMapKit", targets: ["GEOSwiftMapKit"])
+  ],
+  dependencies: [
+    .package(url: "https://github.com/GEOSwift/GEOSwift.git", from: "6.0.0")
+  ],
+  targets: [
+    .target(
+      name: "GEOSwiftMapKit",
+      dependencies: ["GEOSwift"],
+      path: "./GEOSwiftMapKit/"
+    ),
+    .testTarget(
+      name: "GEOSwiftMapKitTests",
+      dependencies: ["GEOSwiftMapKit"],
+      path: "./GEOSwiftMapKitTests/"
+    )
+  ]
+)
diff --git a/README.md b/README.md
@@ -2,6 +2,7 @@
 
 [![Cocoapods Compatible](https://img.shields.io/cocoapods/v/GEOSwiftMapKit)](https://cocoapods.org/pods/GEOSwiftMapKit)
 [![Carthage Compatible](https://img.shields.io/badge/Carthage-compatible-brightgreen)](https://github.com/Carthage/Carthage)
+[![SwiftPM Compatible](https://img.shields.io/badge/SwiftPM-compatible-4BC51D.svg?style=flat)](https://swift.org/package-manager/)
 [![Supported Platforms](https://img.shields.io/cocoapods/p/GEOSwiftMapKit)](https://github.com/GEOSwift/GEOSwiftMapKit)
 [![Build Status](https://img.shields.io/travis/GEOSwift/GEOSwiftMapKit/master)](https://travis-ci.org/GEOSwift/GEOSwiftMapKit)
 [![Code Coverage](https://img.shields.io/codecov/c/github/GEOSwift/GEOSwiftMapKit/master)](https://codecov.io/gh/GEOSwift/GEOSwiftMapKit)
@@ -10,41 +11,47 @@ See [GEOSwift](https://github.com/GEOSwift/GEOSwift) for full details
 
 ## Requirements
 
-* iOS 8.0+, tvOS 9.2+, macOS 10.9+
-* Xcode 10.2
-* Swift 5.0
+* iOS 8.0+, tvOS 9.2+, macOS 10.9+ (CocoaPods, Carthage, Swift PM)
+* Swift 5.1
+
+> GEOS is licensed under LGPL 2.1 and its compatibility with static linking is
+at least controversial. Use of geos without dynamic linking is discouraged.
 
 ## Installation
 
 ### CocoaPods
 
-1. Install autotools: `$ brew install autoconf automake libtool`
-2. Update your `Podfile` to include:
-
-```
-use_frameworks!
-pod 'GEOSwiftMapKit'
-```
+1. Update your `Podfile` to include:
 
-3. Run `$ pod install`
+        use_frameworks!
+        pod 'GEOSwiftMapKit'
 
-> GEOS is a configure/install project licensed under LGPL 2.1: it is difficult to build for iOS and its compatibility with static linking is at least controversial. Use of GEOSwift without dynamic-framework-based CocoaPods and with a project targeting iOS 7, even if possible, is advised against.
+2. Run `$ pod install`
 
 ### Carthage
 
-1. Install autotools: `$ brew install autoconf automake libtool`
-2. Add the following to your Cartfile:
+1. Add the following to your Cartfile:
 
-```
-github "GEOSwift/GEOSwiftMapKit" ~> 1.1.0
-```
+        github "GEOSwift/GEOSwiftMapKit" ~> 1.2.0
 
-3. Finish updating your project by following the [typical Carthage
+2. Finish updating your project by following the [typical Carthage
 workflow](https://github.com/Carthage/Carthage#quick-start).
 
+### Swift Package Manager
+
+1. Update the top-level dependencies in your `Package.swift` to include:
+
+        .package(url: "https://github.com/GEOSwift/GEOSwiftMapKit.git", from: "1.2.0")
+
+2. Update the target dependencies in your `Package.swift` to include
+
+        "GEOSwiftMapKit"
+
 ### Playground
 
-Explore more, interactively, in the playground. It can be found inside `GEOSwiftMapKit` workspace. Open the workspace in Xcode, build the `GEOSwiftMapKit` framework and open the playground file.
+Explore more, interactively, in the playground. It can be found inside
+`GEOSwiftMapKit` workspace. Open the workspace in Xcode, build the
+`GEOSwiftMapKit` framework and open the playground file.
 
 ![Playground](/README-images/playground.png)
 
@@ -53,12 +60,15 @@ Explore more, interactively, in the playground. It can be found inside `GEOSwift
 To make a contribution:
 
 * Fork the repo
-* Start from the `develop` branch and create a branch with a name that describes your contribution
+* Start from the `develop` branch and create a branch with a name that describes
+  your contribution
 * Run `$ carthage update`
-* Sign in to travis-ci.org (if you've never signed in before, CI won't run to verify your pull request)
+* Sign in to travis-ci.org (if you've never signed in before, CI won't run to
+  verify your pull request)
 * Push your branch and create a pull request to develop
 * One of the maintainers will review your code and may request changes
-* If your pull request is accepted, one of the maintainers should update the changelog before merging it
+* If your pull request is accepted, one of the maintainers should update the
+  changelog before merging it
 
 ## Maintainer
 
@@ -67,9 +77,19 @@ To make a contribution:
 ## Past Maintainers
 
 * Virgilio Favero Neto ([@vfn](https://github.com/vfn))
-* Andrea Cremaschi ([@andreacremaschi](https://twitter.com/andreacremaschi)) (original author)
+* Andrea Cremaschi ([@andreacremaschi](https://twitter.com/andreacremaschi))
+  (original author)
 
 ## License
 
-* GEOSwift was released by Andrea Cremaschi ([@andreacremaschi](https://twitter.com/andreacremaschi)) under a MIT license. See LICENSE for more information.
-* [GEOS](http://trac.osgeo.org/geos/) stands for Geometry Engine - Open Source, and is a C++ library, ported from the [Java Topology Suite](http://sourceforge.net/projects/jts-topo-suite/). GEOS implements the OpenGIS [Simple Features for SQL](http://www.opengeospatial.org/standards/sfs) spatial predicate functions and spatial operators. GEOS, now an OSGeo project, was initially developed and maintained by [Refractions Research](http://www.refractions.net/) of Victoria, Canada.
+* GEOSwift was released by Andrea Cremaschi
+  ([@andreacremaschi](https://twitter.com/andreacremaschi)) under a MIT license.
+  See LICENSE for more information.
+* [GEOS](http://trac.osgeo.org/geos/) stands for Geometry Engine - Open Source,
+  and is a C++ library, ported from the
+  [Java Topology Suite](http://sourceforge.net/projects/jts-topo-suite/). GEOS
+  implements the OpenGIS
+  [Simple Features for SQL](http://www.opengeospatial.org/standards/sfs) spatial
+  predicate functions and spatial operators. GEOS, now an OSGeo project, was
+  initially developed and maintained by
+  [Refractions Research](http://www.refractions.net/) of Victoria, Canada.

Original file line number	Diff line number	Diff line change
`@@ -30,3 +30,4 @@ Carthage/Build`
`30`	`30`	`# Swift Package Manager`
`31`	`31`
`32`	`32`	`.build/`
	`33`	`+.swiftpm/`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-github "GEOSwift/GEOSwift" ~> 5.0`
	`1`	`+github "GEOSwift/GEOSwift" ~> 6.0`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+#if os(iOS)`
	`2`	`+`
`1`	`3`	`import UIKit`
`2`	`4`	`import MapKit`
`3`	`5`	`import GEOSwift`
`@@ -178,3 +180,5 @@ private extension MKMapView {`
`178`	`180`	`return snapshotImage`
`179`	`181`	`}`
`180`	`182`	`}`
	`183`	`+`
	`184`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,6 @@`
	`1`	`+// Exclude these tests when running in Swift PM because it doesn't support bundle resources yet`
	`2`	`+#if !SWIFT_PACKAGE && os(iOS)`
	`3`	`+`
`1`	`4`	`import XCTest`
`2`	`5`	`import MapKit`
`3`	`6`	`import GEOSwift`
`@@ -156,3 +159,5 @@ final class QuickLookTests: XCTestCase {`
`156`	`159`	`}`
`157`	`160`	`}`
`158`	`161`	`}`
	`162`	`+`
	`163`	`+#endif`