Skip to content

Commit 6c08da1

Browse files
committed
Upgrade CocoaPods to 1.1, reinstall pods and upgrade AFNetworking to 1.3
1 parent 3f1c5f1 commit 6c08da1

File tree

221 files changed

+2887
-7720
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

221 files changed

+2887
-7720
lines changed

Configurations/Debug.xcconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "../Pods/Target Support Files/Pods/Pods.debug.xcconfig"
1+
#include "../Pods/Target Support Files/Pods-RMBT/Pods-RMBT.debug.xcconfig"
22
#include "_Shared.xcconfig"
33

44
CONFIG_BUNDLE_ID=at.rtr.openrmbt

Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
source 'https://rubygems.org'
22

3-
gem 'cocoapods', '0.34.4'
3+
gem 'cocoapods', '~> 1.0'

Gemfile.lock

+48-34
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,69 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (3.2.22.1)
5-
i18n (~> 0.6, >= 0.6.4)
6-
multi_json (~> 1.0)
7-
claide (0.7.0)
8-
cocoapods (0.34.4)
9-
activesupport (>= 3.2.15, < 4)
10-
claide (~> 0.7.0)
11-
cocoapods-core (= 0.34.4)
12-
cocoapods-downloader (~> 0.7.2)
13-
cocoapods-plugins (~> 0.3.1)
14-
cocoapods-trunk (~> 0.3.1)
15-
cocoapods-try (~> 0.4.1)
4+
activesupport (4.2.7.1)
5+
i18n (~> 0.7)
6+
json (~> 1.7, >= 1.7.7)
7+
minitest (~> 5.1)
8+
thread_safe (~> 0.3, >= 0.3.4)
9+
tzinfo (~> 1.1)
10+
claide (1.0.1)
11+
cocoapods (1.1.1)
12+
activesupport (>= 4.0.2, < 5)
13+
claide (>= 1.0.1, < 2.0)
14+
cocoapods-core (= 1.1.1)
15+
cocoapods-deintegrate (>= 1.0.1, < 2.0)
16+
cocoapods-downloader (>= 1.1.2, < 2.0)
17+
cocoapods-plugins (>= 1.0.0, < 2.0)
18+
cocoapods-search (>= 1.0.0, < 2.0)
19+
cocoapods-stats (>= 1.0.0, < 2.0)
20+
cocoapods-trunk (>= 1.1.1, < 2.0)
21+
cocoapods-try (>= 1.1.0, < 2.0)
1622
colored (~> 1.2)
1723
escape (~> 0.0.4)
18-
json_pure (~> 1.8)
19-
nap (~> 0.8)
20-
open4 (~> 1.3)
21-
xcodeproj (~> 0.19.4)
22-
cocoapods-core (0.34.4)
23-
activesupport (>= 3.2.15)
24+
fourflusher (~> 2.0.1)
25+
gh_inspector (~> 1.0)
26+
molinillo (~> 0.5.1)
27+
nap (~> 1.0)
28+
xcodeproj (>= 1.3.3, < 2.0)
29+
cocoapods-core (1.1.1)
30+
activesupport (>= 4.0.2, < 5)
2431
fuzzy_match (~> 2.0.4)
25-
json_pure (~> 1.8)
26-
nap (~> 0.8.0)
27-
cocoapods-downloader (0.7.2)
28-
cocoapods-plugins (0.3.2)
32+
nap (~> 1.0)
33+
cocoapods-deintegrate (1.0.1)
34+
cocoapods-downloader (1.1.2)
35+
cocoapods-plugins (1.0.0)
2936
nap
30-
cocoapods-trunk (0.3.1)
31-
json_pure (~> 1.8)
32-
nap (>= 0.8)
37+
cocoapods-search (1.0.0)
38+
cocoapods-stats (1.0.0)
39+
cocoapods-trunk (1.1.1)
40+
nap (>= 0.8, < 2.0)
3341
netrc (= 0.7.8)
34-
cocoapods-try (0.4.5)
42+
cocoapods-try (1.1.0)
3543
colored (1.2)
3644
escape (0.0.4)
45+
fourflusher (2.0.1)
3746
fuzzy_match (2.0.4)
47+
gh_inspector (1.0.2)
3848
i18n (0.7.0)
39-
json_pure (1.8.3)
40-
multi_json (1.11.2)
41-
nap (0.8.0)
49+
json (1.8.3)
50+
minitest (5.9.1)
51+
molinillo (0.5.2)
52+
nap (1.1.0)
4253
netrc (0.7.8)
43-
open4 (1.3.4)
44-
xcodeproj (0.19.4)
45-
activesupport (~> 3.0)
54+
thread_safe (0.3.5)
55+
tzinfo (1.2.2)
56+
thread_safe (~> 0.1)
57+
xcodeproj (1.3.3)
58+
activesupport (>= 3)
59+
claide (>= 1.0.1, < 2.0)
4660
colored (~> 1.2)
4761

4862
PLATFORMS
4963
ruby
5064

5165
DEPENDENCIES
52-
cocoapods (= 0.34.4)
66+
cocoapods (~> 1.0)
5367

5468
BUNDLED WITH
55-
1.10.6
69+
1.11.2

Podfile

+16-14
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,23 @@
1-
platform :ios, '7.0'
1+
platform :ios, '8.0'
22

3-
pod 'AFNetworking', '~>1.2'
3+
target 'RMBT' do
4+
pod 'AFNetworking', '~>1.3'
45

5-
pod 'BlocksKit', '2.2.5'
6-
pod 'libextobjc/EXTKeyPathCoding'
6+
pod 'BlocksKit', '2.2.5'
7+
pod 'libextobjc/EXTKeyPathCoding'
78

8-
pod 'SVWebViewController', :git => 'https://github.com/samvermette/SVWebViewController.git'
9+
pod 'SVWebViewController', '1.0'
910

10-
pod 'TUSafariActivity'
11+
pod 'TUSafariActivity'
1112

12-
if File.exist?(File.expand_path('../Vendor/CocoaAsyncSocket', __FILE__))
13-
pod 'CocoaAsyncSocket', :path => 'Vendor/CocoaAsyncSocket'
14-
else
15-
pod 'CocoaAsyncSocket', :git => 'https://github.com/appscape/CocoaAsyncSocket.git',
16-
:commit => '350ac5f09002ac92a333175cb87ab8b59ebd0571'
17-
end
13+
if File.exist?(File.expand_path('../Vendor/CocoaAsyncSocket', __FILE__))
14+
pod 'CocoaAsyncSocket', :path => 'Vendor/CocoaAsyncSocket'
15+
else
16+
pod 'CocoaAsyncSocket', :git => 'https://github.com/appscape/CocoaAsyncSocket.git',
17+
:commit => '350ac5f09002ac92a333175cb87ab8b59ebd0571'
18+
end
1819

19-
pod 'BCGenieEffect'
20+
pod 'BCGenieEffect'
2021

21-
pod 'GoogleMaps', '~> 1.10.5'
22+
pod 'GoogleMaps', '~> 1.10.5'
23+
end

Podfile.lock

+14-9
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ PODS:
22
- AFNetworking (1.3.1)
33
- BCGenieEffect (1.0)
44
- BlocksKit (2.2.5):
5-
- BlocksKit/All
5+
- BlocksKit/All (= 2.2.5)
66
- BlocksKit/All (2.2.5):
77
- BlocksKit/Core
88
- BlocksKit/DynamicDelegate
@@ -21,34 +21,39 @@ PODS:
2121
- libextobjc/EXTKeyPathCoding (0.2.5):
2222
- libextobjc/RuntimeExtensions
2323
- libextobjc/RuntimeExtensions (0.2.5)
24-
- SVWebViewController (0.2)
24+
- SVWebViewController (1.0)
2525
- TUSafariActivity (1.0.0)
2626

2727
DEPENDENCIES:
28-
- AFNetworking (~> 1.2)
28+
- AFNetworking (~> 1.3)
2929
- BCGenieEffect
3030
- BlocksKit (= 2.2.5)
3131
- CocoaAsyncSocket (from `https://github.com/appscape/CocoaAsyncSocket.git`, commit `350ac5f09002ac92a333175cb87ab8b59ebd0571`)
3232
- GoogleMaps (~> 1.10.5)
3333
- libextobjc/EXTKeyPathCoding
34-
- SVWebViewController (from `https://github.com/samvermette/SVWebViewController.git`)
34+
- SVWebViewController (= 1.0)
3535
- TUSafariActivity
3636

3737
EXTERNAL SOURCES:
3838
CocoaAsyncSocket:
3939
:commit: 350ac5f09002ac92a333175cb87ab8b59ebd0571
4040
:git: https://github.com/appscape/CocoaAsyncSocket.git
41-
SVWebViewController:
42-
:git: https://github.com/samvermette/SVWebViewController.git
41+
42+
CHECKOUT OPTIONS:
43+
CocoaAsyncSocket:
44+
:commit: 350ac5f09002ac92a333175cb87ab8b59ebd0571
45+
:git: https://github.com/appscape/CocoaAsyncSocket.git
4346

4447
SPEC CHECKSUMS:
4548
AFNetworking: f0d89caedb504adcb43e7d90e57f42e703adf415
4649
BCGenieEffect: 9221dfe59d02c9edf5332f9a895d42be904f5a8c
4750
BlocksKit: 7f422b971407001178d181a43b99014ea2591fe6
48-
CocoaAsyncSocket: 4f37d721606ef34ba30ba6e76f84db420bfc8fc5
51+
CocoaAsyncSocket: 7f7db5178f80b39891e97f2b355e800fed8ed509
4952
GoogleMaps: da51c62c338c2d9c47cdad470a0d1e0e4b8544e4
5053
libextobjc: 8c105ed22b1f05d44c102bf04f3e0f0c468a40ca
51-
SVWebViewController: 8b32a4b7017bca79799e0fdb0ffc4d47d0769db2
54+
SVWebViewController: c36dda7326e81fcae0abf5d02bf7bbf7e41be901
5255
TUSafariActivity: dd346df54a8f1cbb4fd05d504c76d47225fac99e
5356

54-
COCOAPODS: 0.34.4
57+
PODFILE CHECKSUM: cde07805d6525aa11b84eea905a5005c6b887eb8
58+
59+
COCOAPODS: 1.1.1

Pods/Headers/Private/SVWebViewController/SVWebViewControllerActivity.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Headers/Private/SVWebViewController/SVWebViewControllerActivityChrome.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Headers/Private/SVWebViewController/SVWebViewControllerActivitySafari.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Headers/Public/GoogleMaps/GoogleMaps/GMSAddress.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Headers/Public/GoogleMaps/GoogleMaps/GMSAutocompleteFilter.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Headers/Public/GoogleMaps/GoogleMaps/GMSAutocompleteMatchFragment.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Headers/Public/GoogleMaps/GoogleMaps/GMSAutocompletePrediction.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Headers/Public/GoogleMaps/GoogleMaps/GMSCALayer.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Headers/Public/GoogleMaps/GoogleMaps/GMSCameraPosition.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Headers/Public/GoogleMaps/GoogleMaps/GMSCameraUpdate.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Headers/Public/GoogleMaps/GoogleMaps/GMSCircle.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Headers/Public/GoogleMaps/GoogleMaps/GMSCoordinateBounds.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Headers/Public/GoogleMaps/GoogleMaps/GMSGeocoder.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Headers/Public/GoogleMaps/GoogleMaps/GMSGeometryUtils.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Headers/Public/GoogleMaps/GoogleMaps/GMSGroundOverlay.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Headers/Public/GoogleMaps/GoogleMaps/GMSIndoorBuilding.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Headers/Public/GoogleMaps/GoogleMaps/GMSIndoorDisplay.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Headers/Public/GoogleMaps/GoogleMaps/GMSIndoorLevel.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Headers/Public/GoogleMaps/GoogleMaps/GMSMapLayer.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Headers/Public/GoogleMaps/GoogleMaps/GMSMapView+Animation.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Headers/Public/GoogleMaps/GoogleMaps/GMSMapView.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Headers/Public/GoogleMaps/GoogleMaps/GMSMarker.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Headers/Public/GoogleMaps/GoogleMaps/GMSMarkerLayer.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Headers/Public/GoogleMaps/GoogleMaps/GMSMutablePath.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Headers/Public/GoogleMaps/GoogleMaps/GMSOrientation.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Headers/Public/GoogleMaps/GoogleMaps/GMSOverlay.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Headers/Public/GoogleMaps/GoogleMaps/GMSPanorama.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Headers/Public/GoogleMaps/GoogleMaps/GMSPanoramaCamera.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Headers/Public/GoogleMaps/GoogleMaps/GMSPanoramaCameraUpdate.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Headers/Public/GoogleMaps/GoogleMaps/GMSPanoramaLayer.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Headers/Public/GoogleMaps/GoogleMaps/GMSPanoramaLink.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Headers/Public/GoogleMaps/GoogleMaps/GMSPanoramaService.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Headers/Public/GoogleMaps/GoogleMaps/GMSPanoramaView.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Headers/Public/GoogleMaps/GoogleMaps/GMSPath.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Headers/Public/GoogleMaps/GoogleMaps/GMSPlace.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Headers/Public/GoogleMaps/GoogleMaps/GMSPlaceLikelihood.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Headers/Public/GoogleMaps/GoogleMaps/GMSPlaceLikelihoodList.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Headers/Public/GoogleMaps/GoogleMaps/GMSPlacePicker.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Headers/Public/GoogleMaps/GoogleMaps/GMSPlacePickerConfig.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Headers/Public/GoogleMaps/GoogleMaps/GMSPlaceTypes.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Headers/Public/GoogleMaps/GoogleMaps/GMSPlacesClient.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Headers/Public/GoogleMaps/GoogleMaps/GMSPlacesMacros.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Headers/Public/GoogleMaps/GoogleMaps/GMSPolygon.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Headers/Public/GoogleMaps/GoogleMaps/GMSPolyline.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Headers/Public/GoogleMaps/GoogleMaps/GMSProjection.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Headers/Public/GoogleMaps/GoogleMaps/GMSServices.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Headers/Public/GoogleMaps/GoogleMaps/GMSSyncTileLayer.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Headers/Public/GoogleMaps/GoogleMaps/GMSTileLayer.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Headers/Public/GoogleMaps/GoogleMaps/GMSUISettings.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Headers/Public/GoogleMaps/GoogleMaps/GMSURLTileLayer.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Headers/Public/GoogleMaps/GoogleMaps/GMSUserAddedPlace.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Headers/Public/GoogleMaps/GoogleMaps/GoogleMaps.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Headers/Public/SVWebViewController/SVWebViewControllerActivity.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Headers/Public/SVWebViewController/SVWebViewControllerActivityChrome.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Headers/Public/SVWebViewController/SVWebViewControllerActivitySafari.h

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Pods/Local Podspecs/BlocksKit.podspec

-18
This file was deleted.

0 commit comments

Comments
 (0)