diff --git a/Configurations/ParseTwitterUtils-Tests.xcconfig b/Configurations/ParseTwitterUtils-Tests.xcconfig index 9af5cf1..c7893d9 100644 --- a/Configurations/ParseTwitterUtils-Tests.xcconfig +++ b/Configurations/ParseTwitterUtils-Tests.xcconfig @@ -12,11 +12,11 @@ #include "Pods/Target Support Files/Pods-ParseTwitterUtils-Tests/Pods-ParseTwitterUtils-Tests.debug.xcconfig" PRODUCT_NAME = ParseTwitterUtils-Tests +IPHONEOS_DEPLOYMENT_TARGET = 8.0 CLANG_ENABLE_MODULES = YES -FRAMEWORK_SEARCH_PATHS = $(inherited) $(BUILT_PRODUCTS_DIR) $(SRCROOT)/Vendor -LIBRARY_SEARCH_PATHS = $(inherited) $(BUILT_PRODUCTS_DIR) +FRAMEWORK_SEARCH_PATHS = $(inherited) $(BUILT_PRODUCTS_DIR) $(BUILT_PRODUCTS_DIR)/OCMock $(SRCROOT)/Vendor HEADER_SEARCH_PATHS = $(inherited) $(BUILT_PRODUCTS_DIR) INFOPLIST_FILE = $(PROJECT_DIR)/Tests/Resources/Info.plist diff --git a/Gemfile b/Gemfile index 0f746f3..bdc29af 100644 --- a/Gemfile +++ b/Gemfile @@ -3,4 +3,4 @@ source 'https://rubygems.org' gem 'naturally' gem 'rake' gem 'xcpretty' -gem 'cocoapods', '~> 0.39' +gem 'cocoapods' diff --git a/Gemfile.lock b/Gemfile.lock index 3a8aba1..333b181 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,53 +7,57 @@ GEM minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - claide (0.9.1) - cocoapods (0.39.0) + claide (1.0.0) + cocoapods (1.0.1) activesupport (>= 4.0.2) - claide (~> 0.9.1) - cocoapods-core (= 0.39.0) - cocoapods-downloader (~> 0.9.3) - cocoapods-plugins (~> 0.4.2) - cocoapods-search (~> 0.1.0) - cocoapods-stats (~> 0.6.2) - cocoapods-trunk (~> 0.6.4) - cocoapods-try (~> 0.5.1) + claide (>= 1.0.0, < 2.0) + cocoapods-core (= 1.0.1) + cocoapods-deintegrate (>= 1.0.0, < 2.0) + cocoapods-downloader (>= 1.0.0, < 2.0) + cocoapods-plugins (>= 1.0.0, < 2.0) + cocoapods-search (>= 1.0.0, < 2.0) + cocoapods-stats (>= 1.0.0, < 2.0) + cocoapods-trunk (>= 1.0.0, < 2.0) + cocoapods-try (>= 1.0.0, < 2.0) colored (~> 1.2) escape (~> 0.0.4) - molinillo (~> 0.4.0) + fourflusher (~> 0.3.0) + molinillo (~> 0.4.5) nap (~> 1.0) - xcodeproj (~> 0.28.2) - cocoapods-core (0.39.0) + xcodeproj (>= 1.1.0, < 2.0) + cocoapods-core (1.0.1) activesupport (>= 4.0.2) fuzzy_match (~> 2.0.4) nap (~> 1.0) - cocoapods-downloader (0.9.3) - cocoapods-plugins (0.4.2) + cocoapods-deintegrate (1.0.0) + cocoapods-downloader (1.0.1) + cocoapods-plugins (1.0.0) nap - cocoapods-search (0.1.0) - cocoapods-stats (0.6.2) - cocoapods-trunk (0.6.4) + cocoapods-search (1.0.0) + cocoapods-stats (1.0.0) + cocoapods-trunk (1.0.0) nap (>= 0.8, < 2.0) netrc (= 0.7.8) - cocoapods-try (0.5.1) + cocoapods-try (1.0.0) colored (1.2) escape (0.0.4) + fourflusher (0.3.2) fuzzy_match (2.0.4) i18n (0.7.0) json (1.8.3) - minitest (5.8.4) - molinillo (0.4.4) + minitest (5.9.0) + molinillo (0.4.5) nap (1.1.0) naturally (2.1.0) netrc (0.7.8) - rake (11.1.2) - rouge (1.10.1) + rake (11.2.2) + rouge (1.11.1) thread_safe (0.3.5) tzinfo (1.2.2) thread_safe (~> 0.1) - xcodeproj (0.28.2) + xcodeproj (1.1.0) activesupport (>= 3) - claide (~> 0.9.1) + claide (>= 1.0.0, < 2.0) colored (~> 1.2) xcpretty (0.2.2) rouge (~> 1.8) @@ -62,10 +66,10 @@ PLATFORMS ruby DEPENDENCIES - cocoapods (~> 0.39) + cocoapods naturally rake xcpretty BUNDLED WITH - 1.11.2 + 1.12.3 diff --git a/ParseTwitterUtils.xcodeproj/project.pbxproj b/ParseTwitterUtils.xcodeproj/project.pbxproj index 989a01e..51b7b57 100644 --- a/ParseTwitterUtils.xcodeproj/project.pbxproj +++ b/ParseTwitterUtils.xcodeproj/project.pbxproj @@ -9,7 +9,7 @@ /* Begin PBXBuildFile section */ 06D00BAB1BC78F23005BAA6F /* ParseTwitterUtils.strings in Resources */ = {isa = PBXBuildFile; fileRef = 06D00BAD1BC78F23005BAA6F /* ParseTwitterUtils.strings */; }; 06D00BB51BC790F3005BAA6F /* PFTwitterLocalization.h in Headers */ = {isa = PBXBuildFile; fileRef = 06D00BB41BC790F3005BAA6F /* PFTwitterLocalization.h */; }; - 77DE89F60F51105C769BEC0B /* libPods-ParseTwitterUtils-Tests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F31BB2625FB261014BCD4FB6 /* libPods-ParseTwitterUtils-Tests.a */; }; + 6193428882637F35420543F7 /* Pods_ParseTwitterUtils_Tests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7104508B3E43E48999110ADF /* Pods_ParseTwitterUtils_Tests.framework */; }; 8135E4951B4B6A0E0092F452 /* PF_Twitter_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 8135E48E1B4B6A0E0092F452 /* PF_Twitter_Private.h */; }; 8135E4961B4B6A0E0092F452 /* PFTwitterAuthenticationProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 8135E48F1B4B6A0E0092F452 /* PFTwitterAuthenticationProvider.h */; }; 8135E4971B4B6A0E0092F452 /* PFTwitterAuthenticationProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 8135E4901B4B6A0E0092F452 /* PFTwitterAuthenticationProvider.m */; }; @@ -76,6 +76,7 @@ 06DD472B1BD0C64500A43759 /* Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; 06DD472C1BD0C64500A43759 /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; 06DD472D1BD0C64500A43759 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; + 7104508B3E43E48999110ADF /* Pods_ParseTwitterUtils_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ParseTwitterUtils_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 8135E48E1B4B6A0E0092F452 /* PF_Twitter_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PF_Twitter_Private.h; sourceTree = ""; }; 8135E48F1B4B6A0E0092F452 /* PFTwitterAuthenticationProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFTwitterAuthenticationProvider.h; sourceTree = ""; }; 8135E4901B4B6A0E0092F452 /* PFTwitterAuthenticationProvider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFTwitterAuthenticationProvider.m; sourceTree = ""; }; @@ -113,7 +114,6 @@ 81CB98E01AB7922C00136FA5 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.2.sdk/System/Library/Frameworks/SystemConfiguration.framework; sourceTree = DEVELOPER_DIR; }; 81D342A01B4C7DA500B6C124 /* ParseTwitterUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ParseTwitterUtils.h; sourceTree = ""; }; D2AAC07E0554694100DB518D /* ParseTwitterUtils.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ParseTwitterUtils.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - F31BB2625FB261014BCD4FB6 /* libPods-ParseTwitterUtils-Tests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ParseTwitterUtils-Tests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; F51535531B57453700C49F56 /* ParseTwitterUtils-iOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "ParseTwitterUtils-iOS.xcconfig"; sourceTree = ""; }; F51535541B57454500C49F56 /* ParseTwitterUtils-Tests.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "ParseTwitterUtils-Tests.xcconfig"; sourceTree = ""; }; F51535551B57455200C49F56 /* ParseTwitterTestApplication.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = ParseTwitterTestApplication.xcconfig; sourceTree = ""; }; @@ -137,7 +137,7 @@ 81CB98CC1AB7905D00136FA5 /* ParseTwitterUtils.framework in Frameworks */, 81CB98D81AB791FB00136FA5 /* Bolts.framework in Frameworks */, 81CB98DB1AB7920E00136FA5 /* Parse.framework in Frameworks */, - 77DE89F60F51105C769BEC0B /* libPods-ParseTwitterUtils-Tests.a in Frameworks */, + 6193428882637F35420543F7 /* Pods_ParseTwitterUtils_Tests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -214,7 +214,7 @@ 81CB98D21AB7906D00136FA5 /* Tests */, 0867D69AFE84028FC02AAC07 /* Frameworks */, 034768DFFF38A50411DB9C8B /* Products */, - 6ADED1B195979E68C4289C24 /* Pods */, + 8EF82AB7049F0059A572B973 /* Pods */, ); indentWidth = 4; name = Breakpad; @@ -225,18 +225,11 @@ children = ( 813DFC8F1AB2513D00F25A08 /* User Frameworks */, 813DFC8E1AB2513300F25A08 /* System Frameworks */, - F31BB2625FB261014BCD4FB6 /* libPods-ParseTwitterUtils-Tests.a */, + 7104508B3E43E48999110ADF /* Pods_ParseTwitterUtils_Tests.framework */, ); name = Frameworks; sourceTree = ""; }; - 6ADED1B195979E68C4289C24 /* Pods */ = { - isa = PBXGroup; - children = ( - ); - name = Pods; - sourceTree = ""; - }; 8135E48C1B4B6A0E0092F452 /* ParseTwitterUtils */ = { isa = PBXGroup; children = ( @@ -389,6 +382,13 @@ name = Resources; sourceTree = ""; }; + 8EF82AB7049F0059A572B973 /* Pods */ = { + isa = PBXGroup; + children = ( + ); + name = Pods; + sourceTree = ""; + }; F51535381B57451200C49F56 /* Configurations */ = { isa = PBXGroup; children = ( @@ -445,12 +445,12 @@ isa = PBXNativeTarget; buildConfigurationList = 81CB98D11AB7905D00136FA5 /* Build configuration list for PBXNativeTarget "ParseTwitterUtils-Tests" */; buildPhases = ( - 26730F125F6A472AD0747C6D /* Check Pods Manifest.lock */, + DD360F087EBBAE31D0F879FC /* [CP] Check Pods Manifest.lock */, 81CB98C21AB7905D00136FA5 /* Sources */, 81CB98C31AB7905D00136FA5 /* Frameworks */, 81CB98C41AB7905D00136FA5 /* Resources */, - 4D5B07C5EAC8A041D08E10C6 /* Embed Pods Frameworks */, - 7A5233E6AC771DC4EC9B4146 /* Copy Pods Resources */, + E24FA5F3938C6C3F2C98ADC7 /* [CP] Embed Pods Frameworks */, + 8B4C3636D1135F55D4AA146C /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -548,44 +548,44 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 26730F125F6A472AD0747C6D /* Check Pods Manifest.lock */ = { + 81B3F2291AC9CA2600A92677 /* Generate Localizable Strings */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Check Pods Manifest.lock"; + name = "Generate Localizable Strings"; 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 = "# Generate localizable strings\nLOCALIZATION_FOLDER=$PROJECT_DIR/Resources/en.lproj\nLOCALIZATION_MACRO=PFTWLocalizedString\n\nfind $PROJECT_DIR/ParseTwitterUtils -name '*.m' -print0 | xargs -0 xcrun extractLocStrings -s $LOCALIZATION_MACRO -q -o $LOCALIZATION_FOLDER\n\nmv $LOCALIZATION_FOLDER/Localizable.strings $LOCALIZATION_FOLDER/ParseTwitterUtils.strings\n"; showEnvVarsInLog = 0; }; - 4D5B07C5EAC8A041D08E10C6 /* Embed Pods Frameworks */ = { + 81F035F41BC311FA0055BFDE /* Fetch latest Parse.framework */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Embed Pods Frameworks"; + name = "Fetch latest Parse.framework"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ParseTwitterUtils-Tests/Pods-ParseTwitterUtils-Tests-frameworks.sh\"\n"; + shellScript = "if [ ! -d $SRCROOT/Vendor ]; then\n mkdir $SRCROOT/Vendor\nfi\n\ncd $SRCROOT/Vendor\n\nif [[ ! -d \"Parse.framework\" || ! -d \"Bolts.framework\" ]]; then\n ARCHIVE_NAME=Parse-iOS.zip\n\n LATEST_TAG=$(bash -l -c \"bundle exec pod spec cat Parse\" | grep version | head -n 1 | cut -d '\"' -f 4)\n ARCHIVE_URL=\"https://github.com/ParsePlatform/Parse-SDK-iOS-OSX/releases/download/${LATEST_TAG}/${ARCHIVE_NAME}\"\n curl -O -L $ARCHIVE_URL\n\n unzip $ARCHIVE_NAME\n rm $ARCHIVE_NAME\nfi\n"; showEnvVarsInLog = 0; }; - 7A5233E6AC771DC4EC9B4146 /* Copy Pods Resources */ = { + 8B4C3636D1135F55D4AA146C /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Copy Pods Resources"; + name = "[CP] Copy Pods Resources"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; @@ -593,34 +593,34 @@ shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ParseTwitterUtils-Tests/Pods-ParseTwitterUtils-Tests-resources.sh\"\n"; showEnvVarsInLog = 0; }; - 81B3F2291AC9CA2600A92677 /* Generate Localizable Strings */ = { + DD360F087EBBAE31D0F879FC /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Generate Localizable Strings"; + name = "[CP] Check Pods Manifest.lock"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "# Generate localizable strings\nLOCALIZATION_FOLDER=$PROJECT_DIR/Resources/en.lproj\nLOCALIZATION_MACRO=PFTWLocalizedString\n\nfind $PROJECT_DIR/ParseTwitterUtils -name '*.m' -print0 | xargs -0 xcrun extractLocStrings -s $LOCALIZATION_MACRO -q -o $LOCALIZATION_FOLDER\n\nmv $LOCALIZATION_FOLDER/Localizable.strings $LOCALIZATION_FOLDER/ParseTwitterUtils.strings\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; }; - 81F035F41BC311FA0055BFDE /* Fetch latest Parse.framework */ = { + E24FA5F3938C6C3F2C98ADC7 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Fetch latest Parse.framework"; + name = "[CP] Embed Pods Frameworks"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "if [ ! -d $SRCROOT/Vendor ]; then\n mkdir $SRCROOT/Vendor\nfi\n\ncd $SRCROOT/Vendor\n\nif [[ ! -d \"Parse.framework\" || ! -d \"Bolts.framework\" ]]; then\n ARCHIVE_NAME=Parse-iOS.zip\n\n LATEST_TAG=$(bash -l -c \"bundle exec pod spec cat Parse\" | grep version | head -n 1 | cut -d '\"' -f 4)\n ARCHIVE_URL=\"https://github.com/ParsePlatform/Parse-SDK-iOS-OSX/releases/download/${LATEST_TAG}/${ARCHIVE_NAME}\"\n curl -O -L $ARCHIVE_URL\n\n unzip $ARCHIVE_NAME\n rm $ARCHIVE_NAME\nfi\n"; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ParseTwitterUtils-Tests/Pods-ParseTwitterUtils-Tests-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ diff --git a/Podfile b/Podfile index 9e54539..c1b7228 100644 --- a/Podfile +++ b/Podfile @@ -1,6 +1,7 @@ source 'https://github.com/CocoaPods/Specs.git' platform :ios, '7.0' +use_frameworks! -target 'ParseTwitterUtils-Tests', :exclusive => true do +target 'ParseTwitterUtils-Tests' do pod 'OCMock' end diff --git a/Podfile.lock b/Podfile.lock index bea819f..cdf708a 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,10 +1,12 @@ PODS: - - OCMock (3.2) + - OCMock (3.3) DEPENDENCIES: - OCMock SPEC CHECKSUMS: - OCMock: 28def049ef47f996b515a8eeea958be7ccab2dbb + OCMock: d68685bde31f69cb61d518dcb39269080c78b5ed -COCOAPODS: 0.39.0 +PODFILE CHECKSUM: 156592e0521c4d42b735a52d7e92198e26878c21 + +COCOAPODS: 1.0.1