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

Commit 0d8e7fe

Browse files
nlutsenkonlutsenko
authored
Merge pull request #67 from ParsePlatform/nlutsenko.configurations
Update all dependencies and fix deprecation warnings.
2 parents 7359f61 + 607a94b commit 0d8e7fe

File tree

15 files changed

+146
-151
lines changed

15 files changed

+146
-151
lines changed

‎.ruby-version‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
2.3.1

‎.travis.yml‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,23 @@ env:
1313
- TEST_TYPE=iOS
1414
- TEST_TYPE=CocoaPods
1515
- TEST_TYPE=Package
16+
install:
17+
- |
18+
bundle install
19+
pod repo update --silent
20+
pod install
1621
script:
1722
- |
18-
if [ "$TEST_TYPE" = iOS ]; then
19-
set -o pipefail
20-
xcodebuild test -workspace ParseFacebookUtils.xcworkspace -sdk iphonesimulator -scheme ParseFacebookUtilsV4-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
21-
elif [ "$TEST_TYPE" = CocoaPods ]; then
22-
pod lib lint --use-libraries ParseFacebookUtilsV4.podspec
23-
elif [ "$TEST_TYPE" = Package ]; then
24-
bundle exec rake package:frameworks
25-
fi
23+
if [ "$TEST_TYPE" = iOS ]; then
24+
set -o pipefail
25+
xcodebuild test -workspace ParseFacebookUtils.xcworkspace -sdk iphonesimulator -scheme ParseFacebookUtilsV4-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
26+
elif [ "$TEST_TYPE" = CocoaPods ]; then
27+
pod lib lint --use-libraries ParseFacebookUtilsV4.podspec
28+
elif [ "$TEST_TYPE" = Package ]; then
29+
bundle exec rake package:frameworks
30+
fi
2631
after_success:
2732
- |
28-
if [ "$TEST_TYPE" = iOS ]; then
29-
bash <(curl -s https://codecov.io/bash)
30-
fi
33+
if [ "$TEST_TYPE" = iOS ]; then
34+
bash <(curl -s https://codecov.io/bash)
35+
fi

‎Configurations/ParseFacebookTestApplicationV4.xcconfig‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,4 @@
1313
PRODUCT_NAME = ParseFacebookTestApplicationV4
1414
PRODUCT_BUNDLE_IDENTIFIER = com.parse.facebookutils-ios.unit.app
1515

16-
CLANG_ENABLE_MODULES = YES
17-
1816
INFOPLIST_FILE = $(SRCROOT)/Tests/TestApplication/Resources/Info.plist

‎Configurations/ParseFacebookUtilsV4-UnitTests.xcconfig‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,15 @@
88
//
99

1010
#include "Shared/Platform/iOS.xcconfig"
11-
#include "Shared/Product/UnitTest.xcconfig"
11+
#include "Shared/Product/LogicTests.xcconfig"
1212
#include "Pods/Target Support Files/Pods-ParseFacebookUtilsV4-UnitTests/Pods-ParseFacebookUtilsV4-UnitTests.debug.xcconfig"
1313

1414
PRODUCT_NAME = ParseFacebookUtilsV4-UnitTests
1515
PRODUCT_BUNDLE_IDENTIFIER = com.parse.facebookutils-ios.unit
1616

17-
CLANG_ENABLE_MODULES = YES
17+
IPHONEOS_DEPLOYMENT_TARGET = 8.0
18+
19+
FRAMEWORK_SEARCH_PATHS = $(inherited) $(BUILT_PRODUCTS_DIR) $(SRCROOT)/Vendor "$PODS_CONFIGURATION_BUILD_DIR/OCMock"
1820

1921
INFOPLIST_FILE = $(SRCROOT)/Tests/Resources/Info.plist
2022
TEST_HOST = $(BUILT_PRODUCTS_DIR)/ParseFacebookTestApplicationV4.app/ParseFacebookTestApplicationV4
21-
22-
FRAMEWORK_SEARCH_PATHS = $(inherited) $(BUILT_PRODUCTS_DIR) $(SRCROOT)/Vendor
23-
LIBRARY_SEARCH_PATHS = $(inherited) $(BUILT_PRODUCTS_DIR)
24-
HEADER_SEARCH_PATHS = $(inherited) $(BUILT_PRODUCTS_DIR)

‎Configurations/ParseFacebookUtilsV4-iOS.xcconfig‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,11 @@
88
//
99

1010
#include "Shared/Platform/iOS.xcconfig"
11-
#include "Shared/Product/Framework.xcconfig"
11+
#include "Shared/Product/StaticFramework.xcconfig"
1212

1313
PRODUCT_NAME = ParseFacebookUtilsV4
1414
PRODUCT_BUNDLE_IDENTIFIER = com.parse.facebookutils-ios
1515

16-
MACH_O_TYPE = staticlib
17-
DEFINES_MODULE = YES
18-
CLANG_ENABLE_MODULES = YES
19-
2016
INFOPLIST_FILE = $(SRCROOT)/Resources/Info-iOS.plist
2117

2218
FRAMEWORK_SEARCH_PATHS = $(inherited) $(SRCROOT)/Vendor
23-
LIBRARY_SEARCH_PATHS = $(inherited) $(BUILT_PRODUCTS_DIR)
24-
HEADER_SEARCH_PATHS = $(inherited) $(BUILT_PRODUCTS_DIR)
25-
26-
OTHER_CFLAGS[sdk=iphoneos9.*] = $(inherited) -fembed-bitcode

‎Configurations/ParseFacebookUtilsV4-tvOS.xcconfig‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,11 @@
88
//
99

1010
#include "Shared/Platform/tvOS.xcconfig"
11-
#include "Shared/Product/Framework.xcconfig"
11+
#include "Shared/Product/StaticFramework.xcconfig"
1212

1313
PRODUCT_NAME = ParseFacebookUtilsV4
1414
PRODUCT_BUNDLE_IDENTIFIER = com.parse.facebookutils-tvos
1515

16-
MACH_O_TYPE = staticlib
17-
DEFINES_MODULE = YES
18-
CLANG_ENABLE_MODULES = YES
19-
2016
INFOPLIST_FILE = $(SRCROOT)/Resources/Info-tvOS.plist
2117

2218
FRAMEWORK_SEARCH_PATHS = $(inherited) $(SRCROOT)/Vendor/tvOS

‎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: 34 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,62 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (4.2.6)
4+
activesupport (5.0.0)
5+
concurrent-ruby (~> 1.0, >= 1.0.2)
56
i18n (~> 0.7)
6-
json (~> 1.7, >= 1.7.7)
77
minitest (~> 5.1)
8-
thread_safe (~> 0.3, >= 0.3.4)
98
tzinfo (~> 1.1)
10-
claide (0.9.1)
11-
cocoapods (0.39.0)
9+
claide (1.0.0)
10+
cocoapods (1.0.1)
1211
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)
12+
claide (>= 1.0.0, < 2.0)
13+
cocoapods-core (= 1.0.1)
14+
cocoapods-deintegrate (>= 1.0.0, < 2.0)
15+
cocoapods-downloader (>= 1.0.0, < 2.0)
16+
cocoapods-plugins (>= 1.0.0, < 2.0)
17+
cocoapods-search (>= 1.0.0, < 2.0)
18+
cocoapods-stats (>= 1.0.0, < 2.0)
19+
cocoapods-trunk (>= 1.0.0, < 2.0)
20+
cocoapods-try (>= 1.0.0, < 2.0)
2121
colored (~> 1.2)
2222
escape (~> 0.0.4)
23-
molinillo (~> 0.4.0)
23+
fourflusher (~> 0.3.0)
24+
molinillo (~> 0.4.5)
2425
nap (~> 1.0)
25-
xcodeproj (~> 0.28.2)
26-
cocoapods-core (0.39.0)
26+
xcodeproj (>= 1.1.0, < 2.0)
27+
cocoapods-core (1.0.1)
2728
activesupport (>= 4.0.2)
2829
fuzzy_match (~> 2.0.4)
2930
nap (~> 1.0)
30-
cocoapods-downloader (0.9.3)
31-
cocoapods-plugins (0.4.2)
31+
cocoapods-deintegrate (1.0.0)
32+
cocoapods-downloader (1.1.0)
33+
cocoapods-plugins (1.0.0)
3234
nap
33-
cocoapods-search (0.1.0)
34-
cocoapods-stats (0.6.2)
35-
cocoapods-trunk (0.6.4)
35+
cocoapods-search (1.0.0)
36+
cocoapods-stats (1.0.0)
37+
cocoapods-trunk (1.0.0)
3638
nap (>= 0.8, < 2.0)
3739
netrc (= 0.7.8)
38-
cocoapods-try (0.5.1)
40+
cocoapods-try (1.1.0)
3941
colored (1.2)
42+
concurrent-ruby (1.0.2)
4043
escape (0.0.4)
44+
fourflusher (0.3.2)
4145
fuzzy_match (2.0.4)
4246
i18n (0.7.0)
43-
json (1.8.3)
44-
minitest (5.8.4)
45-
molinillo (0.4.4)
47+
minitest (5.9.0)
48+
molinillo (0.4.5)
4649
nap (1.1.0)
4750
naturally (2.1.0)
4851
netrc (0.7.8)
49-
rake (11.1.2)
50-
rouge (1.10.1)
52+
rake (11.2.2)
53+
rouge (1.11.1)
5154
thread_safe (0.3.5)
5255
tzinfo (1.2.2)
5356
thread_safe (~> 0.1)
54-
xcodeproj (0.28.2)
57+
xcodeproj (1.2.0)
5558
activesupport (>= 3)
56-
claide (~> 0.9.1)
59+
claide (>= 1.0.0, < 2.0)
5760
colored (~> 1.2)
5861
xcpretty (0.2.2)
5962
rouge (~> 1.8)
@@ -62,10 +65,10 @@ PLATFORMS
6265
ruby
6366

6467
DEPENDENCIES
65-
cocoapods (~> 0.39)
68+
cocoapods
6669
naturally
6770
rake
6871
xcpretty
6972

7073
BUNDLED WITH
71-
1.11.2
74+
1.12.5

0 commit comments

Comments
 (0)