Skip to content
This repository has been archived by the owner on Aug 7, 2021. It is now read-only.

Commit

Permalink
Merge pull request #1175 from OneBusAway/v1790
Browse files Browse the repository at this point in the history
v17.9.0
  • Loading branch information
aaronbrethorst authored Sep 13, 2017
2 parents 856f92f + 482c33f commit 3c652e1
Show file tree
Hide file tree
Showing 418 changed files with 27,052 additions and 79,386 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: objective-c
osx_image: xcode8.3
osx_image: xcode9
before_install:
- export IOS_SIMULATOR_UDID=`instruments -s devices | grep "iPhone SE (10.3" | ruby -e "puts gets.split('[')[1].split(']').first"`
- export IOS_SIMULATOR_UDID=`instruments -s devices | grep "iPhone SE (11.0" | ruby -e "puts gets.split('[')[1].split(']').first"`
- echo $IOS_SIMULATOR_UDID
- open -a "simulator" --args -CurrentDeviceUDID $IOS_SIMULATOR_UDID
script: set -o pipefail && xcodebuild clean test CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO -project org.onebusaway.iphone.xcodeproj -scheme OneBusAway -sdk iphonesimulator -destination "platform=iOS Simulator,id=$IOS_SIMULATOR_UDID" ONLY_ACTIVE_ARCH=NO | xcpretty
Expand Down
26 changes: 14 additions & 12 deletions Cartfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# https://github.com/mxcl/promisekit/releases
github "mxcl/PromiseKit" ~>4.1.7
github "mxcl/PromiseKit" ~>4.3.2

# https://github.com/PromiseKit/Foundation/releases
github "PromiseKit/Foundation" ~>1.0.2
github "PromiseKit/Foundation" ~>1.0.7

# https://github.com/PromiseKit/CoreLocation/releases
github "PromiseKit/CoreLocation" ~>1.0.1
Expand All @@ -20,36 +20,38 @@ github "SVProgressHUD/SVProgressHUD" ~>2.1.2
github "SnapKit/Masonry" ~>1.0.2

# https://github.com/SnapKit/SnapKit/releases
github "SnapKit/SnapKit" ~>3.1.2
github "SnapKit/SnapKit" ~>3.2.0

# https://github.com/dzenbot/DZNEmptyDataSet/releases
github "dzenbot/DZNEmptyDataSet" ~>1.8.1

# https://github.com/SwiftKickMobile/SwiftMessages/releases
github "SwiftKickMobile/SwiftMessages" ~>3.1.5
github "SwiftKickMobile/SwiftMessages" "3.5.0-beta2"

# https://github.com/CocoaLumberjack/CocoaLumberjack/releases
github "aaronbrethorst/CocoaLumberjack" "oba-compat"
github "CocoaLumberjack/CocoaLumberjack" ~>3.2.1

# These repositories do not work properly with Carthage.
# I am currently copying the source files present in Carthage/Checkouts
# and copying them to the externals folder. So, we're at least getting
# a decent level of release control, but it's less than ideal.
# https://github.com/jspahrsummers/libextobjc/releases
github "jspahrsummers/libextobjc" ~>0.5.0

# https://github.com/mantle/mantle/releases
github "mantle/mantle" ~>2.1.0

# https://github.com/52inc/Pulley/releases
github "52inc/Pulley" ~>1.3.0
github "52inc/Pulley" ~>1.5.2

# https://github.com/AzimoLabs/SMFloatingLabelTextField/releases
github "AzimoLabs/SMFloatingLabelTextField" ~>0.2.0
github "AzimoLabs/SMFloatingLabelTextField" ~>0.3.2

# # https://github.com/cbpowell/MarqueeLabel/releases
github "cbpowell/MarqueeLabel" ~>3.0.1
# https://github.com/cbpowell/MarqueeLabel/releases
github "cbpowell/MarqueeLabel" ~>3.1.2

# https://github.com/OneSignal/OneSignal-iOS-SDK/releases
github "OneSignal/OneSignal-iOS-SDK" ~>2.5.2
github "OneSignal/OneSignal-iOS-SDK" ~>2.5.4

###################
##### Testing #####
Expand All @@ -59,7 +61,7 @@ github "OneSignal/OneSignal-iOS-SDK" ~>2.5.2
github "Quick/Quick" ~>1.1.0

# https://github.com/Quick/Nimble/releases
github "Quick/Nimble" ~>6.0.1
github "Quick/Nimble" ~>7.0.1

# https://github.com/AliSoftware/OHHTTPStubs/releases
github "AliSoftware/OHHTTPStubs" "5.2.3-swift3"
github "AliSoftware/OHHTTPStubs" ~>6.0.0
32 changes: 16 additions & 16 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
github "aaronbrethorst/CocoaLumberjack" "845ff8043fb6b902cc0e09d34ecf28bdf6d1cee1"
github "dzenbot/DZNEmptyDataSet" "v1.8.1"
github "cbpowell/MarqueeLabel" "3.0.3"
github "SnapKit/Masonry" "v1.0.2"
github "Quick/Nimble" "v6.1.0"
github "AliSoftware/OHHTTPStubs" "5.2.3-swift3"
github "OneSignal/OneSignal-iOS-SDK" "2.5.2"
github "mxcl/PromiseKit" "4.2.0"
github "52inc/Pulley" "1.3.1"
github "52inc/Pulley" "1.5.2"
github "AliSoftware/OHHTTPStubs" "6.0.0"
github "AzimoLabs/SMFloatingLabelTextField" "0.3.2"
github "CocoaLumberjack/CocoaLumberjack" "3.2.1"
github "OneSignal/OneSignal-iOS-SDK" "2.5.4"
github "PromiseKit/CoreLocation" "1.0.1"
github "PromiseKit/Foundation" "1.0.7"
github "PromiseKit/MapKit" "1.0.1"
github "Quick/Nimble" "v7.0.1"
github "Quick/Quick" "v1.1.0"
github "AzimoLabs/SMFloatingLabelTextField" "0.2.0"
github "SVProgressHUD/SVProgressHUD" "2.1.2"
github "SnapKit/Masonry" "v1.0.2"
github "SnapKit/SnapKit" "3.2.0"
github "SwiftKickMobile/SwiftMessages" "3.3.3"
github "SwiftKickMobile/SwiftMessages" "3.5.0-beta2"
github "akashivskyy/GoogleAnalytics-Framework" "3.17"
github "cbpowell/MarqueeLabel" "3.1.2"
github "dzenbot/DZNEmptyDataSet" "v1.8.1"
github "jspahrsummers/libextobjc" "0.5"
github "mantle/mantle" "2.1.0"
github "jspahrsummers/xcconfigs" "0.10"
github "PromiseKit/CoreLocation" "1.0.1"
github "PromiseKit/Foundation" "1.0.6"
github "akashivskyy/GoogleAnalytics-Framework" "3.17"
github "PromiseKit/MapKit" "1.0.1"
github "mantle/mantle" "2.1.0"
github "mxcl/PromiseKit" "4.4.0"
13 changes: 13 additions & 0 deletions Carthage/Build/.CocoaLumberjack.version

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions Carthage/Build/.CoreLocation.version

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions Carthage/Build/.DZNEmptyDataSet.version

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions Carthage/Build/.Foundation.version

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions Carthage/Build/.GoogleAnalytics-Framework.version

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions Carthage/Build/.MapKit.version

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions Carthage/Build/.MarqueeLabel.version

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions Carthage/Build/.Masonry.version

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions Carthage/Build/.Nimble.version

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions Carthage/Build/.OHHTTPStubs.version

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions Carthage/Build/.OneSignal-iOS-SDK.version

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions Carthage/Build/.PromiseKit.version

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions Carthage/Build/.Pulley.version

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions Carthage/Build/.Quick.version

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions Carthage/Build/.SMFloatingLabelTextField.version

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions Carthage/Build/.SVProgressHUD.version

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions Carthage/Build/.SnapKit.version

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions Carthage/Build/.SwiftMessages.version

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions Carthage/Build/.mantle.version

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions Carthage/Build/.xcconfigs.version

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 3c652e1

Please sign in to comment.