Skip to content

Commit

Permalink
Update for latest Xcode (#77)
Browse files Browse the repository at this point in the history
* Update for latest Xcode

- Bump minimum target to 10.3
- Bump Swift version to 5
- Update dependencies
- Prepare pod version 3.2
- Address most warnings

* Remove deprecated .swift-version; use xcode 11 on CI
  • Loading branch information
nighthawk authored Dec 17, 2019
1 parent 29f32b6 commit 61bc566
Show file tree
Hide file tree
Showing 67 changed files with 246 additions and 390 deletions.
1 change: 0 additions & 1 deletion .swift-version

This file was deleted.

8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
language: objective-c
osx_image: xcode9.3
osx_image: xcode11.2
cache:
directories:
- Carthage
Expand All @@ -9,18 +9,18 @@ env:
- LC_CTYPE=en_US.UTF-8
- LANG=en_US.UTF-8
- IOS_FRAMEWORK_SCHEME="TripKit-iOS"
- IOS_SDK=iphonesimulator11.3
- IOS_SDK=iphoneos13.2
- secure: "whkK++h4Y+ciX+W/9o96SQoSvkfi2+dtlkeWeCj5emMe2Uk67FTjNK0REaueEkvBvEpGxPnbbLLiEWJAS561Gh2XSKtKgABGVWtrvjk6j2/44ezt689D1/mAf6bDOaHK6N3kwA2qdFAec4JmknCikpLg6WiC7GT1/2oYXgoBz6wA1ai35MnnlLWvopAQq98T0a2B5P3foB4AW7oKtNGNKvvWGXj0+c8ZPcsk6LJNmjrVReAdplg3NFagDWEK2VNd8D79//cvvt5sdmE5a6Dkh83zAgpHewzqe7vtIfLqTUUChgIlOaDGZpWn8boMn0lku6QCH4Rs1szsSII4FuCwEeZWrthUtQiqw8If8cwIrLCKqaItFSJ+MNL2sNe/jDdTmbhnwWjxx8yAqivrwOC86xG/iCGbCX16zpjfwG5CxPWDFjiuJ1mvlFQmRbz02IVYmWyms58zL2RaHXTjewCRrwzxiWZhpoLfLt/zbX6ISDKiuY+TXtc+5DLS1Qgs7gsKxLolCteVqDE++3hsmImMtP/Gf/ojeTaVoHin+WNJV/WQn29xcCFN6erCDp5lQwyY68ygqVpqUwNdTugjw/1iNbd3Oo3/klrXXcOya6ErFlPUQHx5An2VlcpEI/CqcjRAoNQSKRgrFdv0NsQIPAjPGX4PdKWEFpcZ/kLggIUbAiU="
- secure: "r4alEXz4O0nJeiEqxF7dM1OHqDILk/cq1VlBe6kOOEr/hj9boC6bkQdJK9+rsKJnWg7Q5WFo6EigI7orKDrN1rLPePtwwCDlK4vfoWQHNfx3ch5cHK2nDYnTFDYAGT+KAndw3b21NJGGb08XHlKgFuDCR6HLCq6iSYDsMmaCZkFenbeq1E6BqYJAMMMSb6ohx95kJ1nGRms7LGdezqqzPGVG3MwI3Ro6CkXoisqkOUpjMRte4FtKOGwJEXjzEuk/TZjhUBhTOB+2kR2EDsN3VKncJPwdN/l3V//Rh0jF+g93glENPJK9VSGIEnmA24HdVvTaDdOb2ovL5gD3HIY8tsBI4gELkblGaOHcICw1AyN/MdEX/6LizQek5R2KN3QRU7elw/CB2JTTHWAS9teZf1f8seFfSkHuAH5z9oQDyXvZhCsb1g1IXBkHahfqvTXkYdZo7Fz6Y1nmneErfD8fmMPYYOovm0gPqVfDZTQLYW+cEhSTfx5Hn8y9o1sYL0IAibIOFityQ4s8phm99pEES3Qa+XFasSceETyyMpW23dUHyPuExJ7hpggrZb9IEYmgD3SOfGPks9F40CKOVYG2CKiXntAjMiIIH8fGro/OCb26XXFdgK6vRqqm2Yyk7DZpst3B89EcfGVg5e5DODVlC/WDS+T1eaUb55U86xTHbiI="
- secure: "cjEEjCaVS6ZiEkLdGzQ22yZ0yRPSNDpIlZhKmHMVnJc8x9QB+EZALZ7hPLEmSJL+rqQ6DVK23zkXDlLwFHsDrrQHavXsO5NIsPhPpUTPyrVTGuBsR18Pk1TbClyh/vCJ1N6FzskCIIQd7ZbQ/J5PjQ6OC7W7KHyXnozYuS7ruSTmNjX9C3052yY7RpKJsMjDR570f/TPRjFRegrnOpvJ1Q/t0mfFSESGB000/gxPW1O61A5zJXuX9H30kK97bz2fPO8LJhQ+NFkQqAbs3BirNf3iHOYCk+pO5Uv8Mtupg6FfPi2+1fhghpM1eVXqstkf86r/0em8fqqCHK+vUlscy54Ow44gs8oGmE/3zGWCkvFZ76NUQ87wisHDFwA3iJo5EygZU6uocVcBKo9TqN3tg5dU7McFcdczqRlOSpcIP8nMpz/fo4PMqeMwjP8DKcrRqk8XnBPVCthQ9D9oiVOxoicK/kf6JlPAK9OEcuZDXFV0/qP7pKjVqf6J/mbkv6ORe6CcDdq7QgUmu7lavplwyfEY7pTJzqGlVo2p8ZBblILnXXFoqi13dmDtcngvDg3zA/d3Cyp+4HYouFXmyh2z9mEvdgs3gNPGrWVOi5IMfuLd3VyyAKcGPoM1PDl9ib394QljAfrBcQtampw48UdmPVZySnQVYlNxCwo/XPx6KFw="
- secure: "Cm2f7+Z2Gdj2ZroiaH3i28WknaBlr7BGEpTSL/240ahLiE/MiUinPHd8tBT3+J0V5HiHor5+TMC9AfrDuXbaGLb9b3SaK83QowEj+ukQtEj1Z1CIqjv40a5z0shaUgqsDLUui4GMW2SX7yCHHu/NAx8ijwR/JTzdA5oSBeYuYcAURkYWDC+NxuBpqBxLMpZ44r0Gt+TvWSSKtKOsf0i+F+HJLLOLJWPodiHiQZdjS/cSgfeDRjN0zoHVoYwKMXdpJ5WaqVWcJJNFLz8aL5HsSQTgRYtENovo3z+oZfSwcEoUllURZ3UjLxi1mVhg2+AZCAF+G1AJUqwUuD6NFcyphBBQWDU9dGAcv8K5u9G8Qqd3BOGYzVkfGCDxjHcNjU2FvB9LF0gnQ6IFX9CeA+W01sYQ9IzztpQXiPHrEPkJeA0FrE48RfKigAz2UQ4aN9/taRnThnuLqxp3YdadJHHnOzQ+YIvkGbcxfqp/JmNWz48ZvxJwtKYNF0t12eONr4Rugt02UfjYLBQBdHk2BYwfgXrhiM6ylc3rihjp0UPawQ2D5ctdkLFDlVFb2QtJPn1Zyc4eeRfT3GU0cwatd+OAEGpU/ZW+l+PGGBZyh8ElfrmBKE8uEqx4zmEOOVosuQum2HQTUPgjgTL8EwFZaJpKoynbvGfwcWa637WKPNJfQNY="
- secure: "F2K/ptSGM2jwMDP8lFPGdH4TTv1hB1+DSc3q1QmZclg3YrNh4g1VGy8bvpaCCfudYm+bXOXMCkUEpz11MA05eLBCByKaVCACRV/G+5gr/jSHVplJ1BpaKu4Ax1J8hveValdr1uAtk8NkwIFxY08pbwqZKfBYGeYi45Uckwnrg2uWybsoo2rM1/P2Op1+3U/PJYR2/D4RxM7f938AT+48v88IP2ORDv7jow0O/KD2ENheLp7iddJ+TJmRpHF0UBESP/3E1ZabBjf9ptqpu3aPvvh2yjli4qdMGikC+i0wi+qI5cMRWx+5e5DK0HjNXx0TqPXhpmBTYdNGaast+dcrzl4HNRhYvWSRrU4hiPffnH8E166lVwVftRCLRWQDj9Vq8od+bKlp0Fg9R5oYObKGCv54Ej24rMqI97/NRAV3tamww/vJ7kD6EgSoYYjM1tLRqvchganDZ3u/63gORf77PwUum7bRpUPCTiCftEfmOiG3lhBEFyzBlLpDDW7B9HFSK0jfi7aS9e65RedwyF0DcthskaGMWCM+9Sh8HNcU8LiOok0oVnJM4VkQCpHSkxA0HqLRU7b3ItTzCR5ZBbNexgbkhl0QtJZfJl52v2+CKpfW2CaWz3YLK7yz3px3f1xB/sMj5ACMPejE+g8i2jPKz1SbgJ9eDH4M2Y3nppIp/Hs="
matrix:
- DESTINATION="OS=11.3,name=iPhone 8" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK"
- DESTINATION="OS=13.2.2,name=iPhone 8" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK"

before_install:
- echo -e "machine github.com\n login $CI_USER_TOKEN" >> ~/.netrc
- gem install xcpretty --no-rdoc --no-ri --no-document --quiet
- gem install xcpretty --no-document --quiet
- carthage bootstrap --cache-builds --platform iOS

# We use xcodebuild rather than xctool as xctool doesn't play nicely with network requests
Expand Down
8 changes: 4 additions & 4 deletions Cartfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# TripKit
github "ReactiveX/RxSwift" ~> 4.0
github "ReactiveX/RxSwift" ~> 5.0
github "nighthawk/ASPolygonKit"

# TripKitUI
github "onevcat/Kingfisher" ~> 4.0
github "onevcat/Kingfisher" ~> 5.12
github "nighthawk/ASPolylineView"
github "RxSwiftCommunity/RxDataSources" ~> 3.0
github "RxSwiftCommunity/RxDataSources" ~> 4.0

# TripKitBookings
github "kishikawakatsumi/KeychainAccess"
github "OAuthSwift/OAuthSwift" ~> 1.2.0
github "OAuthSwift/OAuthSwift" ~> 2.1
github "SwiftyJSON/SwiftyJSON"
github "skedgo/KVNProgress"
14 changes: 7 additions & 7 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
github "OAuthSwift/OAuthSwift" "1.2.1"
github "ReactiveX/RxSwift" "4.1.2"
github "RxSwiftCommunity/RxDataSources" "3.0.2"
github "SwiftyJSON/SwiftyJSON" "4.0.0"
github "kishikawakatsumi/KeychainAccess" "v3.1.1"
github "nighthawk/ASPolygonKit" "0.1.7"
github "OAuthSwift/OAuthSwift" "2.1.0"
github "ReactiveX/RxSwift" "5.0.1"
github "RxSwiftCommunity/RxDataSources" "4.0.1"
github "SwiftyJSON/SwiftyJSON" "5.0.0"
github "kishikawakatsumi/KeychainAccess" "v4.1.0"
github "nighthawk/ASPolygonKit" "0.2.1"
github "nighthawk/ASPolylineView" "v1.0.3"
github "onevcat/Kingfisher" "4.7.0"
github "onevcat/Kingfisher" "5.12.0"
github "skedgo/KVNProgress" "2.3.2"
7 changes: 5 additions & 2 deletions Tests/UI/TKSectionedAlertsTest.swift
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import XCTest
@testable import TripKit
@testable import TripKitUI

@available(iOS 10.0, *)
class TKSectionedAlertsTest: XCTestCase {

var response: TKBuzzInfoProvider.AlertsTransitResponse!
Expand All @@ -25,9 +24,13 @@ class TKSectionedAlertsTest: XCTestCase {

func testParsingAlerts() throws {
XCTAssertNotNil(response)

let routeIDs = response.alerts.reduce(into: Set<String>()) { acc, mapping in
mapping.routes?.forEach { acc.insert($0.id) }
}
XCTAssertEqual(routeIDs.count, 158)
}

@available(iOS 10.0, *)
func testGroupingAlerts() throws {
XCTAssertNotNil(response)

Expand Down
2 changes: 0 additions & 2 deletions Tests/restoration/TKLocationRestorationTest.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ import CoreLocation

@testable import TripKit


@available(iOS 10.0, *)
class TKLocationRestorationTest: XCTestCase {

func testRestoringNamedCoordinate() {
Expand Down
10 changes: 5 additions & 5 deletions TripKit.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "TripKit"
s.version = "3.1.1"
s.version = "3.2.0"
s.summary = "SkedGo's TripKit"
s.homepage = "https://github.com/skedgo/tripkit-ios"
s.license = 'Apache License, Version 2.0'
Expand All @@ -11,16 +11,16 @@ Pod::Spec.new do |s|
# s.source = { path: "." }
# s.source = { git: "." }
s.source = { git: "https://github.com/skedgo/tripkit-ios.git", tag: "v#{s.version}" }
s.swift_version = '4.0'
s.ios.deployment_target = '8.0'
s.swift_version = '5.0'
s.ios.deployment_target = '10.3'
s.osx.deployment_target = '10.12'
s.requires_arc = true

s.prefix_header_file = "prefix.pch"

s.dependency 'ASPolygonKit'
s.dependency 'RxSwift', '~> 4.0.0'
s.dependency 'RxCocoa', '~> 4.0.0'
s.dependency 'RxSwift', '~> 5.0.0'
s.dependency 'RxCocoa', '~> 5.0.0'

s.source_files = [
"TripKit/TripKit.h",
Expand Down
Loading

0 comments on commit 61bc566

Please sign in to comment.