Skip to content
This repository was archived by the owner on Oct 7, 2024. It is now read-only.

Commit fbb10c7

Browse files
macdrevxdavenquinn
macdrevx
and
davenquinn
authored
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]>
1 parent 9cac7a9 commit fbb10c7

33 files changed

+866
-2800
lines changed

‎.codecov.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
coverage:
3+
status:
4+
patch: false

‎.gitignore

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# Mac
2-
#
2+
33
.DS_Store
44

55
# Xcode
6-
#
6+
77
build/
88
*.pbxuser
99
!default.pbxuser
@@ -23,14 +23,5 @@ DerivedData
2323
*.xctimeline
2424

2525
# CocoaPods
26-
#
27-
# We recommend against adding the Pods directory to your .gitignore. However
28-
# you should judge for yourself, the pros and cons are mentioned at:
29-
# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
30-
#
31-
Pods/
3226

33-
# Carthage
34-
#
35-
# Add this line if you want to avoid checking in source code from Carthage dependencies.
36-
# Carthage/Checkouts
27+
Pods/

‎.ruby-version

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎.swiftlint.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
---
2+
included:
3+
- GEOSwiftMapboxGL
4+
- GEOSwiftMapboxGLTests
5+
disabled_rules:
6+
- force_cast
7+
- identifier_name
8+
- type_name
9+
opt_in_rules:
10+
- closure_spacing
11+
- empty_count
12+
- implicit_return
13+
- pattern_matching_keywords
14+
- vertical_parameter_alignment_on_call
15+
line_length: 110

‎.travis.yml

Lines changed: 18 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,29 @@
1-
language: objective-c
1+
---
2+
os: osx
3+
osx_image: xcode12.3
4+
language: shell
5+
cache: cocoapods
26

37
before_install:
4-
- gem install xcpretty
5-
- gem install cocoapods -v '1.2.1'
8+
- brew upgrade swiftlint
9+
- gem install xcpretty cocoapods
10+
- echo "machine api.mapbox.com
11+
login mapbox
12+
password $MAPBOX_SDK_REGISTRY_TOKEN" > ~/.netrc
613
- pod repo update
7-
8-
osx_image: xcode9
9-
10-
cache: cocoapods
11-
12-
env:
13-
global:
14-
- WORKSPACE=GEOSwiftMapboxGL.xcworkspace
15-
- SCHEME=GEOSwiftMapboxGL
16-
- SDK=iphonesimulator11.0
17-
matrix:
18-
# - DESTINATION="OS=10.3,name=iPhone 6"
19-
- DESTINATION="OS=11.0,name=iPhone 6"
20-
# - DESTINATION="OS=8.3,name=iPhone 6"
14+
- pod install
2115

2216
script:
2317
- set -o pipefail
24-
- xcodebuild -version
25-
- xcodebuild -showsdks
26-
18+
- swiftlint
2719
- xcodebuild
28-
-workspace "$WORKSPACE"
29-
-scheme "$SCHEME"
30-
-sdk "$SDK"
31-
-destination "$DESTINATION"
20+
-workspace GEOSwiftMapboxGL.xcworkspace
21+
-scheme GEOSwiftMapboxGL
22+
-sdk iphonesimulator14.3
23+
-destination "platform=iOS Simulator,OS=14.3,name=iPhone 11"
3224
-configuration Debug
3325
ONLY_ACTIVE_ARCH=YES
3426
clean test | xcpretty -c;
3527

36-
- xcodebuild
37-
-workspace "$WORKSPACE"
38-
-scheme "$SCHEME"
39-
-sdk "$SDK"
40-
-destination "$DESTINATION"
41-
-configuration Release
42-
ONLY_ACTIVE_ARCH=YES
43-
ENABLE_TESTABILITY=YES
44-
clean test | xcpretty -c;
28+
after_success:
29+
- bash <(curl -s https://codecov.io/bash) -J '^GEOSwiftMapboxGL$';

‎CHANGELOG.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
## Develop
1+
## 2.0.0
22

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

‎GEOSwiftMapboxGL.podspec

Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,26 @@
11
Pod::Spec.new do |s|
2-
3-
s.name = "GEOSwiftMapboxGL"
4-
s.version = "1.0.1"
5-
s.summary = "GEOSwiftMapboxGL is adds MapBoxGL to GEOSwift."
6-
7-
s.homepage = "https://github.com/GEOSwift/GEOSwiftMapboxGL"
8-
s.license = { :type => "MIT", :file => "LICENSE" }
9-
s.author = { "GEOSwift team" => "https://github.com/orgs/GEOSwift/people" }
10-
11-
s.source = { :git => "https://github.com/GEOSwift/GEOSwiftMapboxGL.git", :tag => s.version }
12-
s.source_files = "GEOSwiftMapboxGL/*"
13-
14-
s.platform = :ios, "8.0"
15-
16-
s.dependency "GEOSwift", '~> 2.2'
17-
s.dependency "Mapbox-iOS-SDK"
18-
2+
s.name = 'GEOSwiftMapboxGL'
3+
s.version = '2.0.0'
4+
s.swift_version = '5.1'
5+
s.cocoapods_version = '>= 1.4.0'
6+
s.summary = 'MapKit support for GEOSwift'
7+
s.description = <<~DESC
8+
Easily handle a geometric object model (points, linestrings, polygons etc.) and related
9+
topological operations (intersections, overlapping etc.). A type-safe, MIT-licensed Swift
10+
interface to the OSGeo's GEOS library routines, nicely integrated with MapboxGL.
11+
DESC
12+
s.homepage = 'https://github.com/GEOSwift/GEOSwiftMapboxGL'
13+
s.license = {
14+
type: 'MIT',
15+
file: 'LICENSE'
16+
}
17+
s.author = { 'GEOSwift team' => 'https://github.com/orgs/GEOSwift/people' }
18+
s.platforms = { ios: '9.0' }
19+
s.source = {
20+
git: 'https://github.com/GEOSwift/GEOSwiftMapboxGL.git',
21+
tag: s.version
22+
}
23+
s.source_files = 'GEOSwiftMapboxGL/*.{swift,h}'
24+
s.dependency 'GEOSwift', '~> 8.0'
25+
s.dependency 'Mapbox-iOS-SDK', '~> 6.0'
1926
end

‎GEOSwiftMapboxGL.xcodeproj/project.pbxproj

Lines changed: 119 additions & 191 deletions
Large diffs are not rendered by default.

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

‎GEOSwiftMapboxGL.xcodeproj/xcshareddata/xcschemes/GEOSwiftMapboxGL.xcscheme

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0830"
3+
LastUpgradeVersion = "1230"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,7 +26,27 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
shouldUseLaunchSchemeArgsEnv = "YES">
29+
shouldUseLaunchSchemeArgsEnv = "YES"
30+
codeCoverageEnabled = "YES"
31+
onlyGenerateCoverageForSpecifiedTargets = "YES">
32+
<MacroExpansion>
33+
<BuildableReference
34+
BuildableIdentifier = "primary"
35+
BlueprintIdentifier = "CD2299831B10B506002C19AE"
36+
BuildableName = "GEOSwiftMapboxGL.framework"
37+
BlueprintName = "GEOSwiftMapboxGL"
38+
ReferencedContainer = "container:GEOSwiftMapboxGL.xcodeproj">
39+
</BuildableReference>
40+
</MacroExpansion>
41+
<CodeCoverageTargets>
42+
<BuildableReference
43+
BuildableIdentifier = "primary"
44+
BlueprintIdentifier = "CD2299831B10B506002C19AE"
45+
BuildableName = "GEOSwiftMapboxGL.framework"
46+
BlueprintName = "GEOSwiftMapboxGL"
47+
ReferencedContainer = "container:GEOSwiftMapboxGL.xcodeproj">
48+
</BuildableReference>
49+
</CodeCoverageTargets>
3050
<Testables>
3151
<TestableReference
3252
skipped = "NO">
@@ -39,17 +59,6 @@
3959
</BuildableReference>
4060
</TestableReference>
4161
</Testables>
42-
<MacroExpansion>
43-
<BuildableReference
44-
BuildableIdentifier = "primary"
45-
BlueprintIdentifier = "CD2299831B10B506002C19AE"
46-
BuildableName = "GEOSwiftMapboxGL.framework"
47-
BlueprintName = "GEOSwiftMapboxGL"
48-
ReferencedContainer = "container:GEOSwiftMapboxGL.xcodeproj">
49-
</BuildableReference>
50-
</MacroExpansion>
51-
<AdditionalOptions>
52-
</AdditionalOptions>
5362
</TestAction>
5463
<LaunchAction
5564
buildConfiguration = "Debug"
@@ -70,8 +79,6 @@
7079
ReferencedContainer = "container:GEOSwiftMapboxGL.xcodeproj">
7180
</BuildableReference>
7281
</MacroExpansion>
73-
<AdditionalOptions>
74-
</AdditionalOptions>
7582
</LaunchAction>
7683
<ProfileAction
7784
buildConfiguration = "Release"

‎GEOSwiftMapboxGL.xcodeproj/xcshareddata/xcschemes/GEOSwiftMapboxGLTests.xcscheme

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1230"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
</BuildAction>
9+
<TestAction
10+
buildConfiguration = "Debug"
11+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
12+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
13+
shouldUseLaunchSchemeArgsEnv = "YES">
14+
<Testables>
15+
<TestableReference
16+
skipped = "NO">
17+
<BuildableReference
18+
BuildableIdentifier = "primary"
19+
BlueprintIdentifier = "CD22998D1B10B506002C19AE"
20+
BuildableName = "GEOSwiftMapboxGLTests.xctest"
21+
BlueprintName = "GEOSwiftMapboxGLTests"
22+
ReferencedContainer = "container:GEOSwiftMapboxGL.xcodeproj">
23+
</BuildableReference>
24+
</TestableReference>
25+
</Testables>
26+
</TestAction>
27+
<LaunchAction
28+
buildConfiguration = "Debug"
29+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
30+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
31+
launchStyle = "0"
32+
useCustomWorkingDirectory = "NO"
33+
ignoresPersistentStateOnLaunch = "NO"
34+
debugDocumentVersioning = "YES"
35+
debugServiceExtension = "internal"
36+
allowLocationSimulation = "YES">
37+
</LaunchAction>
38+
<ProfileAction
39+
buildConfiguration = "Release"
40+
shouldUseLaunchSchemeArgsEnv = "YES"
41+
savedToolIdentifier = ""
42+
useCustomWorkingDirectory = "NO"
43+
debugDocumentVersioning = "YES">
44+
</ProfileAction>
45+
<AnalyzeAction
46+
buildConfiguration = "Debug">
47+
</AnalyzeAction>
48+
<ArchiveAction
49+
buildConfiguration = "Release"
50+
revealArchiveInOrganizer = "YES">
51+
</ArchiveAction>
52+
</Scheme>

‎GEOSwiftMapboxGL.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

0 commit comments

Comments
 (0)