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

Commit b4a06bd

Browse files
nlutsenkonlutsenko
committed
Merge pull request #8 from ParsePlatform/nlutsenko.v3.xcode71
Update to Xcode 7.1.
2 parents f9866ee + 9ddb7c7 commit b4a06bd

File tree

4 files changed

+25
-25
lines changed

4 files changed

+25
-25
lines changed

‎.travis.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,24 @@ branches:
44
- master-v3
55
language: objective-c
66
os: osx
7-
osx_image: xcode7
7+
osx_image: xcode7.1
88
env:
99
global:
1010
- LC_CTYPE=en_US.UTF-8
1111
- LANG=en_US.UTF-8
1212
matrix:
13-
- TEST_TYPE=ios
14-
- TEST_TYPE=podspecs
13+
- TEST_TYPE=iOS
14+
- TEST_TYPE=CocoaPods
1515
script:
1616
- |
17-
if [ "$TEST_TYPE" = ios ]; then
17+
if [ "$TEST_TYPE" = iOS ]; then
1818
set -o pipefail
1919
xcodebuild test -workspace ParseFacebookUtils.xcworkspace -sdk iphonesimulator -scheme ParseFacebookUtils-iOS -configuration Debug -destination "platform=iOS Simulator,name=iPhone 4s" -destination "platform=iOS Simulator,name=iPhone 6 Plus" GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty
20-
elif [ "$TEST_TYPE" = podspecs ]; then
20+
elif [ "$TEST_TYPE" = CocoaPods ]; then
2121
pod lib lint --use-libraries ParseFacebookUtils.podspec --allow-warnings
2222
fi
2323
after_success:
2424
- |
25-
if [ "$TEST_TYPE" = ios ]; then
25+
if [ "$TEST_TYPE" = iOS ]; then
2626
bash <(curl -s https://codecov.io/bash)
2727
fi

‎ParseFacebookUtils.xcodeproj/project.pbxproj‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,24 @@
1818
813DFC911AB2514C00F25A08 /* FacebookSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 813DFC901AB2514C00F25A08 /* FacebookSDK.framework */; };
1919
813DFC931AB2515A00F25A08 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 813DFC921AB2515A00F25A08 /* Bolts.framework */; };
2020
813DFC951AB251F700F25A08 /* Parse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 813DFC941AB251F700F25A08 /* Parse.framework */; };
21-
81411E1A1BC494FA0004BE84 /* PFFacebookTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 81411E151BC494FA0004BE84 /* PFFacebookTestCase.m */; settings = {ASSET_TAGS = (); }; };
22-
81411E1B1BC494FA0004BE84 /* FacebookAuthenticationProviderTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 81411E171BC494FA0004BE84 /* FacebookAuthenticationProviderTests.m */; settings = {ASSET_TAGS = (); }; };
23-
81411E1C1BC494FA0004BE84 /* ReceptionistTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 81411E181BC494FA0004BE84 /* ReceptionistTests.m */; settings = {ASSET_TAGS = (); }; };
24-
81411E1D1BC494FA0004BE84 /* TokenCachingStrategyTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 81411E191BC494FA0004BE84 /* TokenCachingStrategyTests.m */; settings = {ASSET_TAGS = (); }; };
21+
81411E1A1BC494FA0004BE84 /* PFFacebookTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 81411E151BC494FA0004BE84 /* PFFacebookTestCase.m */; };
22+
81411E1B1BC494FA0004BE84 /* FacebookAuthenticationProviderTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 81411E171BC494FA0004BE84 /* FacebookAuthenticationProviderTests.m */; };
23+
81411E1C1BC494FA0004BE84 /* ReceptionistTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 81411E181BC494FA0004BE84 /* ReceptionistTests.m */; };
24+
81411E1D1BC494FA0004BE84 /* TokenCachingStrategyTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 81411E191BC494FA0004BE84 /* TokenCachingStrategyTests.m */; };
2525
81B3F2281AC9C9A700A92677 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 81B3F2271AC9C9A700A92677 /* Localizable.strings */; };
26-
81F8BCD61BC4A2FF00256269 /* PFFacebookAuthenticationProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 81F8BCCA1BC4A2FF00256269 /* PFFacebookAuthenticationProvider.h */; settings = {ASSET_TAGS = (); }; };
27-
81F8BCD71BC4A2FF00256269 /* PFFacebookAuthenticationProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 81F8BCCB1BC4A2FF00256269 /* PFFacebookAuthenticationProvider.m */; settings = {ASSET_TAGS = (); }; };
28-
81F8BCD81BC4A2FF00256269 /* PFFacebookAuthenticationProvider_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 81F8BCCC1BC4A2FF00256269 /* PFFacebookAuthenticationProvider_Private.h */; settings = {ASSET_TAGS = (); }; };
29-
81F8BCD91BC4A2FF00256269 /* PFFacebookPrivateUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 81F8BCCD1BC4A2FF00256269 /* PFFacebookPrivateUtilities.h */; settings = {ASSET_TAGS = (); }; };
30-
81F8BCDA1BC4A2FF00256269 /* PFFacebookPrivateUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 81F8BCCE1BC4A2FF00256269 /* PFFacebookPrivateUtilities.m */; settings = {ASSET_TAGS = (); }; };
31-
81F8BCDB1BC4A2FF00256269 /* PFFacebookTokenCachingStrategy.h in Headers */ = {isa = PBXBuildFile; fileRef = 81F8BCCF1BC4A2FF00256269 /* PFFacebookTokenCachingStrategy.h */; settings = {ASSET_TAGS = (); }; };
32-
81F8BCDC1BC4A2FF00256269 /* PFFacebookTokenCachingStrategy.m in Sources */ = {isa = PBXBuildFile; fileRef = 81F8BCD01BC4A2FF00256269 /* PFFacebookTokenCachingStrategy.m */; settings = {ASSET_TAGS = (); }; };
33-
81F8BCDD1BC4A2FF00256269 /* PFFacebookUtils_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 81F8BCD11BC4A2FF00256269 /* PFFacebookUtils_Private.h */; settings = {ASSET_TAGS = (); }; };
34-
81F8BCDE1BC4A2FF00256269 /* PFReceptionist.h in Headers */ = {isa = PBXBuildFile; fileRef = 81F8BCD21BC4A2FF00256269 /* PFReceptionist.h */; settings = {ASSET_TAGS = (); }; };
35-
81F8BCDF1BC4A2FF00256269 /* PFReceptionist.m in Sources */ = {isa = PBXBuildFile; fileRef = 81F8BCD31BC4A2FF00256269 /* PFReceptionist.m */; settings = {ASSET_TAGS = (); }; };
26+
81F8BCD61BC4A2FF00256269 /* PFFacebookAuthenticationProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 81F8BCCA1BC4A2FF00256269 /* PFFacebookAuthenticationProvider.h */; };
27+
81F8BCD71BC4A2FF00256269 /* PFFacebookAuthenticationProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 81F8BCCB1BC4A2FF00256269 /* PFFacebookAuthenticationProvider.m */; };
28+
81F8BCD81BC4A2FF00256269 /* PFFacebookAuthenticationProvider_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 81F8BCCC1BC4A2FF00256269 /* PFFacebookAuthenticationProvider_Private.h */; };
29+
81F8BCD91BC4A2FF00256269 /* PFFacebookPrivateUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 81F8BCCD1BC4A2FF00256269 /* PFFacebookPrivateUtilities.h */; };
30+
81F8BCDA1BC4A2FF00256269 /* PFFacebookPrivateUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 81F8BCCE1BC4A2FF00256269 /* PFFacebookPrivateUtilities.m */; };
31+
81F8BCDB1BC4A2FF00256269 /* PFFacebookTokenCachingStrategy.h in Headers */ = {isa = PBXBuildFile; fileRef = 81F8BCCF1BC4A2FF00256269 /* PFFacebookTokenCachingStrategy.h */; };
32+
81F8BCDC1BC4A2FF00256269 /* PFFacebookTokenCachingStrategy.m in Sources */ = {isa = PBXBuildFile; fileRef = 81F8BCD01BC4A2FF00256269 /* PFFacebookTokenCachingStrategy.m */; };
33+
81F8BCDD1BC4A2FF00256269 /* PFFacebookUtils_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 81F8BCD11BC4A2FF00256269 /* PFFacebookUtils_Private.h */; };
34+
81F8BCDE1BC4A2FF00256269 /* PFReceptionist.h in Headers */ = {isa = PBXBuildFile; fileRef = 81F8BCD21BC4A2FF00256269 /* PFReceptionist.h */; };
35+
81F8BCDF1BC4A2FF00256269 /* PFReceptionist.m in Sources */ = {isa = PBXBuildFile; fileRef = 81F8BCD31BC4A2FF00256269 /* PFReceptionist.m */; };
3636
81F8BCE01BC4A2FF00256269 /* PFFacebookUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 81F8BCD41BC4A2FF00256269 /* PFFacebookUtils.h */; settings = {ATTRIBUTES = (Public, ); }; };
37-
81F8BCE11BC4A2FF00256269 /* PFFacebookUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 81F8BCD51BC4A2FF00256269 /* PFFacebookUtils.m */; settings = {ASSET_TAGS = (); }; };
38-
81F8BCE91BC4A33A00256269 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 81F8BCE61BC4A32E00256269 /* main.m */; settings = {ASSET_TAGS = (); }; };
37+
81F8BCE11BC4A2FF00256269 /* PFFacebookUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 81F8BCD51BC4A2FF00256269 /* PFFacebookUtils.m */; };
38+
81F8BCE91BC4A33A00256269 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 81F8BCE61BC4A32E00256269 /* main.m */; };
3939
/* End PBXBuildFile section */
4040

4141
/* Begin PBXContainerItemProxy section */
@@ -439,7 +439,7 @@
439439
isa = PBXProject;
440440
attributes = {
441441
CLASSPREFIX = PF;
442-
LastUpgradeCheck = 0700;
442+
LastUpgradeCheck = 0710;
443443
ORGANIZATIONNAME = "Parse, LLC";
444444
TargetAttributes = {
445445
813A25561AC0F3E2007F54F3 = {

‎ParseFacebookUtils.xcodeproj/xcshareddata/xcschemes/ParseFacebookUtils-iOS.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0700"
3+
LastUpgradeVersion = "0710"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Podfile.lock‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ DEPENDENCIES:
77
SPEC CHECKSUMS:
88
OCMock: 28def049ef47f996b515a8eeea958be7ccab2dbb
99

10-
COCOAPODS: 0.39.0.rc.1
10+
COCOAPODS: 0.39.0

0 commit comments

Comments
 (0)