Skip to content
This repository was archived by the owner on Jan 16, 2021. It is now read-only.

Commit 56d6ecc

Browse files
nlutsenkonlutsenko
authored
Merge pull request #31 from ParsePlatform/nlutsenko.dependencies
Update CocoaPods and RubyGems dependencies.
2 parents 6befbd5 + c783679 commit 56d6ecc

File tree

6 files changed

+70
-63
lines changed

6 files changed

+70
-63
lines changed

‎Configurations/ParseTwitterUtils-Tests.xcconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
#include "Pods/Target Support Files/Pods-ParseTwitterUtils-Tests/Pods-ParseTwitterUtils-Tests.debug.xcconfig"
1313

1414
PRODUCT_NAME = ParseTwitterUtils-Tests
15+
IPHONEOS_DEPLOYMENT_TARGET = 8.0
1516

1617
CLANG_ENABLE_MODULES = YES
1718

18-
FRAMEWORK_SEARCH_PATHS = $(inherited) $(BUILT_PRODUCTS_DIR) $(SRCROOT)/Vendor
19-
LIBRARY_SEARCH_PATHS = $(inherited) $(BUILT_PRODUCTS_DIR)
19+
FRAMEWORK_SEARCH_PATHS = $(inherited) $(BUILT_PRODUCTS_DIR) $(BUILT_PRODUCTS_DIR)/OCMock $(SRCROOT)/Vendor
2020
HEADER_SEARCH_PATHS = $(inherited) $(BUILT_PRODUCTS_DIR)
2121

2222
INFOPLIST_FILE = $(PROJECT_DIR)/Tests/Resources/Info.plist

‎Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ source 'https://rubygems.org'
33
gem 'naturally'
44
gem 'rake'
55
gem 'xcpretty'
6-
gem 'cocoapods', '~> 0.39'
6+
gem 'cocoapods'

‎Gemfile.lock

Lines changed: 31 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -7,53 +7,57 @@ GEM
77
minitest (~> 5.1)
88
thread_safe (~> 0.3, >= 0.3.4)
99
tzinfo (~> 1.1)
10-
claide (0.9.1)
11-
cocoapods (0.39.0)
10+
claide (1.0.0)
11+
cocoapods (1.0.1)
1212
activesupport (>= 4.0.2)
13-
claide (~> 0.9.1)
14-
cocoapods-core (= 0.39.0)
15-
cocoapods-downloader (~> 0.9.3)
16-
cocoapods-plugins (~> 0.4.2)
17-
cocoapods-search (~> 0.1.0)
18-
cocoapods-stats (~> 0.6.2)
19-
cocoapods-trunk (~> 0.6.4)
20-
cocoapods-try (~> 0.5.1)
13+
claide (>= 1.0.0, < 2.0)
14+
cocoapods-core (= 1.0.1)
15+
cocoapods-deintegrate (>= 1.0.0, < 2.0)
16+
cocoapods-downloader (>= 1.0.0, < 2.0)
17+
cocoapods-plugins (>= 1.0.0, < 2.0)
18+
cocoapods-search (>= 1.0.0, < 2.0)
19+
cocoapods-stats (>= 1.0.0, < 2.0)
20+
cocoapods-trunk (>= 1.0.0, < 2.0)
21+
cocoapods-try (>= 1.0.0, < 2.0)
2122
colored (~> 1.2)
2223
escape (~> 0.0.4)
23-
molinillo (~> 0.4.0)
24+
fourflusher (~> 0.3.0)
25+
molinillo (~> 0.4.5)
2426
nap (~> 1.0)
25-
xcodeproj (~> 0.28.2)
26-
cocoapods-core (0.39.0)
27+
xcodeproj (>= 1.1.0, < 2.0)
28+
cocoapods-core (1.0.1)
2729
activesupport (>= 4.0.2)
2830
fuzzy_match (~> 2.0.4)
2931
nap (~> 1.0)
30-
cocoapods-downloader (0.9.3)
31-
cocoapods-plugins (0.4.2)
32+
cocoapods-deintegrate (1.0.0)
33+
cocoapods-downloader (1.0.1)
34+
cocoapods-plugins (1.0.0)
3235
nap
33-
cocoapods-search (0.1.0)
34-
cocoapods-stats (0.6.2)
35-
cocoapods-trunk (0.6.4)
36+
cocoapods-search (1.0.0)
37+
cocoapods-stats (1.0.0)
38+
cocoapods-trunk (1.0.0)
3639
nap (>= 0.8, < 2.0)
3740
netrc (= 0.7.8)
38-
cocoapods-try (0.5.1)
41+
cocoapods-try (1.0.0)
3942
colored (1.2)
4043
escape (0.0.4)
44+
fourflusher (0.3.2)
4145
fuzzy_match (2.0.4)
4246
i18n (0.7.0)
4347
json (1.8.3)
44-
minitest (5.8.4)
45-
molinillo (0.4.4)
48+
minitest (5.9.0)
49+
molinillo (0.4.5)
4650
nap (1.1.0)
4751
naturally (2.1.0)
4852
netrc (0.7.8)
49-
rake (11.1.2)
50-
rouge (1.10.1)
53+
rake (11.2.2)
54+
rouge (1.11.1)
5155
thread_safe (0.3.5)
5256
tzinfo (1.2.2)
5357
thread_safe (~> 0.1)
54-
xcodeproj (0.28.2)
58+
xcodeproj (1.1.0)
5559
activesupport (>= 3)
56-
claide (~> 0.9.1)
60+
claide (>= 1.0.0, < 2.0)
5761
colored (~> 1.2)
5862
xcpretty (0.2.2)
5963
rouge (~> 1.8)
@@ -62,10 +66,10 @@ PLATFORMS
6266
ruby
6367

6468
DEPENDENCIES
65-
cocoapods (~> 0.39)
69+
cocoapods
6670
naturally
6771
rake
6872
xcpretty
6973

7074
BUNDLED WITH
71-
1.11.2
75+
1.12.3

‎ParseTwitterUtils.xcodeproj/project.pbxproj

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
/* Begin PBXBuildFile section */
1010
06D00BAB1BC78F23005BAA6F /* ParseTwitterUtils.strings in Resources */ = {isa = PBXBuildFile; fileRef = 06D00BAD1BC78F23005BAA6F /* ParseTwitterUtils.strings */; };
1111
06D00BB51BC790F3005BAA6F /* PFTwitterLocalization.h in Headers */ = {isa = PBXBuildFile; fileRef = 06D00BB41BC790F3005BAA6F /* PFTwitterLocalization.h */; };
12-
77DE89F60F51105C769BEC0B /* libPods-ParseTwitterUtils-Tests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F31BB2625FB261014BCD4FB6 /* libPods-ParseTwitterUtils-Tests.a */; };
12+
6193428882637F35420543F7 /* Pods_ParseTwitterUtils_Tests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7104508B3E43E48999110ADF /* Pods_ParseTwitterUtils_Tests.framework */; };
1313
8135E4951B4B6A0E0092F452 /* PF_Twitter_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 8135E48E1B4B6A0E0092F452 /* PF_Twitter_Private.h */; };
1414
8135E4961B4B6A0E0092F452 /* PFTwitterAuthenticationProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 8135E48F1B4B6A0E0092F452 /* PFTwitterAuthenticationProvider.h */; };
1515
8135E4971B4B6A0E0092F452 /* PFTwitterAuthenticationProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 8135E4901B4B6A0E0092F452 /* PFTwitterAuthenticationProvider.m */; };
@@ -76,6 +76,7 @@
7676
06DD472B1BD0C64500A43759 /* Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; };
7777
06DD472C1BD0C64500A43759 /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; };
7878
06DD472D1BD0C64500A43759 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = "<group>"; };
79+
7104508B3E43E48999110ADF /* Pods_ParseTwitterUtils_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ParseTwitterUtils_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
7980
8135E48E1B4B6A0E0092F452 /* PF_Twitter_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PF_Twitter_Private.h; sourceTree = "<group>"; };
8081
8135E48F1B4B6A0E0092F452 /* PFTwitterAuthenticationProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFTwitterAuthenticationProvider.h; sourceTree = "<group>"; };
8182
8135E4901B4B6A0E0092F452 /* PFTwitterAuthenticationProvider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFTwitterAuthenticationProvider.m; sourceTree = "<group>"; };
@@ -113,7 +114,6 @@
113114
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; };
114115
81D342A01B4C7DA500B6C124 /* ParseTwitterUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ParseTwitterUtils.h; sourceTree = "<group>"; };
115116
D2AAC07E0554694100DB518D /* ParseTwitterUtils.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ParseTwitterUtils.framework; sourceTree = BUILT_PRODUCTS_DIR; };
116-
F31BB2625FB261014BCD4FB6 /* libPods-ParseTwitterUtils-Tests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ParseTwitterUtils-Tests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
117117
F51535531B57453700C49F56 /* ParseTwitterUtils-iOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "ParseTwitterUtils-iOS.xcconfig"; sourceTree = "<group>"; };
118118
F51535541B57454500C49F56 /* ParseTwitterUtils-Tests.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "ParseTwitterUtils-Tests.xcconfig"; sourceTree = "<group>"; };
119119
F51535551B57455200C49F56 /* ParseTwitterTestApplication.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = ParseTwitterTestApplication.xcconfig; sourceTree = "<group>"; };
@@ -137,7 +137,7 @@
137137
81CB98CC1AB7905D00136FA5 /* ParseTwitterUtils.framework in Frameworks */,
138138
81CB98D81AB791FB00136FA5 /* Bolts.framework in Frameworks */,
139139
81CB98DB1AB7920E00136FA5 /* Parse.framework in Frameworks */,
140-
77DE89F60F51105C769BEC0B /* libPods-ParseTwitterUtils-Tests.a in Frameworks */,
140+
6193428882637F35420543F7 /* Pods_ParseTwitterUtils_Tests.framework in Frameworks */,
141141
);
142142
runOnlyForDeploymentPostprocessing = 0;
143143
};
@@ -214,7 +214,7 @@
214214
81CB98D21AB7906D00136FA5 /* Tests */,
215215
0867D69AFE84028FC02AAC07 /* Frameworks */,
216216
034768DFFF38A50411DB9C8B /* Products */,
217-
6ADED1B195979E68C4289C24 /* Pods */,
217+
8EF82AB7049F0059A572B973 /* Pods */,
218218
);
219219
indentWidth = 4;
220220
name = Breakpad;
@@ -225,18 +225,11 @@
225225
children = (
226226
813DFC8F1AB2513D00F25A08 /* User Frameworks */,
227227
813DFC8E1AB2513300F25A08 /* System Frameworks */,
228-
F31BB2625FB261014BCD4FB6 /* libPods-ParseTwitterUtils-Tests.a */,
228+
7104508B3E43E48999110ADF /* Pods_ParseTwitterUtils_Tests.framework */,
229229
);
230230
name = Frameworks;
231231
sourceTree = "<group>";
232232
};
233-
6ADED1B195979E68C4289C24 /* Pods */ = {
234-
isa = PBXGroup;
235-
children = (
236-
);
237-
name = Pods;
238-
sourceTree = "<group>";
239-
};
240233
8135E48C1B4B6A0E0092F452 /* ParseTwitterUtils */ = {
241234
isa = PBXGroup;
242235
children = (
@@ -389,6 +382,13 @@
389382
name = Resources;
390383
sourceTree = "<group>";
391384
};
385+
8EF82AB7049F0059A572B973 /* Pods */ = {
386+
isa = PBXGroup;
387+
children = (
388+
);
389+
name = Pods;
390+
sourceTree = "<group>";
391+
};
392392
F51535381B57451200C49F56 /* Configurations */ = {
393393
isa = PBXGroup;
394394
children = (
@@ -445,12 +445,12 @@
445445
isa = PBXNativeTarget;
446446
buildConfigurationList = 81CB98D11AB7905D00136FA5 /* Build configuration list for PBXNativeTarget "ParseTwitterUtils-Tests" */;
447447
buildPhases = (
448-
26730F125F6A472AD0747C6D /* Check Pods Manifest.lock */,
448+
DD360F087EBBAE31D0F879FC /* [CP] Check Pods Manifest.lock */,
449449
81CB98C21AB7905D00136FA5 /* Sources */,
450450
81CB98C31AB7905D00136FA5 /* Frameworks */,
451451
81CB98C41AB7905D00136FA5 /* Resources */,
452-
4D5B07C5EAC8A041D08E10C6 /* Embed Pods Frameworks */,
453-
7A5233E6AC771DC4EC9B4146 /* Copy Pods Resources */,
452+
E24FA5F3938C6C3F2C98ADC7 /* [CP] Embed Pods Frameworks */,
453+
8B4C3636D1135F55D4AA146C /* [CP] Copy Pods Resources */,
454454
);
455455
buildRules = (
456456
);
@@ -548,79 +548,79 @@
548548
/* End PBXResourcesBuildPhase section */
549549

550550
/* Begin PBXShellScriptBuildPhase section */
551-
26730F125F6A472AD0747C6D /* Check Pods Manifest.lock */ = {
551+
81B3F2291AC9CA2600A92677 /* Generate Localizable Strings */ = {
552552
isa = PBXShellScriptBuildPhase;
553553
buildActionMask = 2147483647;
554554
files = (
555555
);
556556
inputPaths = (
557557
);
558-
name = "Check Pods Manifest.lock";
558+
name = "Generate Localizable Strings";
559559
outputPaths = (
560560
);
561561
runOnlyForDeploymentPostprocessing = 0;
562562
shellPath = /bin/sh;
563-
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";
563+
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";
564564
showEnvVarsInLog = 0;
565565
};
566-
4D5B07C5EAC8A041D08E10C6 /* Embed Pods Frameworks */ = {
566+
81F035F41BC311FA0055BFDE /* Fetch latest Parse.framework */ = {
567567
isa = PBXShellScriptBuildPhase;
568568
buildActionMask = 2147483647;
569569
files = (
570570
);
571571
inputPaths = (
572572
);
573-
name = "Embed Pods Frameworks";
573+
name = "Fetch latest Parse.framework";
574574
outputPaths = (
575575
);
576576
runOnlyForDeploymentPostprocessing = 0;
577577
shellPath = /bin/sh;
578-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ParseTwitterUtils-Tests/Pods-ParseTwitterUtils-Tests-frameworks.sh\"\n";
578+
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";
579579
showEnvVarsInLog = 0;
580580
};
581-
7A5233E6AC771DC4EC9B4146 /* Copy Pods Resources */ = {
581+
8B4C3636D1135F55D4AA146C /* [CP] Copy Pods Resources */ = {
582582
isa = PBXShellScriptBuildPhase;
583583
buildActionMask = 2147483647;
584584
files = (
585585
);
586586
inputPaths = (
587587
);
588-
name = "Copy Pods Resources";
588+
name = "[CP] Copy Pods Resources";
589589
outputPaths = (
590590
);
591591
runOnlyForDeploymentPostprocessing = 0;
592592
shellPath = /bin/sh;
593593
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ParseTwitterUtils-Tests/Pods-ParseTwitterUtils-Tests-resources.sh\"\n";
594594
showEnvVarsInLog = 0;
595595
};
596-
81B3F2291AC9CA2600A92677 /* Generate Localizable Strings */ = {
596+
DD360F087EBBAE31D0F879FC /* [CP] Check Pods Manifest.lock */ = {
597597
isa = PBXShellScriptBuildPhase;
598598
buildActionMask = 2147483647;
599599
files = (
600600
);
601601
inputPaths = (
602602
);
603-
name = "Generate Localizable Strings";
603+
name = "[CP] Check Pods Manifest.lock";
604604
outputPaths = (
605605
);
606606
runOnlyForDeploymentPostprocessing = 0;
607607
shellPath = /bin/sh;
608-
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";
608+
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";
609609
showEnvVarsInLog = 0;
610610
};
611-
81F035F41BC311FA0055BFDE /* Fetch latest Parse.framework */ = {
611+
E24FA5F3938C6C3F2C98ADC7 /* [CP] Embed Pods Frameworks */ = {
612612
isa = PBXShellScriptBuildPhase;
613613
buildActionMask = 2147483647;
614614
files = (
615615
);
616616
inputPaths = (
617617
);
618-
name = "Fetch latest Parse.framework";
618+
name = "[CP] Embed Pods Frameworks";
619619
outputPaths = (
620620
);
621621
runOnlyForDeploymentPostprocessing = 0;
622622
shellPath = /bin/sh;
623-
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";
623+
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ParseTwitterUtils-Tests/Pods-ParseTwitterUtils-Tests-frameworks.sh\"\n";
624624
showEnvVarsInLog = 0;
625625
};
626626
/* End PBXShellScriptBuildPhase section */

‎Podfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
source 'https://github.com/CocoaPods/Specs.git'
22
platform :ios, '7.0'
3+
use_frameworks!
34

4-
target 'ParseTwitterUtils-Tests', :exclusive => true do
5+
target 'ParseTwitterUtils-Tests' do
56
pod 'OCMock'
67
end

‎Podfile.lock

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
PODS:
2-
- OCMock (3.2)
2+
- OCMock (3.3)
33

44
DEPENDENCIES:
55
- OCMock
66

77
SPEC CHECKSUMS:
8-
OCMock: 28def049ef47f996b515a8eeea958be7ccab2dbb
8+
OCMock: d68685bde31f69cb61d518dcb39269080c78b5ed
99

10-
COCOAPODS: 0.39.0
10+
PODFILE CHECKSUM: 156592e0521c4d42b735a52d7e92198e26878c21
11+
12+
COCOAPODS: 1.0.1

0 commit comments

Comments
 (0)