Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate podfile to 1.0 format #15

Merged
merged 2 commits into from
Aug 5, 2016
Merged

Migrate podfile to 1.0 format #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d53ef0
Update Podfile format
febeling Jun 7, 2016
7e8d74e
pod install
febeling Jun 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
108 changes: 70 additions & 38 deletions Example/JotDemo.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
objects = {

/* Begin PBXBuildFile section */
057E351837D9CDAA1D5D3C07 /* libPods-JotDemoTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F681F1533FDC778D9501DC3F /* libPods-JotDemoTests.a */; };
37BDE598BC75BAA31C0BDE25 /* libPods-JotDemo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 98846FDD80CBCD6CE3542EBA /* libPods-JotDemo.a */; };
565C309C749037E74E54AE09 /* libPods-JotDemoTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D99149F879632EDECF4A68E6 /* libPods-JotDemoTests.a */; };
CA55859C80E1B436920749F2 /* libPods-JotDemo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7CC4142A78886AFB64793EB4 /* libPods-JotDemo.a */; };
FA96BA0C1B72A6440025BFB3 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = FA96BA0B1B72A6440025BFB3 /* AppDelegate.m */; };
FA96BA2E1B72A69F0025BFB3 /* ExampleViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FA96BA2D1B72A69F0025BFB3 /* ExampleViewController.m */; };
FA96BA321B72A6EA0025BFB3 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = FA96BA301B72A6EA0025BFB3 /* Images.xcassets */; };
Expand All @@ -35,12 +35,11 @@
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
52975222728BAE7C84AB4F21 /* Pods-JotDemoTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JotDemoTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-JotDemoTests/Pods-JotDemoTests.debug.xcconfig"; sourceTree = "<group>"; };
98846FDD80CBCD6CE3542EBA /* libPods-JotDemo.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-JotDemo.a"; sourceTree = BUILT_PRODUCTS_DIR; };
BE2827253AD38E3744E7BA5B /* Pods-JotDemoTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JotDemoTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-JotDemoTests/Pods-JotDemoTests.release.xcconfig"; sourceTree = "<group>"; };
CAF45D6293C7457F6CEAF5BD /* Pods-JotDemo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JotDemo.debug.xcconfig"; path = "Pods/Target Support Files/Pods-JotDemo/Pods-JotDemo.debug.xcconfig"; sourceTree = "<group>"; };
D0A1C584456ED4731862286A /* Pods-JotDemo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JotDemo.release.xcconfig"; path = "Pods/Target Support Files/Pods-JotDemo/Pods-JotDemo.release.xcconfig"; sourceTree = "<group>"; };
F681F1533FDC778D9501DC3F /* libPods-JotDemoTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-JotDemoTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
7CC4142A78886AFB64793EB4 /* libPods-JotDemo.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-JotDemo.a"; sourceTree = BUILT_PRODUCTS_DIR; };
8E9D4D1839358185A3433710 /* Pods-JotDemoTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JotDemoTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-JotDemoTests/Pods-JotDemoTests.release.xcconfig"; sourceTree = "<group>"; };
D89B434B8F551F4ABE522315 /* Pods-JotDemo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JotDemo.release.xcconfig"; path = "Pods/Target Support Files/Pods-JotDemo/Pods-JotDemo.release.xcconfig"; sourceTree = "<group>"; };
D99149F879632EDECF4A68E6 /* libPods-JotDemoTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-JotDemoTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
DC5E9591D098267E78685A45 /* Pods-JotDemoTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JotDemoTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-JotDemoTests/Pods-JotDemoTests.debug.xcconfig"; sourceTree = "<group>"; };
FA96BA031B72A6440025BFB3 /* JotDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = JotDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
FA96BA0A1B72A6440025BFB3 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
FA96BA0B1B72A6440025BFB3 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
Expand All @@ -60,44 +59,45 @@
FA96BA3D1B72A7500025BFB3 /* JotViewControllerSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JotViewControllerSpec.m; sourceTree = "<group>"; };
FA96BA451B72A7570025BFB3 /* JotTestImage.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = JotTestImage.png; sourceTree = "<group>"; };
FA96BA471B72A75D0025BFB3 /* UIImageJotSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIImageJotSpec.m; sourceTree = "<group>"; };
FE0477A88B36CB24B3DB67F3 /* Pods-JotDemo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JotDemo.debug.xcconfig"; path = "Pods/Target Support Files/Pods-JotDemo/Pods-JotDemo.debug.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
FA96BA001B72A6440025BFB3 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
37BDE598BC75BAA31C0BDE25 /* libPods-JotDemo.a in Frameworks */,
CA55859C80E1B436920749F2 /* libPods-JotDemo.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
FA96BA191B72A6440025BFB3 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
057E351837D9CDAA1D5D3C07 /* libPods-JotDemoTests.a in Frameworks */,
565C309C749037E74E54AE09 /* libPods-JotDemoTests.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
8FBF610130E255A18C9C0D20 /* Pods */ = {
681E7D1FC0C62EF86FB3A210 /* Pods */ = {
isa = PBXGroup;
children = (
CAF45D6293C7457F6CEAF5BD /* Pods-JotDemo.debug.xcconfig */,
D0A1C584456ED4731862286A /* Pods-JotDemo.release.xcconfig */,
52975222728BAE7C84AB4F21 /* Pods-JotDemoTests.debug.xcconfig */,
BE2827253AD38E3744E7BA5B /* Pods-JotDemoTests.release.xcconfig */,
FE0477A88B36CB24B3DB67F3 /* Pods-JotDemo.debug.xcconfig */,
D89B434B8F551F4ABE522315 /* Pods-JotDemo.release.xcconfig */,
DC5E9591D098267E78685A45 /* Pods-JotDemoTests.debug.xcconfig */,
8E9D4D1839358185A3433710 /* Pods-JotDemoTests.release.xcconfig */,
);
name = Pods;
sourceTree = "<group>";
};
C69D0180AB7A0013D3144E9F /* Frameworks */ = {
9FB908404182465B468730F4 /* Frameworks */ = {
isa = PBXGroup;
children = (
98846FDD80CBCD6CE3542EBA /* libPods-JotDemo.a */,
F681F1533FDC778D9501DC3F /* libPods-JotDemoTests.a */,
7CC4142A78886AFB64793EB4 /* libPods-JotDemo.a */,
D99149F879632EDECF4A68E6 /* libPods-JotDemoTests.a */,
);
name = Frameworks;
sourceTree = "<group>";
Expand All @@ -108,8 +108,8 @@
FA96BA051B72A6440025BFB3 /* JotDemo */,
FA96BA1F1B72A6440025BFB3 /* JotDemoTests */,
FA96BA041B72A6440025BFB3 /* Products */,
8FBF610130E255A18C9C0D20 /* Pods */,
C69D0180AB7A0013D3144E9F /* Frameworks */,
681E7D1FC0C62EF86FB3A210 /* Pods */,
9FB908404182465B468730F4 /* Frameworks */,
);
sourceTree = "<group>";
};
Expand Down Expand Up @@ -192,11 +192,12 @@
isa = PBXNativeTarget;
buildConfigurationList = FA96BA261B72A6440025BFB3 /* Build configuration list for PBXNativeTarget "JotDemo" */;
buildPhases = (
4FA9DADE699A6AC752AB964E /* Check Pods Manifest.lock */,
641DF19D787ED4BED7EE2A0A /* [CP] Check Pods Manifest.lock */,
FA96B9FF1B72A6440025BFB3 /* Sources */,
FA96BA001B72A6440025BFB3 /* Frameworks */,
FA96BA011B72A6440025BFB3 /* Resources */,
902B3E0D514C82E188009464 /* Copy Pods Resources */,
57EC7234EA3E34CE44BA9304 /* [CP] Embed Pods Frameworks */,
BF6FF1EA611EEB1AC9B5F1DA /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand All @@ -211,11 +212,12 @@
isa = PBXNativeTarget;
buildConfigurationList = FA96BA291B72A6440025BFB3 /* Build configuration list for PBXNativeTarget "JotDemoTests" */;
buildPhases = (
94F88D73500B474B1BFFB0D9 /* Check Pods Manifest.lock */,
2025E036E4788A0DE7B6F40F /* [CP] Check Pods Manifest.lock */,
FA96BA181B72A6440025BFB3 /* Sources */,
FA96BA191B72A6440025BFB3 /* Frameworks */,
FA96BA1A1B72A6440025BFB3 /* Resources */,
153AFC8516D413C459C0609D /* Copy Pods Resources */,
040FD3073761DC71B2E0C05B /* [CP] Embed Pods Frameworks */,
47897E9F863644F41FB1C5F8 /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand Down Expand Up @@ -285,66 +287,96 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
153AFC8516D413C459C0609D /* Copy Pods Resources */ = {
040FD3073761DC71B2E0C05B /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Copy Pods Resources";
name = "[CP] Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-JotDemoTests/Pods-JotDemoTests-resources.sh\"\n";
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-JotDemoTests/Pods-JotDemoTests-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
4FA9DADE699A6AC752AB964E /* Check Pods Manifest.lock */ = {
2025E036E4788A0DE7B6F40F /* [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;
};
902B3E0D514C82E188009464 /* Copy Pods Resources */ = {
47897E9F863644F41FB1C5F8 /* [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-JotDemo/Pods-JotDemo-resources.sh\"\n";
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-JotDemoTests/Pods-JotDemoTests-resources.sh\"\n";
showEnvVarsInLog = 0;
};
57EC7234EA3E34CE44BA9304 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-JotDemo/Pods-JotDemo-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
94F88D73500B474B1BFFB0D9 /* Check Pods Manifest.lock */ = {
641DF19D787ED4BED7EE2A0A /* [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;
};
BF6FF1EA611EEB1AC9B5F1DA /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-JotDemo/Pods-JotDemo-resources.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
Expand Down Expand Up @@ -467,7 +499,7 @@
};
FA96BA271B72A6440025BFB3 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = CAF45D6293C7457F6CEAF5BD /* Pods-JotDemo.debug.xcconfig */;
baseConfigurationReference = FE0477A88B36CB24B3DB67F3 /* Pods-JotDemo.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
Expand All @@ -481,7 +513,7 @@
};
FA96BA281B72A6440025BFB3 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = D0A1C584456ED4731862286A /* Pods-JotDemo.release.xcconfig */;
baseConfigurationReference = D89B434B8F551F4ABE522315 /* Pods-JotDemo.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
Expand All @@ -495,7 +527,7 @@
};
FA96BA2A1B72A6440025BFB3 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 52975222728BAE7C84AB4F21 /* Pods-JotDemoTests.debug.xcconfig */;
baseConfigurationReference = DC5E9591D098267E78685A45 /* Pods-JotDemoTests.debug.xcconfig */;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -515,7 +547,7 @@
};
FA96BA2B1B72A6440025BFB3 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = BE2827253AD38E3744E7BA5B /* Pods-JotDemoTests.release.xcconfig */;
baseConfigurationReference = 8E9D4D1839358185A3433710 /* Pods-JotDemoTests.release.xcconfig */;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
FRAMEWORK_SEARCH_PATHS = (
Expand Down
12 changes: 4 additions & 8 deletions Example/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,15 @@
source 'https://github.com/CocoaPods/Specs.git'

xcodeproj 'JotDemo'
project 'JotDemo'

platform :ios, '8.0'

def install_pods
target 'JotDemo' do
pod "jot", :path => "../jot.podspec"
end

target 'JotDemo', :exclusive => true do
install_pods
end

target 'JotDemoTests', :exclusive => true do
install_pods
target 'JotDemoTests' do
inherit! :search_paths
pod 'Specta'
pod 'Expecta'
pod 'Expecta+Snapshots'
Expand Down
39 changes: 21 additions & 18 deletions Example/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
PODS:
- Expecta (1.0.2)
- Expecta+Snapshots (2.0.0):
- Expecta (1.0.5)
- Expecta+Snapshots (3.0.0):
- Expecta (~> 1.0)
- FBSnapshotTestCase/Core (~> 2.0.3)
- FBSnapshotTestCase/Core (2.0.3)
- FBSnapshotTestCase/Core (~> 2.0)
- Specta (~> 1.0)
- FBSnapshotTestCase/Core (2.1.1)
- jot (0.1.5):
- Masonry (~> 0.6.1)
- Masonry (0.6.2)
- OCHamcrest (4.1.1)
- OCMockito (1.4.0):
- OCHamcrest (~> 4.0)
- Specta (1.0.3)
- Masonry (0.6.4)
- OCHamcrest (5.4.0)
- OCMockito (3.0.1):
- OCHamcrest (~> 5.1)
- Specta (1.0.5)

DEPENDENCIES:
- Expecta
Expand All @@ -21,16 +22,18 @@ DEPENDENCIES:

EXTERNAL SOURCES:
jot:
:path: ../jot.podspec
:path: "../jot.podspec"

SPEC CHECKSUMS:
Expecta: 54e8a3530add08f4f0208c111355eda7cde74a53
Expecta+Snapshots: 29b38dd695bc72a0ed2bea833937d78df41943ba
FBSnapshotTestCase: d0eeca6bf87958e088b254396ae66873f971cfb1
Expecta: e1c022fcd33910b6be89c291d2775b3fe27a89fe
Expecta+Snapshots: c343f410c7a6392f3e22e78f94c44b6c0749a516
FBSnapshotTestCase: 432afd8d059ccef7f207225894840a03fbcf7474
jot: 0f5dc333defa6ad805d01adc3834b201c22510a7
Masonry: 362e8a1cc0beada4a4c4832d5e863da2a51533be
OCHamcrest: 6f03ffa81d12feab872638490a44ab0a6d3aca10
OCMockito: 4981140c9a9ec06c31af40f636e3c0f25f27e6b2
Specta: cf3e4188cf35375c3ee2cd03f8db8f1f4ef98234
Masonry: 281802d04d787ea2973179ee8bcb50500579ede2
OCHamcrest: 5c1d441c5a82fb18ac17c2aeb52ec1a99edb971b
OCMockito: 9eee3c61e42f7cb8aa015d66f8cc16849701d973
Specta: ac94d110b865115fe60ff2c6d7281053c6f8e8a2

COCOAPODS: 0.38.2
PODFILE CHECKSUM: a7794cf037c01af9d2e08f4c6a2bdd51b8b88245

COCOAPODS: 1.0.1