Skip to content
This repository was archived by the owner on Jan 16, 2021. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.3.1
27 changes: 16 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,23 @@ env:
- TEST_TYPE=iOS
- TEST_TYPE=CocoaPods
- TEST_TYPE=Package
install:
- |
bundle install
pod repo update --silent
pod install
script:
- |
if [ "$TEST_TYPE" = iOS ]; then
set -o pipefail
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
elif [ "$TEST_TYPE" = CocoaPods ]; then
pod lib lint --use-libraries ParseFacebookUtilsV4.podspec
elif [ "$TEST_TYPE" = Package ]; then
bundle exec rake package:frameworks
fi
if [ "$TEST_TYPE" = iOS ]; then
set -o pipefail
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
elif [ "$TEST_TYPE" = CocoaPods ]; then
pod lib lint --use-libraries ParseFacebookUtilsV4.podspec
elif [ "$TEST_TYPE" = Package ]; then
bundle exec rake package:frameworks
fi
after_success:
- |
if [ "$TEST_TYPE" = iOS ]; then
bash <(curl -s https://codecov.io/bash)
fi
if [ "$TEST_TYPE" = iOS ]; then
bash <(curl -s https://codecov.io/bash)
fi
2 changes: 0 additions & 2 deletions Configurations/ParseFacebookTestApplicationV4.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,4 @@
PRODUCT_NAME = ParseFacebookTestApplicationV4
PRODUCT_BUNDLE_IDENTIFIER = com.parse.facebookutils-ios.unit.app

CLANG_ENABLE_MODULES = YES

INFOPLIST_FILE = $(SRCROOT)/Tests/TestApplication/Resources/Info.plist
10 changes: 4 additions & 6 deletions Configurations/ParseFacebookUtilsV4-UnitTests.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,15 @@
//

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

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

CLANG_ENABLE_MODULES = YES
IPHONEOS_DEPLOYMENT_TARGET = 8.0

FRAMEWORK_SEARCH_PATHS = $(inherited) $(BUILT_PRODUCTS_DIR) $(SRCROOT)/Vendor "$PODS_CONFIGURATION_BUILD_DIR/OCMock"

INFOPLIST_FILE = $(SRCROOT)/Tests/Resources/Info.plist
TEST_HOST = $(BUILT_PRODUCTS_DIR)/ParseFacebookTestApplicationV4.app/ParseFacebookTestApplicationV4

FRAMEWORK_SEARCH_PATHS = $(inherited) $(BUILT_PRODUCTS_DIR) $(SRCROOT)/Vendor
LIBRARY_SEARCH_PATHS = $(inherited) $(BUILT_PRODUCTS_DIR)
HEADER_SEARCH_PATHS = $(inherited) $(BUILT_PRODUCTS_DIR)
10 changes: 1 addition & 9 deletions Configurations/ParseFacebookUtilsV4-iOS.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,11 @@
//

#include "Shared/Platform/iOS.xcconfig"
#include "Shared/Product/Framework.xcconfig"
#include "Shared/Product/StaticFramework.xcconfig"

PRODUCT_NAME = ParseFacebookUtilsV4
PRODUCT_BUNDLE_IDENTIFIER = com.parse.facebookutils-ios

MACH_O_TYPE = staticlib
DEFINES_MODULE = YES
CLANG_ENABLE_MODULES = YES

INFOPLIST_FILE = $(SRCROOT)/Resources/Info-iOS.plist

FRAMEWORK_SEARCH_PATHS = $(inherited) $(SRCROOT)/Vendor
LIBRARY_SEARCH_PATHS = $(inherited) $(BUILT_PRODUCTS_DIR)
HEADER_SEARCH_PATHS = $(inherited) $(BUILT_PRODUCTS_DIR)

OTHER_CFLAGS[sdk=iphoneos9.*] = $(inherited) -fembed-bitcode
6 changes: 1 addition & 5 deletions Configurations/ParseFacebookUtilsV4-tvOS.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,11 @@
//

#include "Shared/Platform/tvOS.xcconfig"
#include "Shared/Product/Framework.xcconfig"
#include "Shared/Product/StaticFramework.xcconfig"

PRODUCT_NAME = ParseFacebookUtilsV4
PRODUCT_BUNDLE_IDENTIFIER = com.parse.facebookutils-tvos

MACH_O_TYPE = staticlib
DEFINES_MODULE = YES
CLANG_ENABLE_MODULES = YES

INFOPLIST_FILE = $(SRCROOT)/Resources/Info-tvOS.plist

FRAMEWORK_SEARCH_PATHS = $(inherited) $(SRCROOT)/Vendor/tvOS
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ source 'https://rubygems.org'
gem 'naturally'
gem 'rake'
gem 'xcpretty'
gem 'cocoapods', '~> 0.39'
gem 'cocoapods'
65 changes: 34 additions & 31 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,59 +1,62 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (4.2.6)
activesupport (5.0.0)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
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.1.0)
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.1.0)
colored (1.2)
concurrent-ruby (1.0.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.2.0)
activesupport (>= 3)
claide (~> 0.9.1)
claide (>= 1.0.0, < 2.0)
colored (~> 1.2)
xcpretty (0.2.2)
rouge (~> 1.8)
Expand All @@ -62,10 +65,10 @@ PLATFORMS
ruby

DEPENDENCIES
cocoapods (~> 0.39)
cocoapods
naturally
rake
xcpretty

BUNDLED WITH
1.11.2
1.12.5
Loading