Skip to content

Commit

Permalink
Ensure Cartahge compatability by allowing the Pods folder to be check…
Browse files Browse the repository at this point in the history
…ed in
  • Loading branch information
orta committed Apr 17, 2016
1 parent 2e1266e commit d2c9ac1
Show file tree
Hide file tree
Showing 35 changed files with 2,071 additions and 97 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,3 @@ xcuserdata
profile
*.moved-aside
DerivedData
Example/Pods
82 changes: 60 additions & 22 deletions Example/FLKAutoLayout.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
5F4C3A8365CBDC98C9EF3D43 /* Pods_FLKAutoLayout_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 561766125B24D6DD259F0E6D /* Pods_FLKAutoLayout_Example.framework */; };
6003F58E195388D20070C39A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58D195388D20070C39A /* Foundation.framework */; };
6003F590195388D20070C39A /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58F195388D20070C39A /* CoreGraphics.framework */; };
6003F592195388D20070C39A /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F591195388D20070C39A /* UIKit.framework */; };
Expand All @@ -21,8 +22,6 @@
6003F5BA195388D20070C39A /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 6003F5B8195388D20070C39A /* InfoPlist.strings */; };
6003F5BC195388D20070C39A /* Tests.m in Sources */ = {isa = PBXBuildFile; fileRef = 6003F5BB195388D20070C39A /* Tests.m */; };
873B8AEB1B1F5CCA007FD442 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 873B8AEA1B1F5CCA007FD442 /* Main.storyboard */; };
A6AA48184A40B08E58A863BA /* Pods_FLKAutoLayout_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1B7EB5C0D837B568E20505AF /* Pods_FLKAutoLayout_Example.framework */; };
AB8ECBBBFCC959FE7F3C767A /* Pods_FLKAutoLayout_Tests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 90301B87EF2D8CF6DD6E321E /* Pods_FLKAutoLayout_Tests.framework */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand All @@ -37,8 +36,7 @@

/* Begin PBXFileReference section */
0156EFDFAA088EEA1F8833FE /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = "<group>"; };
1B7EB5C0D837B568E20505AF /* Pods_FLKAutoLayout_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FLKAutoLayout_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
41DA75B30AC3663C6FD58B6C /* Pods-FLKAutoLayout_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FLKAutoLayout_Example.release.xcconfig"; path = "Pods/Target Support Files/Pods-FLKAutoLayout_Example/Pods-FLKAutoLayout_Example.release.xcconfig"; sourceTree = "<group>"; };
561766125B24D6DD259F0E6D /* Pods_FLKAutoLayout_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FLKAutoLayout_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
5F3A980CFA90F292CF53C90B /* FLKAutoLayout.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = FLKAutoLayout.podspec; path = ../FLKAutoLayout.podspec; sourceTree = "<group>"; };
6003F58A195388D20070C39A /* FLKAutoLayout_Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = FLKAutoLayout_Example.app; sourceTree = BUILT_PRODUCTS_DIR; };
6003F58D195388D20070C39A /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
Expand All @@ -61,10 +59,8 @@
606FC2411953D9B200FFA9A0 /* Tests-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Tests-Prefix.pch"; sourceTree = "<group>"; };
83E7C2087B8682E25C2B04B8 /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = "<group>"; };
873B8AEA1B1F5CCA007FD442 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = "<group>"; };
90301B87EF2D8CF6DD6E321E /* Pods_FLKAutoLayout_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FLKAutoLayout_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
ABBD61D40DBA71DABD757469 /* Pods-FLKAutoLayout_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FLKAutoLayout_Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-FLKAutoLayout_Tests/Pods-FLKAutoLayout_Tests.release.xcconfig"; sourceTree = "<group>"; };
BC2FFCA23DE3B4FA44CDAC9E /* Pods-FLKAutoLayout_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FLKAutoLayout_Example.debug.xcconfig"; path = "Pods/Target Support Files/Pods-FLKAutoLayout_Example/Pods-FLKAutoLayout_Example.debug.xcconfig"; sourceTree = "<group>"; };
D5DECF1D303A4EB427C6B5E1 /* Pods-FLKAutoLayout_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FLKAutoLayout_Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-FLKAutoLayout_Tests/Pods-FLKAutoLayout_Tests.debug.xcconfig"; sourceTree = "<group>"; };
A2D8C10D1DA8E7D1E7423DAF /* Pods-FLKAutoLayout_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FLKAutoLayout_Example.release.xcconfig"; path = "Pods/Target Support Files/Pods-FLKAutoLayout_Example/Pods-FLKAutoLayout_Example.release.xcconfig"; sourceTree = "<group>"; };
E546AB97A8120267033D5B65 /* Pods-FLKAutoLayout_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FLKAutoLayout_Example.debug.xcconfig"; path = "Pods/Target Support Files/Pods-FLKAutoLayout_Example/Pods-FLKAutoLayout_Example.debug.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand All @@ -75,7 +71,7 @@
6003F590195388D20070C39A /* CoreGraphics.framework in Frameworks */,
6003F592195388D20070C39A /* UIKit.framework in Frameworks */,
6003F58E195388D20070C39A /* Foundation.framework in Frameworks */,
A6AA48184A40B08E58A863BA /* Pods_FLKAutoLayout_Example.framework in Frameworks */,
5F4C3A8365CBDC98C9EF3D43 /* Pods_FLKAutoLayout_Example.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -86,20 +82,17 @@
6003F5B0195388D20070C39A /* XCTest.framework in Frameworks */,
6003F5B2195388D20070C39A /* UIKit.framework in Frameworks */,
6003F5B1195388D20070C39A /* Foundation.framework in Frameworks */,
AB8ECBBBFCC959FE7F3C767A /* Pods_FLKAutoLayout_Tests.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
1DADC960E2FDD8C76C9FB06A /* Pods */ = {
2DDC2BA9660333B8DC9BD4C1 /* Pods */ = {
isa = PBXGroup;
children = (
BC2FFCA23DE3B4FA44CDAC9E /* Pods-FLKAutoLayout_Example.debug.xcconfig */,
41DA75B30AC3663C6FD58B6C /* Pods-FLKAutoLayout_Example.release.xcconfig */,
D5DECF1D303A4EB427C6B5E1 /* Pods-FLKAutoLayout_Tests.debug.xcconfig */,
ABBD61D40DBA71DABD757469 /* Pods-FLKAutoLayout_Tests.release.xcconfig */,
E546AB97A8120267033D5B65 /* Pods-FLKAutoLayout_Example.debug.xcconfig */,
A2D8C10D1DA8E7D1E7423DAF /* Pods-FLKAutoLayout_Example.release.xcconfig */,
);
name = Pods;
sourceTree = "<group>";
Expand All @@ -112,7 +105,7 @@
6003F5B5195388D20070C39A /* Tests */,
6003F58C195388D20070C39A /* Frameworks */,
6003F58B195388D20070C39A /* Products */,
1DADC960E2FDD8C76C9FB06A /* Pods */,
2DDC2BA9660333B8DC9BD4C1 /* Pods */,
);
sourceTree = "<group>";
};
Expand All @@ -132,8 +125,7 @@
6003F58F195388D20070C39A /* CoreGraphics.framework */,
6003F591195388D20070C39A /* UIKit.framework */,
6003F5AF195388D20070C39A /* XCTest.framework */,
1B7EB5C0D837B568E20505AF /* Pods_FLKAutoLayout_Example.framework */,
90301B87EF2D8CF6DD6E321E /* Pods_FLKAutoLayout_Tests.framework */,
561766125B24D6DD259F0E6D /* Pods_FLKAutoLayout_Example.framework */,
);
name = Frameworks;
sourceTree = "<group>";
Expand Down Expand Up @@ -200,12 +192,15 @@
isa = PBXNativeTarget;
buildConfigurationList = 6003F5BF195388D20070C39A /* Build configuration list for PBXNativeTarget "FLKAutoLayout_Example" */;
buildPhases = (
E2BA139D3388F77E7CA6EE84 /* Check Pods Manifest.lock */,
BD9A1DD2B8D9767C9E4A5C69 /* 📦 Check Pods Manifest.lock */,
6003F586195388D20070C39A /* Sources */,
6003F587195388D20070C39A /* Frameworks */,
6003F588195388D20070C39A /* Resources */,
2368831EA27EB90833A42881 /* 📦 Embed Pods Frameworks */,
DE5987E4F54243917D4AEFEE /* 📦 Copy Pods Resources */,
DAFFF4518350D4C62189D4CB /* Embed Pods Frameworks */,
D5186F96EEE753988764EE7B /* Copy Pods Resources */,
);
buildRules = (
);
Expand Down Expand Up @@ -368,6 +363,36 @@
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;
};
D5186F96EEE753988764EE7B /* Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-FLKAutoLayout_Example/Pods-FLKAutoLayout_Example-resources.sh\"\n";
showEnvVarsInLog = 0;
};
DAFFF4518350D4C62189D4CB /* Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-FLKAutoLayout_Example/Pods-FLKAutoLayout_Example-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
DE5987E4F54243917D4AEFEE /* 📦 Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand All @@ -383,6 +408,21 @@
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-FLKAutoLayout_Example/Pods-FLKAutoLayout_Example-resources.sh\"\n";
showEnvVarsInLog = 0;
};
E2BA139D3388F77E7CA6EE84 /* Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
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;
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
Expand Down Expand Up @@ -509,7 +549,7 @@
};
6003F5C0195388D20070C39A /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = BC2FFCA23DE3B4FA44CDAC9E /* Pods-FLKAutoLayout_Example.debug.xcconfig */;
baseConfigurationReference = E546AB97A8120267033D5B65 /* Pods-FLKAutoLayout_Example.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
Expand All @@ -526,7 +566,7 @@
};
6003F5C1195388D20070C39A /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 41DA75B30AC3663C6FD58B6C /* Pods-FLKAutoLayout_Example.release.xcconfig */;
baseConfigurationReference = A2D8C10D1DA8E7D1E7423DAF /* Pods-FLKAutoLayout_Example.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
Expand All @@ -543,7 +583,6 @@
};
6003F5C3195388D20070C39A /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = D5DECF1D303A4EB427C6B5E1 /* Pods-FLKAutoLayout_Tests.debug.xcconfig */;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -567,7 +606,6 @@
};
6003F5C4195388D20070C39A /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = ABBD61D40DBA71DABD757469 /* Pods-FLKAutoLayout_Tests.release.xcconfig */;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
FRAMEWORK_SEARCH_PATHS = (
Expand Down
9 changes: 0 additions & 9 deletions Example/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,4 @@ use_frameworks!

target 'FLKAutoLayout_Example' do
pod 'FLKAutoLayout', :path => '../'

target 'FLKAutoLayout_Tests' do
inherit! :search_paths

pod 'Specta'
pod 'Expecta'
pod 'FBSnapshotTestCase'
pod 'Expecta+Snapshots'
end
end
22 changes: 1 addition & 21 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,34 +1,14 @@
PODS:
- Expecta (1.0.5)
- Expecta+Snapshots (2.0.0):
- Expecta (~> 1.0)
- FBSnapshotTestCase/Core (~> 2.0.3)
- FBSnapshotTestCase (2.0.7):
- FBSnapshotTestCase/SwiftSupport (= 2.0.7)
- FBSnapshotTestCase/Core (2.0.7)
- FBSnapshotTestCase/SwiftSupport (2.0.7):
- FBSnapshotTestCase/Core
- FLKAutoLayout (1.0.0)
- Specta (1.0.5)

DEPENDENCIES:
- Expecta
- Expecta+Snapshots
- FBSnapshotTestCase
- FLKAutoLayout (from `../`)
- Specta

EXTERNAL SOURCES:
FLKAutoLayout:
:path: "../"

SPEC CHECKSUMS:
Expecta: e1c022fcd33910b6be89c291d2775b3fe27a89fe
Expecta+Snapshots: 29b38dd695bc72a0ed2bea833937d78df41943ba
FBSnapshotTestCase: 7e85180d0d141a0cf472352edda7e80d7eaeb547
FLKAutoLayout: 106b14dbae09d32c6730190f4e78a959759ba4a4
Specta: ac94d110b865115fe60ff2c6d7281053c6f8e8a2

PODFILE CHECKSUM: ba11c970ebe8df6d9714d44c1c455500c804668a

COCOAPODS: 1.0.0.beta.5
COCOAPODS: 0.39.0
1 change: 1 addition & 0 deletions Example/Pods/Headers/Private/FLKAutoLayout/FLKAutoLayout.h

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

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

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

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

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

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

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

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

20 changes: 20 additions & 0 deletions Example/Pods/Local Podspecs/FLKAutoLayout.podspec.json

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

14 changes: 14 additions & 0 deletions Example/Pods/Manifest.lock

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

Loading

0 comments on commit d2c9ac1

Please sign in to comment.