Updated for Swift 5, GEOSwift 8, MapboxGL 6 (#12)

- Increased consistency with GEOSwiftMapkit
- Configured swiftlint
- Updated CI for Xcode 12.3

Co-authored-by: Daven Quinn <[email protected]>

.codecov.yml

@@ -0,0 +1,4 @@
+---
+coverage:
+  status:
+    patch: false

.gitignore

@@ -1,9 +1,9 @@
 # Mac
-#
+
 .DS_Store
 
 # Xcode
-#
+
 build/
 *.pbxuser
 !default.pbxuser
@@ -23,14 +23,5 @@ DerivedData
 *.xctimeline
 
 # CocoaPods
-#
-# We recommend against adding the Pods directory to your .gitignore. However
-# you should judge for yourself, the pros and cons are mentioned at:
-# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
-#
-Pods/
 
-# Carthage
-#
-# Add this line if you want to avoid checking in source code from Carthage dependencies.
-# Carthage/Checkouts
+Pods/

.swiftlint.yml

@@ -0,0 +1,15 @@
+---
+included:
+  - GEOSwiftMapboxGL
+  - GEOSwiftMapboxGLTests
+disabled_rules:
+  - force_cast
+  - identifier_name
+  - type_name
+opt_in_rules:
+  - closure_spacing
+  - empty_count
+  - implicit_return
+  - pattern_matching_keywords
+  - vertical_parameter_alignment_on_call
+line_length: 110

.travis.yml

@@ -1,44 +1,29 @@
-language: objective-c
+---
+os: osx
+osx_image: xcode12.3
+language: shell
+cache: cocoapods
 
 before_install:
-  - gem install xcpretty
-  - gem install cocoapods -v '1.2.1'
+  - brew upgrade swiftlint
+  - gem install xcpretty cocoapods
+  - echo "machine api.mapbox.com
+      login mapbox
+      password $MAPBOX_SDK_REGISTRY_TOKEN" > ~/.netrc
   - pod repo update
-
-osx_image: xcode9
-
-cache: cocoapods
-
-env:
-  global:
-    - WORKSPACE=GEOSwiftMapboxGL.xcworkspace
-    - SCHEME=GEOSwiftMapboxGL
-    - SDK=iphonesimulator11.0
-  matrix:
-    # - DESTINATION="OS=10.3,name=iPhone 6"
-    - DESTINATION="OS=11.0,name=iPhone 6"
-    # - DESTINATION="OS=8.3,name=iPhone 6"
+  - pod install
 
 script:
   - set -o pipefail
-  - xcodebuild -version
-  - xcodebuild -showsdks
-
+  - swiftlint
   - xcodebuild
-    -workspace "$WORKSPACE"
-    -scheme "$SCHEME"
-    -sdk "$SDK"
-    -destination "$DESTINATION"
+    -workspace GEOSwiftMapboxGL.xcworkspace
+    -scheme GEOSwiftMapboxGL
+    -sdk iphonesimulator14.3
+    -destination "platform=iOS Simulator,OS=14.3,name=iPhone 11"
     -configuration Debug
     ONLY_ACTIVE_ARCH=YES
     clean test | xcpretty -c;
 
-  - xcodebuild
-    -workspace "$WORKSPACE"
-    -scheme "$SCHEME"
-    -sdk "$SDK"
-    -destination "$DESTINATION"
-    -configuration Release
-    ONLY_ACTIVE_ARCH=YES
-    ENABLE_TESTABILITY=YES
-    clean test | xcpretty -c;
+after_success:
+  - bash <(curl -s https://codecov.io/bash) -J '^GEOSwiftMapboxGL$';

CHANGELOG.md

@@ -1,5 +1,4 @@
-## Develop
+## 2.0.0
 
-##### Breaking
-
-##### Enhancements
+* [#11](https://github.com/GEOSwift/GEOSwiftMapboxGL/pull/11) Updated to
+  GEOSwift 8, Swift 5, MapboxGL 6

GEOSwiftMapboxGL.podspec

@@ -1,19 +1,26 @@
 Pod::Spec.new do |s|
-
-  s.name         = "GEOSwiftMapboxGL"
-  s.version      = "1.0.1"
-  s.summary      = "GEOSwiftMapboxGL is adds MapBoxGL to GEOSwift."
-
-  s.homepage     = "https://github.com/GEOSwift/GEOSwiftMapboxGL"
-  s.license      = { :type => "MIT", :file => "LICENSE" }
-  s.author       = { "GEOSwift team" => "https://github.com/orgs/GEOSwift/people" }
-
-  s.source       = { :git => "https://github.com/GEOSwift/GEOSwiftMapboxGL.git", :tag => s.version }
-  s.source_files = "GEOSwiftMapboxGL/*"
-
-  s.platform     = :ios, "8.0"
-
-  s.dependency "GEOSwift", '~> 2.2'
-  s.dependency "Mapbox-iOS-SDK"
-
+  s.name = 'GEOSwiftMapboxGL'
+  s.version = '2.0.0'
+  s.swift_version = '5.1'
+  s.cocoapods_version = '>= 1.4.0'
+  s.summary = 'MapKit support for GEOSwift'
+  s.description  = <<~DESC
+    Easily handle a geometric object model (points, linestrings, polygons etc.) and related
+    topological operations (intersections, overlapping etc.). A type-safe, MIT-licensed Swift
+    interface to the OSGeo's GEOS library routines, nicely integrated with MapboxGL.
+  DESC
+  s.homepage = 'https://github.com/GEOSwift/GEOSwiftMapboxGL'
+  s.license = {
+    type: 'MIT',
+    file: 'LICENSE'
+  }
+  s.author = { 'GEOSwift team' => 'https://github.com/orgs/GEOSwift/people' }
+  s.platforms = { ios: '9.0' }
+  s.source = {
+    git: 'https://github.com/GEOSwift/GEOSwiftMapboxGL.git',
+    tag: s.version
+  }
+  s.source_files = 'GEOSwiftMapboxGL/*.{swift,h}'
+  s.dependency 'GEOSwift', '~> 8.0'
+  s.dependency 'Mapbox-iOS-SDK', '~> 6.0'
 end

GEOSwiftMapboxGL.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

GEOSwiftMapboxGL.xcodeproj/xcshareddata/xcschemes/GEOSwiftMapboxGL.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0830"
+   LastUpgradeVersion = "1230"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,7 +26,27 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES"
+      onlyGenerateCoverageForSpecifiedTargets = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "CD2299831B10B506002C19AE"
+            BuildableName = "GEOSwiftMapboxGL.framework"
+            BlueprintName = "GEOSwiftMapboxGL"
+            ReferencedContainer = "container:GEOSwiftMapboxGL.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <CodeCoverageTargets>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "CD2299831B10B506002C19AE"
+            BuildableName = "GEOSwiftMapboxGL.framework"
+            BlueprintName = "GEOSwiftMapboxGL"
+            ReferencedContainer = "container:GEOSwiftMapboxGL.xcodeproj">
+         </BuildableReference>
+      </CodeCoverageTargets>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -39,17 +59,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "CD2299831B10B506002C19AE"
-            BuildableName = "GEOSwiftMapboxGL.framework"
-            BlueprintName = "GEOSwiftMapboxGL"
-            ReferencedContainer = "container:GEOSwiftMapboxGL.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -70,8 +79,6 @@
             ReferencedContainer = "container:GEOSwiftMapboxGL.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

GEOSwiftMapboxGL.xcodeproj/xcshareddata/xcschemes/GEOSwiftMapboxGLTests.xcscheme

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1230"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "CD22998D1B10B506002C19AE"
+               BuildableName = "GEOSwiftMapboxGLTests.xctest"
+               BlueprintName = "GEOSwiftMapboxGLTests"
+               ReferencedContainer = "container:GEOSwiftMapboxGL.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

GEOSwiftMapboxGL.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>