From 6d6ea0067adda60b27dd9ccca3947e21bbcc0825 Mon Sep 17 00:00:00 2001 From: Aaron Douglas Date: Fri, 13 May 2016 07:14:05 -0500 Subject: [PATCH 1/2] Updated Podfile and project configuration to CocoaPods 1.0 --- Example/Podfile | 10 +- Example/Podfile.lock | 4 +- Example/Tests/Tests-Info.plist | 2 +- .../WPMediaPicker.xcodeproj/project.pbxproj | 97 ++++++++++--------- .../xcschemes/WPMediaPicker-Example.xcscheme | 19 ++-- .../WPMediaPicker/WPMediaPicker-Info.plist | 2 +- 6 files changed, 72 insertions(+), 62 deletions(-) diff --git a/Example/Podfile b/Example/Podfile index 21a121ed..f31d5bf8 100644 --- a/Example/Podfile +++ b/Example/Podfile @@ -1,11 +1,9 @@ source 'https://github.com/CocoaPods/Specs.git' -target 'WPMediaPicker', :exclusive => true do - pod "WPMediaPicker", :path => "../" -end - -target 'Tests', :exclusive => true do +target 'WPMediaPicker' do pod "WPMediaPicker", :path => "../" - + target 'Tests' do + inherit! :search_paths + end end diff --git a/Example/Podfile.lock b/Example/Podfile.lock index 7911b559..22dc8405 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -11,4 +11,6 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: WPMediaPicker: 7dde7576a67a9a494733555a89c9ff8418f5eede -COCOAPODS: 0.39.0 +PODFILE CHECKSUM: 7855568785f801c5559f8e70856ad87de227dc95 + +COCOAPODS: 1.0.0 diff --git a/Example/Tests/Tests-Info.plist b/Example/Tests/Tests-Info.plist index 41520eda..169b6f71 100644 --- a/Example/Tests/Tests-Info.plist +++ b/Example/Tests/Tests-Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIdentifier - org.cocoapods.demo.${PRODUCT_NAME:rfc1034identifier} + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundlePackageType diff --git a/Example/WPMediaPicker.xcodeproj/project.pbxproj b/Example/WPMediaPicker.xcodeproj/project.pbxproj index 86c4f319..30549dd7 100644 --- a/Example/WPMediaPicker.xcodeproj/project.pbxproj +++ b/Example/WPMediaPicker.xcodeproj/project.pbxproj @@ -7,7 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 006E2D5AA0195B088D0B943F /* libPods-WPMediaPicker.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C37855A2D5569FF3200A22B5 /* libPods-WPMediaPicker.a */; }; 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 */; }; @@ -20,8 +19,9 @@ 6003F5B2195388D20070C39A /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F591195388D20070C39A /* UIKit.framework */; }; 6003F5BA195388D20070C39A /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 6003F5B8195388D20070C39A /* InfoPlist.strings */; }; 6003F5BC195388D20070C39A /* Tests.m in Sources */ = {isa = PBXBuildFile; fileRef = 6003F5BB195388D20070C39A /* Tests.m */; }; + 702AD5F17F8916AABC105A1B /* libPods-WPMediaPicker.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8C1CDA09FDF3F25E866D8A4D /* libPods-WPMediaPicker.a */; }; + AE22BBE03B862A6657E6B66E /* libPods-Tests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6E1E578A5967DE531E1AC701 /* libPods-Tests.a */; }; B5FF3BEA1CAD8AB100C1D597 /* PostProcessingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B5FF3BE91CAD8AB100C1D597 /* PostProcessingViewController.m */; }; - DD821F4817504E75FB9E2B91 /* libPods-Tests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9BA47A0718D787F4D3E328AF /* libPods-Tests.a */; }; FFC3F6F31B0D9BB100EFC359 /* Launch Screen.xib in Resources */ = {isa = PBXBuildFile; fileRef = FFC3F6F21B0D9BB100EFC359 /* Launch Screen.xib */; }; FFE69A1D1B14AB840073C2EB /* OptionsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FFE69A1C1B14AB840073C2EB /* OptionsViewController.m */; }; FFFFD8811A447E67000FC184 /* DemoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FFFFD8801A447E67000FC184 /* DemoViewController.m */; }; @@ -38,6 +38,7 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + 1120051BDDDC8A558883872E /* Pods-WPMediaPicker.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WPMediaPicker.release.xcconfig"; path = "Pods/Target Support Files/Pods-WPMediaPicker/Pods-WPMediaPicker.release.xcconfig"; sourceTree = ""; }; 5709B45B57F590232B3E5DA7 /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = ""; }; 6003F58A195388D20070C39A /* WPMediaPicker.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = WPMediaPicker.app; sourceTree = BUILT_PRODUCTS_DIR; }; 6003F58D195388D20070C39A /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; @@ -56,16 +57,15 @@ 6003F5B9195388D20070C39A /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; 6003F5BB195388D20070C39A /* Tests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Tests.m; sourceTree = ""; }; 606FC2411953D9B200FFA9A0 /* Tests-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Tests-Prefix.pch"; sourceTree = ""; }; - 9BA47A0718D787F4D3E328AF /* libPods-Tests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Tests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 6E1E578A5967DE531E1AC701 /* libPods-Tests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Tests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 77BAAAD0DCE591BC9BED9E6D /* Pods-Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Tests/Pods-Tests.debug.xcconfig"; sourceTree = ""; }; + 8C1CDA09FDF3F25E866D8A4D /* libPods-WPMediaPicker.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-WPMediaPicker.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 96397568C67A5B575A574CB8 /* Pods-Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-Tests/Pods-Tests.release.xcconfig"; sourceTree = ""; }; + ABF10F16DB0AA9A8008C72C7 /* Pods-WPMediaPicker.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WPMediaPicker.debug.xcconfig"; path = "Pods/Target Support Files/Pods-WPMediaPicker/Pods-WPMediaPicker.debug.xcconfig"; sourceTree = ""; }; B5FF3BE81CAD8AB100C1D597 /* PostProcessingViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PostProcessingViewController.h; sourceTree = ""; }; B5FF3BE91CAD8AB100C1D597 /* PostProcessingViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PostProcessingViewController.m; sourceTree = ""; }; - C37855A2D5569FF3200A22B5 /* libPods-WPMediaPicker.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-WPMediaPicker.a"; sourceTree = BUILT_PRODUCTS_DIR; }; CEF4FB57530C0C9D7C09607C /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = ""; }; - E02C8816F24DD6C15E1FC723 /* Pods-WPMediaPicker.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WPMediaPicker.debug.xcconfig"; path = "Pods/Target Support Files/Pods-WPMediaPicker/Pods-WPMediaPicker.debug.xcconfig"; sourceTree = ""; }; - E649DE2458AC5BF08969DE12 /* Pods-Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-Tests/Pods-Tests.release.xcconfig"; sourceTree = ""; }; - ED8347A02DA278006813C36B /* Pods-Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Tests/Pods-Tests.debug.xcconfig"; sourceTree = ""; }; F0D09511821A352B062D5699 /* WPMediaPicker.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = WPMediaPicker.podspec; path = ../WPMediaPicker.podspec; sourceTree = ""; }; - FBE1845B23E3060E3B0B5CF2 /* Pods-WPMediaPicker.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WPMediaPicker.release.xcconfig"; path = "Pods/Target Support Files/Pods-WPMediaPicker/Pods-WPMediaPicker.release.xcconfig"; sourceTree = ""; }; FFC3F6F21B0D9BB100EFC359 /* Launch Screen.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = "Launch Screen.xib"; sourceTree = ""; }; FFE69A1B1B14AB840073C2EB /* OptionsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OptionsViewController.h; sourceTree = ""; }; FFE69A1C1B14AB840073C2EB /* OptionsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OptionsViewController.m; sourceTree = ""; }; @@ -81,7 +81,7 @@ 6003F590195388D20070C39A /* CoreGraphics.framework in Frameworks */, 6003F592195388D20070C39A /* UIKit.framework in Frameworks */, 6003F58E195388D20070C39A /* Foundation.framework in Frameworks */, - 006E2D5AA0195B088D0B943F /* libPods-WPMediaPicker.a in Frameworks */, + 702AD5F17F8916AABC105A1B /* libPods-WPMediaPicker.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -92,7 +92,7 @@ 6003F5B0195388D20070C39A /* XCTest.framework in Frameworks */, 6003F5B2195388D20070C39A /* UIKit.framework in Frameworks */, 6003F5B1195388D20070C39A /* Foundation.framework in Frameworks */, - DD821F4817504E75FB9E2B91 /* libPods-Tests.a in Frameworks */, + AE22BBE03B862A6657E6B66E /* libPods-Tests.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -107,7 +107,7 @@ 6003F5B5195388D20070C39A /* Tests */, 6003F58C195388D20070C39A /* Frameworks */, 6003F58B195388D20070C39A /* Products */, - E407CB686FC85EB404994FDE /* Pods */, + DEFA301703853F22FC055059 /* Pods */, ); sourceTree = ""; }; @@ -127,8 +127,8 @@ 6003F58F195388D20070C39A /* CoreGraphics.framework */, 6003F591195388D20070C39A /* UIKit.framework */, 6003F5AF195388D20070C39A /* XCTest.framework */, - 9BA47A0718D787F4D3E328AF /* libPods-Tests.a */, - C37855A2D5569FF3200A22B5 /* libPods-WPMediaPicker.a */, + 6E1E578A5967DE531E1AC701 /* libPods-Tests.a */, + 8C1CDA09FDF3F25E866D8A4D /* libPods-WPMediaPicker.a */, ); name = Frameworks; sourceTree = ""; @@ -191,13 +191,13 @@ name = "Podspec Metadata"; sourceTree = ""; }; - E407CB686FC85EB404994FDE /* Pods */ = { + DEFA301703853F22FC055059 /* Pods */ = { isa = PBXGroup; children = ( - ED8347A02DA278006813C36B /* Pods-Tests.debug.xcconfig */, - E649DE2458AC5BF08969DE12 /* Pods-Tests.release.xcconfig */, - E02C8816F24DD6C15E1FC723 /* Pods-WPMediaPicker.debug.xcconfig */, - FBE1845B23E3060E3B0B5CF2 /* Pods-WPMediaPicker.release.xcconfig */, + 77BAAAD0DCE591BC9BED9E6D /* Pods-Tests.debug.xcconfig */, + 96397568C67A5B575A574CB8 /* Pods-Tests.release.xcconfig */, + ABF10F16DB0AA9A8008C72C7 /* Pods-WPMediaPicker.debug.xcconfig */, + 1120051BDDDC8A558883872E /* Pods-WPMediaPicker.release.xcconfig */, ); name = Pods; sourceTree = ""; @@ -209,12 +209,12 @@ isa = PBXNativeTarget; buildConfigurationList = 6003F5BF195388D20070C39A /* Build configuration list for PBXNativeTarget "WPMediaPicker" */; buildPhases = ( - 6A299E470BC7CCF41972FEAB /* Check Pods Manifest.lock */, + 7EA950800F526715234B0740 /* πŸ“¦ Check Pods Manifest.lock */, 6003F586195388D20070C39A /* Sources */, 6003F587195388D20070C39A /* Frameworks */, 6003F588195388D20070C39A /* Resources */, - 273F2B3655FF3ED715DD5010 /* Copy Pods Resources */, - 11C341739B27F91C059DDA35 /* Embed Pods Frameworks */, + D575F271EA0E434D18070CC1 /* πŸ“¦ Embed Pods Frameworks */, + 865547AC18FA191E35CB4709 /* πŸ“¦ Copy Pods Resources */, ); buildRules = ( ); @@ -229,12 +229,12 @@ isa = PBXNativeTarget; buildConfigurationList = 6003F5C2195388D20070C39A /* Build configuration list for PBXNativeTarget "Tests" */; buildPhases = ( - F1D2D4978A8742F8FFEA7D7A /* Check Pods Manifest.lock */, + F502AF126C3439A64B16CCFE /* πŸ“¦ Check Pods Manifest.lock */, 6003F5AA195388D20070C39A /* Sources */, 6003F5AB195388D20070C39A /* Frameworks */, 6003F5AC195388D20070C39A /* Resources */, - 61C249A98EC657C4CD0FFD2C /* Copy Pods Resources */, - C9C5616AF2A6D010B63EA423 /* Embed Pods Frameworks */, + 05137B1F2BDA1CACBF9B1AEE /* πŸ“¦ Embed Pods Frameworks */, + B693436B67404226FB553D03 /* πŸ“¦ Copy Pods Resources */, ); buildRules = ( ); @@ -253,7 +253,7 @@ isa = PBXProject; attributes = { CLASSPREFIX = WP; - LastUpgradeCheck = 0510; + LastUpgradeCheck = 0730; ORGANIZATIONNAME = "Sérgio EsteΜ‚vaΜƒo"; TargetAttributes = { 6003F5AD195388D20070C39A = { @@ -302,89 +302,89 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 11C341739B27F91C059DDA35 /* Embed Pods Frameworks */ = { + 05137B1F2BDA1CACBF9B1AEE /* πŸ“¦ 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-WPMediaPicker/Pods-WPMediaPicker-frameworks.sh\"\n"; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Tests/Pods-Tests-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - 273F2B3655FF3ED715DD5010 /* Copy Pods Resources */ = { + 7EA950800F526715234B0740 /* πŸ“¦ Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Copy Pods Resources"; + name = "πŸ“¦ Check Pods Manifest.lock"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-WPMediaPicker/Pods-WPMediaPicker-resources.sh\"\n"; + 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; }; - 61C249A98EC657C4CD0FFD2C /* Copy Pods Resources */ = { + 865547AC18FA191E35CB4709 /* πŸ“¦ Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Copy Pods Resources"; + name = "πŸ“¦ Copy Pods Resources"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Tests/Pods-Tests-resources.sh\"\n"; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-WPMediaPicker/Pods-WPMediaPicker-resources.sh\"\n"; showEnvVarsInLog = 0; }; - 6A299E470BC7CCF41972FEAB /* Check Pods Manifest.lock */ = { + B693436B67404226FB553D03 /* πŸ“¦ Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Check Pods Manifest.lock"; + name = "πŸ“¦ Copy Pods Resources"; 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 = "\"${SRCROOT}/Pods/Target Support Files/Pods-Tests/Pods-Tests-resources.sh\"\n"; showEnvVarsInLog = 0; }; - C9C5616AF2A6D010B63EA423 /* Embed Pods Frameworks */ = { + D575F271EA0E434D18070CC1 /* πŸ“¦ 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-Tests/Pods-Tests-frameworks.sh\"\n"; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-WPMediaPicker/Pods-WPMediaPicker-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - F1D2D4978A8742F8FFEA7D7A /* Check Pods Manifest.lock */ = { + F502AF126C3439A64B16CCFE /* πŸ“¦ Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Check Pods Manifest.lock"; + name = "πŸ“¦ Check Pods Manifest.lock"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; @@ -463,6 +463,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; COPY_PHASE_STRIP = NO; + ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; @@ -519,7 +520,7 @@ }; 6003F5C0195388D20070C39A /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = E02C8816F24DD6C15E1FC723 /* Pods-WPMediaPicker.debug.xcconfig */; + baseConfigurationReference = ABF10F16DB0AA9A8008C72C7 /* Pods-WPMediaPicker.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; @@ -529,6 +530,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "WPMediaPicker/WPMediaPicker-Prefix.pch"; INFOPLIST_FILE = "WPMediaPicker/WPMediaPicker-Info.plist"; + PRODUCT_BUNDLE_IDENTIFIER = "org.wordpress.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; RUN_CLANG_STATIC_ANALYZER = YES; @@ -538,7 +540,7 @@ }; 6003F5C1195388D20070C39A /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = FBE1845B23E3060E3B0B5CF2 /* Pods-WPMediaPicker.release.xcconfig */; + baseConfigurationReference = 1120051BDDDC8A558883872E /* Pods-WPMediaPicker.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; @@ -548,6 +550,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "WPMediaPicker/WPMediaPicker-Prefix.pch"; INFOPLIST_FILE = "WPMediaPicker/WPMediaPicker-Info.plist"; + PRODUCT_BUNDLE_IDENTIFIER = "org.wordpress.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; RUN_CLANG_STATIC_ANALYZER = YES; @@ -557,7 +560,7 @@ }; 6003F5C3195388D20070C39A /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = ED8347A02DA278006813C36B /* Pods-Tests.debug.xcconfig */; + baseConfigurationReference = 77BAAAD0DCE591BC9BED9E6D /* Pods-Tests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/WPMediaPicker.app/WPMediaPicker"; FRAMEWORK_SEARCH_PATHS = ( @@ -572,6 +575,7 @@ "$(inherited)", ); INFOPLIST_FILE = "Tests/Tests-Info.plist"; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; TEST_HOST = "$(BUNDLE_LOADER)"; WRAPPER_EXTENSION = xctest; @@ -580,7 +584,7 @@ }; 6003F5C4195388D20070C39A /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = E649DE2458AC5BF08969DE12 /* Pods-Tests.release.xcconfig */; + baseConfigurationReference = 96397568C67A5B575A574CB8 /* Pods-Tests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/WPMediaPicker.app/WPMediaPicker"; FRAMEWORK_SEARCH_PATHS = ( @@ -591,6 +595,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Tests/Tests-Prefix.pch"; INFOPLIST_FILE = "Tests/Tests-Info.plist"; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; TEST_HOST = "$(BUNDLE_LOADER)"; WRAPPER_EXTENSION = xctest; diff --git a/Example/WPMediaPicker.xcodeproj/xcshareddata/xcschemes/WPMediaPicker-Example.xcscheme b/Example/WPMediaPicker.xcodeproj/xcshareddata/xcschemes/WPMediaPicker-Example.xcscheme index 28855017..1b300f7e 100644 --- a/Example/WPMediaPicker.xcodeproj/xcshareddata/xcschemes/WPMediaPicker-Example.xcscheme +++ b/Example/WPMediaPicker.xcodeproj/xcshareddata/xcschemes/WPMediaPicker-Example.xcscheme @@ -1,6 +1,6 @@ + shouldUseLaunchSchemeArgsEnv = "YES"> @@ -48,17 +48,21 @@ ReferencedContainer = "container:WPMediaPicker.xcodeproj"> + + - + - + CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIdentifier - org.wordpress.$(PRODUCT_NAME:rfc1034identifier) + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName From 7f09bec20e820da4113593a31c977f074a8377b9 Mon Sep 17 00:00:00 2001 From: Aaron Douglas Date: Fri, 13 May 2016 07:49:30 -0500 Subject: [PATCH 2/2] Updated Travis configuration to install CocoaPods 1.0 --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 9114e3e1..2db199c3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,5 @@ +install: +- gem install cocoapods -v 1.0.0 osx_image: xcode7.1 sudo: false language: objective-c