Skip to content
This repository was archived by the owner on Nov 29, 2022. It is now read-only.

Working Samples + CocoaPods v1.0 support #131

Open
ahbou wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Working Samples + CocoaPods v1.0 support #131

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
5f138bc
back to origin
ahbou Aug 11, 2016
16d8fcc
updated to Cocoapods v1
ahbou Aug 11, 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
82 changes: 49 additions & 33 deletions Examples/PhotoEditor/PhotoEditor.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
4F6B084D1A22B63F00E1F8C7 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4F6B084B1A22B63F00E1F8C7 /* Main.storyboard */; };
4F6B084F1A22B63F00E1F8C7 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4F6B084E1A22B63F00E1F8C7 /* Images.xcassets */; };
4F6B08521A22B63F00E1F8C7 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4F6B08501A22B63F00E1F8C7 /* LaunchScreen.xib */; };
9718D46E917810D7ACB38435 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2AB8BB016E2DECEA77746C23 /* libPods.a */; };
CC0E23D6EC1EAFE253F58C3E /* libPods-PhotoEditor.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 40F35A7CAB29483B6664E954 /* libPods-PhotoEditor.a */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
2AB8BB016E2DECEA77746C23 /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; };
4339AF8BA51D5F4A6B16F409 /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = "<group>"; };
40F35A7CAB29483B6664E954 /* libPods-PhotoEditor.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-PhotoEditor.a"; sourceTree = BUILT_PRODUCTS_DIR; };
4DC7989866A7E2C1536AD981 /* Pods-PhotoEditor.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PhotoEditor.release.xcconfig"; path = "Pods/Target Support Files/Pods-PhotoEditor/Pods-PhotoEditor.release.xcconfig"; sourceTree = "<group>"; };
4F6B083E1A22B63F00E1F8C7 /* PhotoEditor.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PhotoEditor.app; sourceTree = BUILT_PRODUCTS_DIR; };
4F6B08421A22B63F00E1F8C7 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
4F6B08431A22B63F00E1F8C7 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
Expand All @@ -29,45 +29,28 @@
4F6B084C1A22B63F00E1F8C7 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
4F6B084E1A22B63F00E1F8C7 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
4F6B08511A22B63F00E1F8C7 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = "<group>"; };
AC87F88D2D9CBD566FED4DBC /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = "<group>"; };
C3268197CC60B8D61A7885BB /* Pods-PhotoEditor.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PhotoEditor.debug.xcconfig"; path = "Pods/Target Support Files/Pods-PhotoEditor/Pods-PhotoEditor.debug.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
4F6B083B1A22B63F00E1F8C7 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
9718D46E917810D7ACB38435 /* libPods.a in Frameworks */,
CC0E23D6EC1EAFE253F58C3E /* libPods-PhotoEditor.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
028CA31FD55107DA1D3904C7 /* Pods */ = {
isa = PBXGroup;
children = (
AC87F88D2D9CBD566FED4DBC /* Pods.debug.xcconfig */,
4339AF8BA51D5F4A6B16F409 /* Pods.release.xcconfig */,
);
name = Pods;
sourceTree = "<group>";
};
1C5F9E7FC510438F50DA2A3C /* Frameworks */ = {
isa = PBXGroup;
children = (
2AB8BB016E2DECEA77746C23 /* libPods.a */,
);
name = Frameworks;
sourceTree = "<group>";
};
4F6B08351A22B63F00E1F8C7 = {
isa = PBXGroup;
children = (
4F6B08401A22B63F00E1F8C7 /* PhotoEditor */,
4F6B083F1A22B63F00E1F8C7 /* Products */,
028CA31FD55107DA1D3904C7 /* Pods */,
1C5F9E7FC510438F50DA2A3C /* Frameworks */,
BB1DF01C6B1A0803DB174A60 /* Pods */,
988D1F38E75A163E65C6BBF1 /* Frameworks */,
);
sourceTree = "<group>";
};
Expand Down Expand Up @@ -103,18 +86,36 @@
name = "Supporting Files";
sourceTree = "<group>";
};
988D1F38E75A163E65C6BBF1 /* Frameworks */ = {
isa = PBXGroup;
children = (
40F35A7CAB29483B6664E954 /* libPods-PhotoEditor.a */,
);
name = Frameworks;
sourceTree = "<group>";
};
BB1DF01C6B1A0803DB174A60 /* Pods */ = {
isa = PBXGroup;
children = (
C3268197CC60B8D61A7885BB /* Pods-PhotoEditor.debug.xcconfig */,
4DC7989866A7E2C1536AD981 /* Pods-PhotoEditor.release.xcconfig */,
);
name = Pods;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
4F6B083D1A22B63F00E1F8C7 /* PhotoEditor */ = {
isa = PBXNativeTarget;
buildConfigurationList = 4F6B08611A22B63F00E1F8C7 /* Build configuration list for PBXNativeTarget "PhotoEditor" */;
buildPhases = (
A6315882B54FE9551BCE4897 /* Check Pods Manifest.lock */,
5D425819FBD550E4778992D0 /* [CP] Check Pods Manifest.lock */,
4F6B083A1A22B63F00E1F8C7 /* Sources */,
4F6B083B1A22B63F00E1F8C7 /* Frameworks */,
4F6B083C1A22B63F00E1F8C7 /* Resources */,
F8DF7AA4ADA5541C0F3E60FA /* Copy Pods Resources */,
E17C95B272CC2E98B8BD744F /* [CP] Embed Pods Frameworks */,
E3B3B3A09CCE9F22C901072A /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand Down Expand Up @@ -171,34 +172,49 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
A6315882B54FE9551BCE4897 /* Check Pods Manifest.lock */ = {
5D425819FBD550E4778992D0 /* [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;
};
F8DF7AA4ADA5541C0F3E60FA /* Copy Pods Resources */ = {
E17C95B272CC2E98B8BD744F /* [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-PhotoEditor/Pods-PhotoEditor-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
E3B3B3A09CCE9F22C901072A /* [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/Pods-resources.sh\"\n";
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-PhotoEditor/Pods-PhotoEditor-resources.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
Expand Down Expand Up @@ -317,7 +333,7 @@
};
4F6B08621A22B63F00E1F8C7 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = AC87F88D2D9CBD566FED4DBC /* Pods.debug.xcconfig */;
baseConfigurationReference = C3268197CC60B8D61A7885BB /* Pods-PhotoEditor.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
Expand All @@ -330,7 +346,7 @@
};
4F6B08631A22B63F00E1F8C7 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 4339AF8BA51D5F4A6B16F409 /* Pods.release.xcconfig */;
baseConfigurationReference = 4DC7989866A7E2C1536AD981 /* Pods-PhotoEditor.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
Expand Down
4 changes: 3 additions & 1 deletion Examples/PhotoEditor/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
source 'https://github.com/CocoaPods/Specs.git'
platform :ios, '8.0'

pod 'DZNPhotoPickerController/Editor', :path => '../../'
target :PhotoEditor do
pod 'DZNPhotoPickerController/Editor', :path => '../../'
end
4 changes: 3 additions & 1 deletion Examples/PhotoEditor/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,6 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
DZNPhotoPickerController: 1a9b83a53a2f35094e35c163417ab0aeb8653fd1

COCOAPODS: 0.38.2
PODFILE CHECKSUM: 7668fe0a4b2ba07051708fd3a17f41abd068c84a

COCOAPODS: 1.0.1
4 changes: 3 additions & 1 deletion Examples/PhotoEditor/Pods/Manifest.lock
View file
Open in desktop

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

Loading