Skip to content
This repository has been archived by the owner on Nov 18, 2018. It is now read-only.

Migrate to CocoaPods 1.0.1 #19

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 5 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
language: objective-c
osx_image: xcode7.2

before_install:
- gem install cocoapods --no-rdoc --no-ri --no-document --quiet

script:
- set -o pipefail
- xcodebuild -workspace aerogear-otp.ios.xcworkspace -scheme aerogear-otp.iosTests -sdk iphonesimulator -destination "OS=9.0,name=iPhone 6 Plus" -configuration Release test
osx_image: xcode7.3
xcode_workspace: aerogear-otp.ios.xcworkspace
xcode_scheme: aerogear-otp.ios
xcode_sdk: iphonesimulator

notifications:
irc: "irc.freenode.org#aerogear"

branches:
only:
- master
4 changes: 2 additions & 2 deletions Podfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
xcodeproj 'aerogear-otp.ios.xcodeproj'
project 'aerogear-otp.ios.xcodeproj'

platform :ios, '7.0'

target 'aerogear-otp.iosTests', :exclusive => true do
target 'aerogear-otp.iosTests' do
pod 'OCMock', '2.2.3'
pod 'Kiwi', '2.3.0'
end
18 changes: 9 additions & 9 deletions aerogear-otp.ios.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -225,12 +225,12 @@
isa = PBXNativeTarget;
buildConfigurationList = 81F4170EC4C2307C435655A3 /* Build configuration list for PBXNativeTarget "aerogear-otp.iosTests" */;
buildPhases = (
340EF589166B7EC4BE64A177 /* Check Pods Manifest.lock */,
340EF589166B7EC4BE64A177 /* [CP] Check Pods Manifest.lock */,
81F41371A9713B70DC19ED87 /* Sources */,
81F416E3494E87BD1B604831 /* Frameworks */,
81F4190F94A95991D47E1DA5 /* Resources */,
96FD797C33904378828CE6EC /* Copy Pods Resources */,
54E967ADB9E0FDD6FCF9DA11 /* Embed Pods Frameworks */,
96FD797C33904378828CE6EC /* [CP] Copy Pods Resources */,
54E967ADB9E0FDD6FCF9DA11 /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
Expand Down Expand Up @@ -281,44 +281,44 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
340EF589166B7EC4BE64A177 /* Check Pods Manifest.lock */ = {
340EF589166B7EC4BE64A177 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Check Pods Manifest.lock";
name = "[CP] Check Pods Manifest.lock";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
showEnvVarsInLog = 0;
};
54E967ADB9E0FDD6FCF9DA11 /* Embed Pods Frameworks */ = {
54E967ADB9E0FDD6FCF9DA11 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Embed Pods Frameworks";
name = "[CP] Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-aerogear-otp.iosTests/Pods-aerogear-otp.iosTests-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
96FD797C33904378828CE6EC /* Copy Pods Resources */ = {
96FD797C33904378828CE6EC /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Copy Pods Resources";
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down