From bcd514111e8f3991d85c2f65c8ca71843c6d1237 Mon Sep 17 00:00:00 2001 From: Jonathan Hersh Date: Sun, 3 May 2015 20:46:27 -0700 Subject: [PATCH] Update CocoaPods & CircleCI xcode --- Example/Podfile.lock | 8 ++++---- circle.yml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Example/Podfile.lock b/Example/Podfile.lock index 369b196..2af6d91 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -1,5 +1,5 @@ PODS: - - Expecta (0.4.0) + - Expecta (0.4.2) - MagicalRecord (2.2): - MagicalRecord/Core (= 2.2) - MagicalRecord/Core (2.2) @@ -14,12 +14,12 @@ DEPENDENCIES: EXTERNAL SOURCES: SSDataSources: - :path: ../SSDataSources.podspec + :path: "../SSDataSources.podspec" SPEC CHECKSUMS: - Expecta: 392a6b5bfb9f4097e47dd8064d9b732079490332 + Expecta: 78b4e8b0c8291fa4524d7f74016b6065c2e391ec MagicalRecord: f8a56bb87ab6552f20c4bb8681a1958a197ea3cd OCMock: a10ea9f0a6e921651f96f78b6faee95ebc813b92 SSDataSources: b01170fb23b82acf0649194e9189b0bf5f702681 -COCOAPODS: 0.36.3 +COCOAPODS: 0.37.0 diff --git a/circle.yml b/circle.yml index a7514d8..601870d 100644 --- a/circle.yml +++ b/circle.yml @@ -3,10 +3,10 @@ machine: LANG: en_US.UTF-8 LC_CTYPE: en_US.UTF-8 xcode: - version: "6.2" + version: "6.3.1" dependencies: pre: - - xcrun instruments -w "iPhone 6 (8.2 Simulator)" || exit 0 + - xcrun instruments -w "iPhone 6 (8.3 Simulator)" || exit 0 override: - sudo gem install cocoapods xcpretty obcd slather -N - pod install --project-directory=Example