Skip to content

Commit

Permalink
Upgrade to cocoapods 1.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
mac-cain13 committed May 17, 2016
1 parent 71f1b23 commit 60f2486
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 10 deletions.
4 changes: 3 additions & 1 deletion Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,6 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
R.swift.Library: e5e077ed04f6867a95676af491650091b23518e9

COCOAPODS: 0.39.0
PODFILE CHECKSUM: 9b36d458fc7d86e4195dd7d7a184ba971f24e516

COCOAPODS: 1.0.0
8 changes: 8 additions & 0 deletions R.swift.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,13 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
F1F5322A6D46CBD2B0ABA60D /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
Expand Down Expand Up @@ -349,6 +356,7 @@
buildPhases = (
D5EA0DF01A3DF45600FFEBC4 /* Sources */,
D5DE480C1B5E1B14000F6A85 /* Install into test project */,
F1F5322A6D46CBD2B0ABA60D /* Frameworks */,
);
buildRules = (
);
Expand Down
18 changes: 9 additions & 9 deletions ResourceApp/ResourceApp.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -448,13 +448,13 @@
isa = PBXNativeTarget;
buildConfigurationList = D55C6CD91B5D757300301B0D /* Build configuration list for PBXNativeTarget "ResourceApp" */;
buildPhases = (
978E4B8123C372F370555011 /* Check Pods Manifest.lock */,
978E4B8123C372F370555011 /* 📦 Check Pods Manifest.lock */,
D55C6CED1B5E172900301B0D /* R.swift */,
D55C6CB41B5D757300301B0D /* Sources */,
D55C6CB51B5D757300301B0D /* Frameworks */,
D55C6CB61B5D757300301B0D /* Resources */,
89BF8D4EC08D38DB6564C369 /* Embed Pods Frameworks */,
ADB91CF666C6624CD5A00F13 /* Copy Pods Resources */,
89BF8D4EC08D38DB6564C369 /* 📦 Embed Pods Frameworks */,
ADB91CF666C6624CD5A00F13 /* 📦 Copy Pods Resources */,
);
buildRules = (
);
Expand Down Expand Up @@ -655,44 +655,44 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
89BF8D4EC08D38DB6564C369 /* Embed Pods Frameworks */ = {
89BF8D4EC08D38DB6564C369 /* 📦 Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Embed Pods Frameworks";
name = "📦 Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-ResourceApp/Pods-ResourceApp-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
978E4B8123C372F370555011 /* Check Pods Manifest.lock */ = {
978E4B8123C372F370555011 /* 📦 Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Check Pods Manifest.lock";
name = "📦 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;
};
ADB91CF666C6624CD5A00F13 /* Copy Pods Resources */ = {
ADB91CF666C6624CD5A00F13 /* 📦 Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Copy Pods Resources";
name = "📦 Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down

0 comments on commit 60f2486

Please sign in to comment.