Skip to content

Commit

Permalink
Converting to Swift 3 (#38)
Browse files Browse the repository at this point in the history
This keeps all the APIs the same as before and only updates the project.
In a future commit, we'll convert the APIs.
  • Loading branch information
plivesey authored Sep 22, 2016
1 parent 3d5566f commit 95376f2
Show file tree
Hide file tree
Showing 78 changed files with 982 additions and 869 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
language: objective-c
osx_image: xcode7.3
osx_image: xcode8
script: sh build.sh
after_success:
- bash <(curl -s https://codecov.io/bash)
8 changes: 4 additions & 4 deletions Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@
use_frameworks!

target :'RocketData' do
pod 'ConsistencyManager', '~> 2.0.0'
pod 'ConsistencyManager', '~> 3.0.0'
end

target :'RocketDataTests' do
pod 'ConsistencyManager', '~> 2.0.0'
pod 'ConsistencyManager', '~> 3.0.0'
end

# This is necessary to convert the target to swift 3
# This is necessary to convert the target to swift 3.0
# This isn't detected automatically by cocoapods or supported in the podspec
# We can remove this once Cocoapods has a better solution
post_install do |installer|
installer.pods_project.targets.each do |target|
target.build_configurations.each do |config|
config.build_settings['SWIFT_VERSION'] = '2.3'
config.build_settings['SWIFT_VERSION'] = '3.0'
end
end
end
Expand Down
8 changes: 4 additions & 4 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
PODS:
- ConsistencyManager (2.0.0)
- ConsistencyManager (3.0.0)

DEPENDENCIES:
- ConsistencyManager (~> 2.0.0)
- ConsistencyManager (~> 3.0.0)

SPEC CHECKSUMS:
ConsistencyManager: 4a1f6f20628befc25ed3393444c7c18ae64149a4
ConsistencyManager: 2312b687bbd3875ae5b40a220239e969448d2191

PODFILE CHECKSUM: 951a900dc8a72177544a74e0c6d54c3554572601
PODFILE CHECKSUM: 6db966c1e9f949a826512ccb3129eda0b528af50

COCOAPODS: 1.1.0.rc.2
146 changes: 77 additions & 69 deletions Pods/ConsistencyManager/ConsistencyManager/ConsistencyManager.swift

Large diffs are not rendered by default.

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

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

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

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

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

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

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

Loading

0 comments on commit 95376f2

Please sign in to comment.