Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@marty-suzuki
marty-suzuki committed Sep 13, 2016
2 parents fc6d40a + 7403ba8 commit af3df01
Show file tree
Hide file tree
Showing 12 changed files with 182 additions and 167 deletions.
26 changes: 14 additions & 12 deletions MisterFusionSample/MisterFusionSample.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,12 +152,12 @@
isa = PBXNativeTarget;
buildConfigurationList = 37F35B301BF625AB008C6EAB /* Build configuration list for PBXNativeTarget "MisterFusionSample" */;
buildPhases = (
A294C3F6ADDE89566922D859 /* 📦 Check Pods Manifest.lock */,
A294C3F6ADDE89566922D859 /* [CP] Check Pods Manifest.lock */,
37F35B1A1BF625AB008C6EAB /* Sources */,
37F35B1B1BF625AB008C6EAB /* Frameworks */,
37F35B1C1BF625AB008C6EAB /* Resources */,
36C33B9F33E677EFFD9A317C /* 📦 Embed Pods Frameworks */,
9DF28894AC63573ACB22DA4D /* 📦 Copy Pods Resources */,
36C33B9F33E677EFFD9A317C /* [CP] Embed Pods Frameworks */,
9DF28894AC63573ACB22DA4D /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand Down Expand Up @@ -229,49 +229,49 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
36C33B9F33E677EFFD9A317C /* 📦 Embed Pods Frameworks */ = {
36C33B9F33E677EFFD9A317C /* [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-MisterFusionSample/Pods-MisterFusionSample-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
9DF28894AC63573ACB22DA4D /* 📦 Copy Pods Resources */ = {
9DF28894AC63573ACB22DA4D /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "📦 Copy Pods Resources";
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-MisterFusionSample/Pods-MisterFusionSample-resources.sh\"\n";
showEnvVarsInLog = 0;
};
A294C3F6ADDE89566922D859 /* 📦 Check Pods Manifest.lock */ = {
A294C3F6ADDE89566922D859 /* [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";
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
Expand Down Expand Up @@ -328,6 +328,7 @@
377AF0701C8DCF7F008A3BE2 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
BUNDLE_LOADER = "$(TEST_HOST)";
INFOPLIST_FILE = MisterFusionSampleTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.2;
Expand All @@ -342,6 +343,7 @@
377AF0711C8DCF7F008A3BE2 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
BUNDLE_LOADER = "$(TEST_HOST)";
INFOPLIST_FILE = MisterFusionSampleTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.2;
Expand Down Expand Up @@ -443,7 +445,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 48B18DFFC47FCD26816001A8 /* Pods-MisterFusionSample.debug.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
INFOPLIST_FILE = MisterFusionSample/Info.plist;
Expand All @@ -461,7 +463,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = F2CE34ED4E9AA4CCBCD8B84B /* Pods-MisterFusionSample.release.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
INFOPLIST_FILE = MisterFusionSample/Info.plist;
Expand Down
6 changes: 3 additions & 3 deletions MisterFusionSample/Podfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PODS:
- MisterFusion (1.2.0)
- MisterFusion (1.4.0)

DEPENDENCIES:
- MisterFusion (from `../`)
Expand All @@ -9,8 +9,8 @@ EXTERNAL SOURCES:
:path: "../"

SPEC CHECKSUMS:
MisterFusion: 0c6cf64452f576d463a9097522ed281208443339
MisterFusion: ccb69d87569a4acaabda051d3c8db7ab4be2d5db

PODFILE CHECKSUM: 284d0d39ecb34ec02dcc8ea851ee6103331e7484

COCOAPODS: 1.0.0.beta.6
COCOAPODS: 1.1.0.beta.2
10 changes: 5 additions & 5 deletions MisterFusionSample/Pods/Local Podspecs/MisterFusion.podspec.json
View file

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

6 changes: 3 additions & 3 deletions MisterFusionSample/Pods/Manifest.lock
View file

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

Loading

0 comments on commit af3df01

Please sign in to comment.