Merge pull request #9 from GEOSwift/misc-updates

macdrevx · web-flow · commit b912fa662502 · 2020-03-23T21:07:06.000-04:00
Misc updates
diff --git a/.codecov.yml b/.codecov.yml
@@ -1,3 +1,4 @@
+---
 coverage:
   status:
-    patch: off
+    patch: false
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -1,3 +1,4 @@
+---
 included:
   - GEOSwiftMapKit
   - GEOSwiftMapKitTests
diff --git a/.travis.yml b/.travis.yml
@@ -1,52 +1,36 @@
 ---
-language: objective-c
-
-osx_image: xcode11.1
+os: osx
+osx_image: xcode11.3
+language: minimal
 
 cache:
   directories:
     - Carthage
 
-env:
-  global:
-    - WORKSPACE=GEOSwiftMapKit.xcworkspace
-  matrix:
-    - PLATFORM=iOS
-      SCHEME=GEOSwiftMapKit-iOS
-      SDK=iphonesimulator13.1
-      DESTINATION="platform=iOS Simulator,OS=13.1,name=iPhone 11"
-      RUN_CODECOV=true
-    - PLATFORM=tvOS
-      SCHEME=GEOSwiftMapKit-tvOS
-      SDK=appletvsimulator13.0
-      DESTINATION="platform=tvOS Simulator,OS=13.0,name=Apple TV"
-      RUN_CODECOV=false
-    - PLATFORM=macOS
-      SCHEME=GEOSwiftMapKit-macOS
-      SDK=macosx10.15
-      DESTINATION="platform=OS X"
-      RUN_CODECOV=false
-
-before_install:
-  - brew install carthage swiftlint
-  - gem install xcpretty
-  - travis_wait 30 carthage update
-      --cache-builds
-      --platform "$PLATFORM"
-      --no-use-binaries
-
-script:
-  - set -o pipefail
-  - xcodebuild
-      -workspace "$WORKSPACE"
-      -scheme "$SCHEME"
-      -sdk "$SDK"
-      -destination "$DESTINATION"
-      -configuration Debug
-      ONLY_ACTIVE_ARCH=YES
-      clean test | xcpretty -c;
+jobs:
+  include:
+    - name: iOS - xcodebuild
+      env: PLATFORM=iOS
+           SCHEME=GEOSwiftMapKit-iOS
+           SDK=iphonesimulator13.2
+           DESTINATION="platform=iOS Simulator,OS=13.3,name=iPhone 11"
+           WORKSPACE=GEOSwiftMapKit.xcworkspace
+           RUN_CODECOV=true
+    - name: tvOS - xcodebuild
+      env: PLATFORM=tvOS
+           SCHEME=GEOSwiftMapKit-tvOS
+           SDK=appletvsimulator13.2
+           DESTINATION="platform=tvOS Simulator,OS=13.3,name=Apple TV"
+           WORKSPACE=GEOSwiftMapKit.xcworkspace
+    - name: macOS - xcodebuild
+      env: PLATFORM=macOS
+           SCHEME=GEOSwiftMapKit-macOS
+           SDK=macosx10.15
+           DESTINATION="platform=OS X"
+           WORKSPACE=GEOSwiftMapKit.xcworkspace
+    - name: macOS - SPM
+      env: USE_SPM=true
 
-after_success:
-  - if [ "${RUN_CODECOV}" = "true" ]; then
-      bash <(curl -s https://codecov.io/bash) -J '^GEOSwiftMapKit$';
-    fi
+before_install: travis_wait 30 ./scripts/travis_before_install.sh
+script: ./scripts/travis_script.sh
+after_success: ./scripts/travis_after_success.sh
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.0.0
+
+* [#8](https://github.com/GEOSwift/GEOSwiftMapKit/pull/8) Update to GEOSwift 7
+
 ## 1.2.0
 
 * [#7](https://github.com/GEOSwift/GEOSwiftMapKit/pull/7) Swift PM Support
diff --git a/Cartfile b/Cartfile
@@ -1 +1 @@
-github "GEOSwift/GEOSwift" ~> 6.0
+github "GEOSwift/GEOSwift" ~> 7.0
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,2 +1,2 @@
-github "GEOSwift/GEOSwift" "6.0.0"
-github "GEOSwift/geos" "4.1.0"
+github "GEOSwift/GEOSwift" "7.0.0"
+github "GEOSwift/geos" "5.0.0"
diff --git a/GEOSwiftMapKit.podspec b/GEOSwiftMapKit.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'GEOSwiftMapKit'
-  s.version = '1.2.0'
+  s.version = '2.0.0'
   s.swift_version = '5.1'
   s.cocoapods_version = '>= 1.4.0'
   s.summary = 'MapKit support for GEOSwift'
@@ -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', '~> 6.0'
+  s.dependency 'GEOSwift', '~> 7.0'
 end
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.2.0</string>
+	<string>2.0.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 </dict>
diff --git a/GEOSwiftMapKitTests/.swiftlint.yml b/GEOSwiftMapKitTests/.swiftlint.yml
@@ -1,3 +1,4 @@
+---
 disabled_rules:
   - force_try
   - type_body_length
diff --git a/Package.resolved b/Package.resolved
@@ -6,17 +6,17 @@
         "repositoryURL": "https://github.com/GEOSwift/geos.git",
         "state": {
           "branch": null,
-          "revision": "4285f0903eacafd98705f047519c16e9dd09aba2",
-          "version": "4.1.0"
+          "revision": "083e366bc831d0f951974151315383830a79d447",
+          "version": "5.0.0"
         }
       },
       {
         "package": "GEOSwift",
         "repositoryURL": "https://github.com/GEOSwift/GEOSwift.git",
         "state": {
           "branch": null,
-          "revision": "dfc9da755f8966dae4b97073d7c2301065cbbbc1",
-          "version": "6.0.0"
+          "revision": "fc208fd843a4ff3caf214845a123b9a6247d82ea",
+          "version": "7.0.0"
         }
       }
     ]
diff --git a/Package.swift b/Package.swift
@@ -7,7 +7,7 @@ let package = Package(
     .library(name: "GEOSwiftMapKit", targets: ["GEOSwiftMapKit"])
   ],
   dependencies: [
-    .package(url: "https://github.com/GEOSwift/GEOSwift.git", from: "6.0.0")
+    .package(url: "https://github.com/GEOSwift/GEOSwift.git", from: "7.0.0")
   ],
   targets: [
     .target(
diff --git a/README.md b/README.md
@@ -32,7 +32,7 @@ at least controversial. Use of geos without dynamic linking is discouraged.
 
 1. Add the following to your Cartfile:
 
-        github "GEOSwift/GEOSwiftMapKit" ~> 1.2.0
+        github "GEOSwift/GEOSwiftMapKit" ~> 2.0.0
 
 2. Finish updating your project by following the [typical Carthage
 workflow](https://github.com/Carthage/Carthage#quick-start).
@@ -41,7 +41,7 @@ workflow](https://github.com/Carthage/Carthage#quick-start).
 
 1. Update the top-level dependencies in your `Package.swift` to include:
 
-        .package(url: "https://github.com/GEOSwift/GEOSwiftMapKit.git", from: "1.2.0")
+        .package(url: "https://github.com/GEOSwift/GEOSwiftMapKit.git", from: "2.0.0")
 
 2. Update the target dependencies in your `Package.swift` to include
 
diff --git a/scripts/travis_after_success.sh b/scripts/travis_after_success.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+set -evo pipefail
+
+if [[ $RUN_CODECOV = 'true' ]]; then
+  bash <(curl -s https://codecov.io/bash) -J '^GEOSwiftMapKit$';
+fi
diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+set -evo pipefail
+
+if [[ $USE_SPM != 'true' ]]; then
+  brew upgrade carthage swiftlint
+  gem install xcpretty
+  carthage update \
+    --cache-builds \
+    --platform "$PLATFORM" \
+    --no-use-binaries
+fi
diff --git a/scripts/travis_script.sh b/scripts/travis_script.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+set -evo pipefail
+
+if [[ $USE_SPM = 'true' ]]; then
+  swift test --enable-test-discovery
+else
+  xcodebuild \
+    -workspace "$WORKSPACE" \
+    -scheme "$SCHEME" \
+    -sdk "$SDK" \
+    -destination "$DESTINATION" \
+    -configuration Debug \
+    ONLY_ACTIVE_ARCH=YES \
+    clean test | xcpretty -c;
+fi

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+---`
`1`	`2`	`included:`
`2`	`3`	`- GEOSwiftMapKit`
`3`	`4`	`- GEOSwiftMapKitTests`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-github "GEOSwift/GEOSwift" ~> 6.0`
	`1`	`+github "GEOSwift/GEOSwift" ~> 7.0`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+---`
`1`	`2`	`disabled_rules:`
`2`	`3`	`- force_try`
`3`	`4`	`- type_body_length`
Original file line number	Diff line number	Diff line change
`@@ -6,17 +6,17 @@`
`6`	`6`	`"repositoryURL": "https://github.com/GEOSwift/geos.git",`
`7`	`7`	`"state": {`
`8`	`8`	`"branch": null,`
`9`		`- "revision": "4285f0903eacafd98705f047519c16e9dd09aba2",`
`10`		`- "version": "4.1.0"`
	`9`	`+ "revision": "083e366bc831d0f951974151315383830a79d447",`
	`10`	`+ "version": "5.0.0"`
`11`	`11`	`}`
`12`	`12`	`},`
`13`	`13`	`{`
`14`	`14`	`"package": "GEOSwift",`
`15`	`15`	`"repositoryURL": "https://github.com/GEOSwift/GEOSwift.git",`
`16`	`16`	`"state": {`
`17`	`17`	`"branch": null,`
`18`		`- "revision": "dfc9da755f8966dae4b97073d7c2301065cbbbc1",`
`19`		`- "version": "6.0.0"`
	`18`	`+ "revision": "fc208fd843a4ff3caf214845a123b9a6247d82ea",`
	`19`	`+ "version": "7.0.0"`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`	`]`