Skip to content

Commit bf6ae84

Browse files
macdrevxmacdrevx
committed
Updates for Xcode 12
- Drops support for iOS 8 - Switches to SPM as primary development environment - Updates GEOSwiftMapKit.xcodeproj to use GEOSwift.xcframework and geos.xcframework instead of the old-style fat frameworks due to a change in Xcode 12.3. This breaks (hopefully only temporarily) compatibility with Carthage unless you use the as-of-yet-unreleased Carthage version which adds the `--use-xcframeworks` flag. Carthage support will be reevaluated as its situation evolves. - Increases min GEOSwift to 8.0.0
1 parent 21c295e commit bf6ae84

29 files changed

+142
-323
lines changed

‎.travis.yml

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,24 @@
11
---
22
os: osx
3-
osx_image: xcode11.3
4-
language: minimal
5-
6-
cache:
7-
directories:
8-
- Carthage
3+
osx_image: xcode12.3
4+
language: shell
95

106
jobs:
117
include:
128
- name: iOS - xcodebuild
139
env: PLATFORM=iOS
14-
SCHEME=GEOSwiftMapKit-iOS
15-
SDK=iphonesimulator13.2
16-
DESTINATION="platform=iOS Simulator,OS=13.3,name=iPhone 11"
17-
WORKSPACE=GEOSwiftMapKit.xcworkspace
10+
SDK=iphonesimulator14.3
11+
DESTINATION="platform=iOS Simulator,OS=14.3,name=iPhone 11"
1812
RUN_CODECOV=true
1913
- name: tvOS - xcodebuild
2014
env: PLATFORM=tvOS
21-
SCHEME=GEOSwiftMapKit-tvOS
22-
SDK=appletvsimulator13.2
23-
DESTINATION="platform=tvOS Simulator,OS=13.3,name=Apple TV"
24-
WORKSPACE=GEOSwiftMapKit.xcworkspace
15+
SDK=appletvsimulator14.3
16+
DESTINATION="platform=tvOS Simulator,OS=14.3,name=Apple TV"
2517
- name: macOS - xcodebuild
2618
env: PLATFORM=macOS
27-
SCHEME=GEOSwiftMapKit-macOS
28-
SDK=macosx10.15
19+
SDK=macosx11.1
2920
DESTINATION="platform=OS X"
30-
WORKSPACE=GEOSwiftMapKit.xcworkspace
31-
- name: macOS - SPM
32-
env: USE_SPM=true
3321

34-
before_install: travis_wait 30 ./scripts/travis_before_install.sh
22+
before_install: ./scripts/travis_before_install.sh
3523
script: ./scripts/travis_script.sh
3624
after_success: ./scripts/travis_after_success.sh

‎CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
## 3.0.0
2+
3+
* Updated for Xcode 12
4+
* Drops support for iOS 8
5+
* Switches to SPM as primary development environment
6+
* Updates GEOSwiftMapKit.xcodeproj to use GEOSwift.xcframework and
7+
geos.xcframework instead of the old-style fat frameworks due to a change
8+
in Xcode 12.3. This breaks (hopefully only temporarily) compatibility
9+
with Carthage unless you use the as-of-yet-unreleased Carthage version
10+
which adds the `--use-xcframeworks` flag. Carthage support will be
11+
reevaluated as its situation evolves.
12+
* Increases min GEOSwift to 8.0.0
13+
114
## 2.0.0
215

316
* [#9](https://github.com/GEOSwift/GEOSwiftMapKit/pull/9) Update to GEOSwift 7

‎Cartfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "GEOSwift/GEOSwift" ~> 7.0
1+
github "GEOSwift/GEOSwift" ~> 8.0.1

‎Cartfile.resolved

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
github "GEOSwift/GEOSwift" "7.0.0"
2-
github "GEOSwift/geos" "5.0.0"
1+
github "GEOSwift/GEOSwift" "8.0.1"
2+
github "GEOSwift/geos" "6.0.1"

‎GEOSwiftMapKit.podspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'GEOSwiftMapKit'
3-
s.version = '2.0.0'
3+
s.version = '3.0.0'
44
s.swift_version = '5.1'
55
s.cocoapods_version = '>= 1.4.0'
66
s.summary = 'MapKit support for GEOSwift'
@@ -15,12 +15,12 @@ Pod::Spec.new do |s|
1515
file: 'LICENSE'
1616
}
1717
s.authors = 'Andrew Hershberger'
18-
s.platforms = { ios: "8.0", osx: "10.9", tvos: "9.2" }
18+
s.platforms = { ios: "9.0", osx: "10.9", tvos: "9.2" }
1919
s.source = {
2020
git: 'https://github.com/GEOSwift/GEOSwiftMapKit.git',
2121
tag: s.version
2222
}
2323
s.source_files = 'GEOSwiftMapKit/*.{swift,h}'
2424
s.macos.exclude_files = 'GEOSwiftMapKit/GEOSwift+MapKitQuickLook.swift'
25-
s.dependency 'GEOSwift', '~> 7.0'
25+
s.dependency 'GEOSwift', '~> 8.0.1'
2626
end

‎GEOSwiftMapKit.xcodeproj/project.pbxproj

Lines changed: 24 additions & 165 deletions
Large diffs are not rendered by default.

‎GEOSwiftMapKit.xcodeproj/xcshareddata/xcschemes/GEOSwiftMapKit-iOS.xcscheme

Lines changed: 12 additions & 16 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 = "1020"
3+
LastUpgradeVersion = "1230"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,9 +26,18 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES"
2930
codeCoverageEnabled = "YES"
30-
onlyGenerateCoverageForSpecifiedTargets = "YES"
31-
shouldUseLaunchSchemeArgsEnv = "YES">
31+
onlyGenerateCoverageForSpecifiedTargets = "YES">
32+
<MacroExpansion>
33+
<BuildableReference
34+
BuildableIdentifier = "primary"
35+
BlueprintIdentifier = "49CC1E9022C435BB0079AC60"
36+
BuildableName = "GEOSwiftMapKit.framework"
37+
BlueprintName = "GEOSwiftMapKit-iOS"
38+
ReferencedContainer = "container:GEOSwiftMapKit.xcodeproj">
39+
</BuildableReference>
40+
</MacroExpansion>
3241
<CodeCoverageTargets>
3342
<BuildableReference
3443
BuildableIdentifier = "primary"
@@ -50,17 +59,6 @@
5059
</BuildableReference>
5160
</TestableReference>
5261
</Testables>
53-
<MacroExpansion>
54-
<BuildableReference
55-
BuildableIdentifier = "primary"
56-
BlueprintIdentifier = "49CC1E9022C435BB0079AC60"
57-
BuildableName = "GEOSwiftMapKit.framework"
58-
BlueprintName = "GEOSwiftMapKit-iOS"
59-
ReferencedContainer = "container:GEOSwiftMapKit.xcodeproj">
60-
</BuildableReference>
61-
</MacroExpansion>
62-
<AdditionalOptions>
63-
</AdditionalOptions>
6462
</TestAction>
6563
<LaunchAction
6664
buildConfiguration = "Debug"
@@ -81,8 +79,6 @@
8179
ReferencedContainer = "container:GEOSwiftMapKit.xcodeproj">
8280
</BuildableReference>
8381
</MacroExpansion>
84-
<AdditionalOptions>
85-
</AdditionalOptions>
8682
</LaunchAction>
8783
<ProfileAction
8884
buildConfiguration = "Release"

‎GEOSwiftMapKit.xcodeproj/xcshareddata/xcschemes/GEOSwiftMapKit-macOS.xcscheme

Lines changed: 12 additions & 16 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 = "1020"
3+
LastUpgradeVersion = "1230"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,9 +26,18 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES"
2930
codeCoverageEnabled = "YES"
30-
onlyGenerateCoverageForSpecifiedTargets = "YES"
31-
shouldUseLaunchSchemeArgsEnv = "YES">
31+
onlyGenerateCoverageForSpecifiedTargets = "YES">
32+
<MacroExpansion>
33+
<BuildableReference
34+
BuildableIdentifier = "primary"
35+
BlueprintIdentifier = "49E17EFD22C47D66003931E0"
36+
BuildableName = "GEOSwiftMapKit.framework"
37+
BlueprintName = "GEOSwiftMapKit-macOS"
38+
ReferencedContainer = "container:GEOSwiftMapKit.xcodeproj">
39+
</BuildableReference>
40+
</MacroExpansion>
3241
<CodeCoverageTargets>
3342
<BuildableReference
3443
BuildableIdentifier = "primary"
@@ -50,17 +59,6 @@
5059
</BuildableReference>
5160
</TestableReference>
5261
</Testables>
53-
<MacroExpansion>
54-
<BuildableReference
55-
BuildableIdentifier = "primary"
56-
BlueprintIdentifier = "49E17EFD22C47D66003931E0"
57-
BuildableName = "GEOSwiftMapKit.framework"
58-
BlueprintName = "GEOSwiftMapKit-macOS"
59-
ReferencedContainer = "container:GEOSwiftMapKit.xcodeproj">
60-
</BuildableReference>
61-
</MacroExpansion>
62-
<AdditionalOptions>
63-
</AdditionalOptions>
6462
</TestAction>
6563
<LaunchAction
6664
buildConfiguration = "Debug"
@@ -81,8 +79,6 @@
8179
ReferencedContainer = "container:GEOSwiftMapKit.xcodeproj">
8280
</BuildableReference>
8381
</MacroExpansion>
84-
<AdditionalOptions>
85-
</AdditionalOptions>
8682
</LaunchAction>
8783
<ProfileAction
8884
buildConfiguration = "Release"

‎GEOSwiftMapKit.xcodeproj/xcshareddata/xcschemes/GEOSwiftMapKit-tvOS.xcscheme

Lines changed: 12 additions & 16 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 = "1020"
3+
LastUpgradeVersion = "1230"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,9 +26,18 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES"
2930
codeCoverageEnabled = "YES"
30-
onlyGenerateCoverageForSpecifiedTargets = "YES"
31-
shouldUseLaunchSchemeArgsEnv = "YES">
31+
onlyGenerateCoverageForSpecifiedTargets = "YES">
32+
<MacroExpansion>
33+
<BuildableReference
34+
BuildableIdentifier = "primary"
35+
BlueprintIdentifier = "49E17EE122C47D51003931E0"
36+
BuildableName = "GEOSwiftMapKit.framework"
37+
BlueprintName = "GEOSwiftMapKit-tvOS"
38+
ReferencedContainer = "container:GEOSwiftMapKit.xcodeproj">
39+
</BuildableReference>
40+
</MacroExpansion>
3241
<CodeCoverageTargets>
3342
<BuildableReference
3443
BuildableIdentifier = "primary"
@@ -50,17 +59,6 @@
5059
</BuildableReference>
5160
</TestableReference>
5261
</Testables>
53-
<MacroExpansion>
54-
<BuildableReference
55-
BuildableIdentifier = "primary"
56-
BlueprintIdentifier = "49E17EE122C47D51003931E0"
57-
BuildableName = "GEOSwiftMapKit.framework"
58-
BlueprintName = "GEOSwiftMapKit-tvOS"
59-
ReferencedContainer = "container:GEOSwiftMapKit.xcodeproj">
60-
</BuildableReference>
61-
</MacroExpansion>
62-
<AdditionalOptions>
63-
</AdditionalOptions>
6462
</TestAction>
6563
<LaunchAction
6664
buildConfiguration = "Debug"
@@ -81,8 +79,6 @@
8179
ReferencedContainer = "container:GEOSwiftMapKit.xcodeproj">
8280
</BuildableReference>
8381
</MacroExpansion>
84-
<AdditionalOptions>
85-
</AdditionalOptions>
8682
</LaunchAction>
8783
<ProfileAction
8884
buildConfiguration = "Release"

‎GEOSwiftMapKit.xcworkspace/contents.xcworkspacedata

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎GEOSwiftMapKit.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎GEOSwiftMapKit/GEOSwift+MapKit.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ open class GeometryMapShape: MKShape, MKOverlay {
9696

9797
private let _coordinate: CLLocationCoordinate2D
9898
override open var coordinate: CLLocationCoordinate2D {
99-
return _coordinate
99+
_coordinate
100100
}
101101

102102
public let boundingMapRect: MKMapRect

‎GEOSwiftMapKit/GEOSwiftMapKit.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
1-
//
2-
// GEOSwiftMapKit.h
3-
// GEOSwiftMapKit
4-
//
5-
// Created by Andrew Hershberger on 6/26/19.
6-
//
7-
81
#import <Foundation/Foundation.h>
92

103
//! Project version number for GEOSwiftMapKit.

‎GEOSwiftMapKit/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>2.0.0</string>
18+
<string>3.0.0</string>
1919
<key>CFBundleVersion</key>
2020
<string>1</string>
2121
</dict>

‎GEOSwiftMapKitTests/GEOSwift+MapKitTests.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ final class MapKitTests: XCTestCase {
5555
let placemark = MKPlacemark(point: point)
5656

5757
XCTAssertEqual(placemark.coordinate, CLLocationCoordinate2D(latitude: 9, longitude: 45))
58-
XCTAssertNil(placemark.addressDictionary)
5958
}
6059

6160
func testCreateMKPolylineFromLineString() {

‎GEOSwiftMapKitTests/MapKit+Equatable.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,42 +2,42 @@ import MapKit
22

33
extension CLLocationCoordinate2D: Equatable {
44
public static func == (lhs: CLLocationCoordinate2D, rhs: CLLocationCoordinate2D) -> Bool {
5-
return lhs.latitude == rhs.latitude
5+
lhs.latitude == rhs.latitude
66
&& lhs.longitude == rhs.longitude
77
}
88
}
99

1010
extension MKCoordinateSpan: Equatable {
1111
public static func == (lhs: MKCoordinateSpan, rhs: MKCoordinateSpan) -> Bool {
12-
return lhs.latitudeDelta == rhs.latitudeDelta
12+
lhs.latitudeDelta == rhs.latitudeDelta
1313
&& lhs.longitudeDelta == rhs.longitudeDelta
1414
}
1515
}
1616

1717
extension MKCoordinateRegion: Equatable {
1818
public static func == (lhs: MKCoordinateRegion, rhs: MKCoordinateRegion) -> Bool {
19-
return lhs.center == rhs.center
19+
lhs.center == rhs.center
2020
&& lhs.span == rhs.span
2121
}
2222
}
2323

2424
extension MKMapPoint: Equatable {
2525
public static func == (lhs: MKMapPoint, rhs: MKMapPoint) -> Bool {
26-
return lhs.x == rhs.x
26+
lhs.x == rhs.x
2727
&& lhs.y == rhs.y
2828
}
2929
}
3030

3131
extension MKMapSize: Equatable {
3232
public static func == (lhs: MKMapSize, rhs: MKMapSize) -> Bool {
33-
return lhs.width == rhs.width
33+
lhs.width == rhs.width
3434
&& lhs.height == rhs.height
3535
}
3636
}
3737

3838
extension MKMapRect: Equatable {
3939
public static func == (lhs: MKMapRect, rhs: MKMapRect) -> Bool {
40-
return lhs.origin == rhs.origin
40+
lhs.origin == rhs.origin
4141
&& lhs.size == rhs.size
4242
}
4343
}

‎GEOSwiftMapKitTests/Snapshot Images/SnapshotImage.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ enum SnapshotImage: String {
1212
case envelope
1313

1414
var name: String {
15-
return rawValue + ".png"
15+
rawValue + ".png"
1616
}
1717

1818
var data: Data? {

‎GEOSwiftMapKitTests/Snapshot Images/envelope.png

-1 Bytes
Loading

‎GEOSwiftMapKitTests/Snapshot Images/geometrycollection.png

-85 Bytes
Loading

‎GEOSwiftMapKitTests/Snapshot Images/linearring.png

0 Bytes
Loading

‎GEOSwiftMapKitTests/Snapshot Images/linestring.png

0 Bytes
Loading

‎GEOSwiftMapKitTests/Snapshot Images/multilinestring.png

-2 Bytes
Loading

‎GEOSwiftMapKitTests/Snapshot Images/multipolygon.png

14 Bytes
Loading

‎GEOSwiftMapKitTests/Snapshot Images/polygon.png

1 Byte
Loading

‎Package.resolved

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@
66
"repositoryURL": "https://github.com/GEOSwift/geos.git",
77
"state": {
88
"branch": null,
9-
"revision": "083e366bc831d0f951974151315383830a79d447",
10-
"version": "5.0.0"
9+
"revision": "bf897b992c7ff22b5271bacfb1646ff136b75df2",
10+
"version": "6.0.1"
1111
}
1212
},
1313
{
1414
"package": "GEOSwift",
1515
"repositoryURL": "https://github.com/GEOSwift/GEOSwift.git",
1616
"state": {
1717
"branch": null,
18-
"revision": "fc208fd843a4ff3caf214845a123b9a6247d82ea",
19-
"version": "7.0.0"
18+
"revision": "868c4fc12019c1e5f989d429b5a7bf97433be48c",
19+
"version": "8.0.1"
2020
}
2121
}
2222
]

0 commit comments

Comments
 (0)