Permalink
Browse files

Maybe fix Travis

  • Loading branch information...
1 parent 5ea85b6 commit 3d609ce2f82cde5591b067334e7f9e915b0ce2b8 @chrisballinger chrisballinger committed Sep 15, 2016
Showing with 9 additions and 7 deletions.
  1. +2 −1 .travis.yml
  2. +1 −1 Gemfile
  3. +5 −5 Gemfile.lock
  4. +1 −0 Podfile
View
@@ -23,8 +23,9 @@ install:
before_script:
- export COCOAPODS_DISABLE_DETERMINISTIC_UUIDS=1 # https://github.com/CocoaPods/CocoaPods/issues/3850
- - bundle exec pod repo update
+ - bundle exec pod repo update --silent
- bundle exec pod install
+ - bundle exec pod update libsqlfs SQLCipher --no-repo-update # Waiting for CocoaPods fix https://github.com/CocoaPods/CocoaPods/pull/5844
script:
- set -o pipefail
- xcodebuild -workspace ChatSecure.xcworkspace -scheme ChatSecureTests -sdk iphonesimulator -destination 'name=iPhone 6' test | xcpretty -c
View
@@ -1,4 +1,4 @@
source "https://rubygems.org"
-gem "cocoapods", "1.1.0.rc.1"
+gem "cocoapods", "1.1.0.rc.2"
#gem "activesupport", "~> 4.2.6"
View
@@ -8,10 +8,10 @@ GEM
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
claide (1.0.0)
- cocoapods (1.1.0.rc.1)
+ cocoapods (1.1.0.rc.2)
activesupport (>= 4.0.2, < 5)
claide (>= 1.0.0, < 2.0)
- cocoapods-core (= 1.1.0.rc.1)
+ cocoapods-core (= 1.1.0.rc.2)
cocoapods-deintegrate (>= 1.0.1, < 2.0)
cocoapods-downloader (>= 1.1.1, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -23,10 +23,10 @@ GEM
escape (~> 0.0.4)
fourflusher (~> 1.0.1)
gh_inspector (~> 1.0)
- molinillo (~> 0.5.0)
+ molinillo (~> 0.5.1)
nap (~> 1.0)
xcodeproj (>= 1.3.1, < 2.0)
- cocoapods-core (1.1.0.rc.1)
+ cocoapods-core (1.1.0.rc.2)
activesupport (>= 4.0.2, < 5)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
@@ -63,7 +63,7 @@ PLATFORMS
ruby
DEPENDENCIES
- cocoapods (= 1.1.0.rc.1)
+ cocoapods (= 1.1.0.rc.2)
BUNDLED WITH
1.12.5
View
@@ -59,6 +59,7 @@ abstract_target 'ChatSecureCorePods' do
pod 'ZXingObjC', '~> 3.0'
# CocoaPods 1.0 cannot compile C files anymore so we rename .c to .m.
+ # Waiting for fix https://github.com/CocoaPods/CocoaPods/pull/5844
pod 'libsqlfs/SQLCipher', :podspec => 'Podspecs/libsqlfs.podspec'
pod 'SQLCipher', :podspec => 'Podspecs/SQLCipher.podspec.json'

0 comments on commit 3d609ce

Please sign in to comment.