Skip to content

Update all configurations and dependencies. #958

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jul 12, 2016
Merged

Update all configurations and dependencies. #958

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0d5232d
Update Carthage dependencies.
nlutsenko Jul 7, 2016
d6620a5
Update all xcode configurations to latest.
nlutsenko Jul 6, 2016
af0ae17
Update xctoolchain to latest.
nlutsenko Jul 6, 2016
9162581
Update all gems to latest.
nlutsenko Jul 6, 2016
5031a64
Update Rakefile to use macOS instead of OSX.
nlutsenko Jul 6, 2016
6c50ef0
Update Travis-CI configuration to use macOS name.
nlutsenko Jul 6, 2016
78c8927
Remove no longer required bitcode flag for iOS.
nlutsenko Jul 8, 2016
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
10 changes: 5 additions & 5 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ env:
- LANG=en_US.UTF-8
matrix:
- TEST_TYPE=iOS
- TEST_TYPE=OSX
- TEST_TYPE=macOS
- TEST_TYPE=Deployment
- TEST_TYPE=Starters
- TEST_TYPE=CocoaPods
Expand All @@ -29,10 +29,10 @@ install:
fi
script:
- |
TEST_TYPE=$(echo "$TEST_TYPE" | tr '[:upper:]' '[:lower:]')
bundle exec rake test:$TEST_TYPE
RAKE_TASK_NAME=$(echo "$TEST_TYPE" | tr '[:upper:]' '[:lower:]')
bundle exec rake test:$RAKE_TASK_NAME
after_success:
- |
if [ "$TEST_TYPE" = "ios" ] || [ "$TEST_TYPE" = "osx" ]; then
if [ "$TEST_TYPE" = iOS ] || [ "$TEST_TYPE" = macOS ]; then
bash <(curl -s https://codecov.io/bash)
fi
fi
4 changes: 2 additions & 2 deletions Cartfile.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "BoltsFramework/Bolts-ObjC" "1.7.0"
github "erikdoe/OCMock" "v3.2.2"
github "BoltsFramework/Bolts-ObjC" "1.8.3"
github "erikdoe/OCMock" "v3.3.1"
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Bolts-ObjC
Open in desktop
Submodule Bolts-ObjC updated 46 files
+1 −0 .clang-format
+11 −0 .codecov.yml
+5 −7 .travis.yml
+2 −3 Bolts.podspec
+153 −117 Bolts.xcodeproj/project.pbxproj
+6 −21 Bolts.xcodeproj/xcshareddata/xcschemes/Bolts-macOS.xcscheme
+32 −0 Bolts/Common/BFTask+Exceptions.h
+24 −0 Bolts/Common/BFTask+Exceptions.m
+17 −5 Bolts/Common/BFTask.h
+54 −26 Bolts/Common/BFTask.m
+8 −2 Bolts/Common/BFTaskCompletionSource.h
+1 −0 Bolts/Common/Bolts.h
+1 −1 Bolts/Common/Bolts.m
+2 −2 Bolts/Resources/Info.plist
+0 −26 Bolts/Resources/Mac-Info.plist
+0 −29 Bolts/Resources/iOS-Info.plist
+0 −26 Bolts/Resources/tvOS-Info.plist
+20 −0 Bolts/iOS/BFAppLinkNavigation.h
+42 −1 Bolts/iOS/BFAppLinkNavigation.m
+4 −4 Bolts/iOS/BFURL.m
+0 −0 Bolts/iOS/Internal/BFAppLinkReturnToRefererView_Internal.h
+0 −0 Bolts/iOS/Internal/BFAppLink_Internal.h
+0 −0 Bolts/iOS/Internal/BFMeasurementEvent_Internal.h
+0 −0 Bolts/iOS/Internal/BFURL_Internal.h
+4 −0 BoltsTestUI/BoltsTestUI-Info.plist
+13 −0 BoltsTests/AppLinkTests.m
+6 −3 BoltsTests/ExecutorTests.m
+185 −121 BoltsTests/TaskTests.m
+55 −0 CHANGELOG.md
+3 −10 Configurations/Bolts-iOS-Dynamic.xcconfig
+2 −10 Configurations/Bolts-iOS.xcconfig
+4 −11 Configurations/Bolts-macOS.xcconfig
+2 −9 Configurations/Bolts-tvOS-Dynamic.xcconfig
+2 −8 Configurations/Bolts-tvOS.xcconfig
+2 −8 Configurations/Bolts-watchOS-Dynamic.xcconfig
+2 −7 Configurations/Bolts-watchOS.xcconfig
+2 −3 Configurations/BoltsTests-OSX.xcconfig
+2 −5 Configurations/BoltsTests-iOS.xcconfig
+1 −3 Configurations/BoltsTests-tvOS.xcconfig
+0 −148 Rakefile
+1 −1 Vendor/xctoolchain
+0 −73 scripts/build_documentation.sh
+7 −8 scripts/build_framework.sh
+2 −2 scripts/common.sh
+0 −49 scripts/label_version_number.sh
+0 −69 scripts/run_tests.sh
2 changes: 1 addition & 1 deletion Carthage/Checkouts/OCMock
Open in desktop
Submodule OCMock updated 22 files
+2 −2 OCMock.podspec
+28 −16 Source/Changes.txt
+8 −0 Source/OCMock.xcodeproj/project.pbxproj
+1 −1 Source/OCMock/NSInvocation+OCMAdditions.h
+68 −7 Source/OCMock/NSInvocation+OCMAdditions.m
+2 −2 Source/OCMock/OCClassMockObject.m
+44 −16 Source/OCMock/OCMFunctions.m
+3 −8 Source/OCMock/OCMFunctionsPrivate.h
+5 −5 Source/OCMock/OCMInvocationMatcher.m
+3 −0 Source/OCMock/OCMMacroState.h
+33 −11 Source/OCMock/OCMMacroState.m
+3 −0 Source/OCMock/OCMStubRecorder.m
+33 −6 Source/OCMock/OCMock.h
+117 −49 Source/OCMock/OCMockObject.m
+35 −23 Source/OCMock/OCObserverMockObject.m
+1 −1 Source/OCMock/OCPartialMockObject.m
+12 −0 Source/OCMockTests/OCMockObjectMacroTests.m
+11 −0 Source/OCMockTests/OCMockObjectPartialMocksTests.m
+19 −0 Source/OCMockTests/OCMockObjectRuntimeTests.m
+20 −0 Source/OCMockTests/TestClassWithCustomReferenceCounting.h
+55 −0 Source/OCMockTests/TestClassWithCustomReferenceCounting.m
+1 −1 Tools/build.rb
9 changes: 3 additions & 6 deletions Configurations/Parse-iOS-Dynamic.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,14 @@
//

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

PRODUCT_NAME = Parse
PRODUCT_BUNDLE_IDENTIFIER = com.parse.ios
DEFINES_MODULE = YES

IPHONEOS_DEPLOYMENT_TARGET = 8.0

MACH_O_TYPE = mh_dylib
DYLIB_INSTALL_NAME_BASE = @rpath

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

OTHER_CFLAGS[sdk=iphoneos9.*] = $(inherited) -fembed-bitcode
// TODO: (nlutsenko) Cleanup source code so we can safely ignore local variable shadow warnings.
GCC_WARN_SHADOW = NO
8 changes: 3 additions & 5 deletions Configurations/Parse-iOS.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,13 @@
//

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

PRODUCT_NAME = Parse
PRODUCT_BUNDLE_IDENTIFIER = com.parse.ios
APPLICATION_EXTENSION_API_ONLY = YES

MACH_O_TYPE = staticlib
DEFINES_MODULE = YES

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

OTHER_CFLAGS[sdk=iphoneos9.*] = $(inherited) -fembed-bitcode
// TODO: (nlutsenko) Cleanup source code so we can safely ignore local variable shadow warnings.
GCC_WARN_SHADOW = NO
13 changes: 6 additions & 7 deletions Configurations/Parse-OSX.xcconfig → Configurations/Parse-macOS.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,13 @@
// of patent rights can be found in the PATENTS file in the same directory.
//

#include "Shared/Platform/OSX.xcconfig"
#include "Shared/Product/Framework.xcconfig"
#include "Shared/Platform/macOS.xcconfig"
#include "Shared/Product/DynamicFramework.xcconfig"

PRODUCT_NAME = Parse
PRODUCT_BUNDLE_IDENTIFIER = com.parse.osx

MACH_O_TYPE = mh_dylib
DEFINES_MODULE = YES
DYLIB_INSTALL_NAME_BASE = @rpath
PRODUCT_BUNDLE_IDENTIFIER = com.parse.macos

INFOPLIST_FILE = $(PROJECT_DIR)/Parse/Resources/Parse-OSX.Info.plist

// TODO: (nlutsenko) Cleanup source code so we can safely ignore local variable shadow warnings.
GCC_WARN_SHADOW = NO
11 changes: 4 additions & 7 deletions Configurations/Parse-tvOS-Dynamic.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,12 @@
//

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

PRODUCT_NAME = Parse
PRODUCT_BUNDLE_IDENTIFIER = com.parse.tvos
DEFINES_MODULE = YES

MACH_O_TYPE = mh_dylib
DYLIB_INSTALL_NAME_BASE = @rpath

OTHER_LDFLAGS = $(inherited) -ObjC

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

// TODO: (nlutsenko) Cleanup source code so we can safely ignore local variable shadow warnings.
GCC_WARN_SHADOW = NO
11 changes: 4 additions & 7 deletions Configurations/Parse-tvOS.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,12 @@
//

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

PRODUCT_NAME = Parse
PRODUCT_BUNDLE_IDENTIFIER = com.parse.tvos

MACH_O_TYPE = staticlib
APPLICATION_EXTENSION_API_ONLY = YES
DEFINES_MODULE = YES

OTHER_LDFLAGS = $(inherited) -ObjC

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

// TODO: (nlutsenko) Cleanup source code so we can safely ignore local variable shadow warnings.
GCC_WARN_SHADOW = NO
14 changes: 4 additions & 10 deletions Configurations/Parse-watchOS-Dynamic.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,12 @@
//

#include "Shared/Platform/watchOS.xcconfig"
#include "Shared/Product/Framework.xcconfig"
#include "Shared/Product/DynamicFramework.xcconfig"

PRODUCT_NAME = Parse
PRODUCT_BUNDLE_IDENTIFIER = com.parse.watchos

MACH_O_TYPE = mh_dylib
DYLIB_INSTALL_NAME_BASE = @rpath

APPLICATION_EXTENSION_API_ONLY = YES
DEFINES_MODULE = YES
ENABLE_BITCODE = YES

OTHER_LDFLAGS = $(inherited) -ObjC

INFOPLIST_FILE = $(PROJECT_DIR)/Parse/Resources/Parse-watchOS.Info.plist

// TODO: (nlutsenko) Cleanup source code so we can safely ignore local variable shadow warnings.
GCC_WARN_SHADOW = NO
12 changes: 4 additions & 8 deletions Configurations/Parse-watchOS.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,12 @@
//

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

PRODUCT_NAME = Parse
PRODUCT_BUNDLE_IDENTIFIER = com.parse.watchos

MACH_O_TYPE = staticlib
APPLICATION_EXTENSION_API_ONLY = YES
DEFINES_MODULE = YES
ENABLE_BITCODE = YES

OTHER_LDFLAGS = $(inherited) -ObjC

INFOPLIST_FILE = $(PROJECT_DIR)/Parse/Resources/Parse-watchOS.Info.plist

// TODO: (nlutsenko) Cleanup source code so we can safely ignore local variable shadow warnings.
GCC_WARN_SHADOW = NO
5 changes: 4 additions & 1 deletion Configurations/ParseUnitTests-iOS.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
//

#include "Shared/Platform/iOS.xcconfig"
#include "Shared/Product/UnitTest.xcconfig"
#include "Shared/Product/LogicTests.xcconfig"

PRODUCT_NAME = ParseUnitTests-iOS
PRODUCT_MODULE_NAME = ParseUnitTests
Expand All @@ -19,3 +19,6 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.0
INFOPLIST_FILE = $(SRCROOT)/Tests/Resources/ParseUnitTests-iOS-Info.plist

USER_HEADER_SEARCH_PATHS = $(inherited) $(PARSE_DIR)/Parse/Internal/**

// TODO: (nlutsenko) Cleanup source code so we can safely ignore local variable shadow warnings.
GCC_WARN_SHADOW = NO
12 changes: 7 additions & 5 deletions Configurations/ParseUnitTests-OSX.xcconfig → Configurations/ParseUnitTests-macOS.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,16 @@
// of patent rights can be found in the PATENTS file in the same directory.
//

#include "Shared/Platform/OSX.xcconfig"
#include "Shared/Product/UnitTest.xcconfig"
#include "Shared/Platform/macOS.xcconfig"
#include "Shared/Product/LogicTests.xcconfig"

PRODUCT_NAME = ParseUnitTests-OSX
PRODUCT_NAME = ParseUnitTests-macOS
PRODUCT_MODULE_NAME = ParseUnitTests
PRODUCT_BUNDLE_IDENTIFIER = com.parse.unit.osx
PRODUCT_BUNDLE_IDENTIFIER = com.parse.unit.macOS

INFOPLIST_FILE = $(SRCROOT)/Tests/Resources/ParseUnitTests-OSX-Info.plist
LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks @loader_path/../Frameworks @executable_path/Frameworks @loader_path/Frameworks

USER_HEADER_SEARCH_PATHS = $(inherited) $(PARSE_DIR)/Parse/Internal/**

// TODO: (nlutsenko) Cleanup source code so we can safely ignore local variable shadow warnings.
GCC_WARN_SHADOW = NO
67 changes: 35 additions & 32 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,60 +1,63 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (4.2.5)
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.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)
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.3)
molinillo (0.4.1)
nap (1.0.0)
minitest (5.9.0)
molinillo (0.4.5)
nap (1.1.0)
naturally (1.3.2)
netrc (0.7.8)
plist (3.1.0)
rake (10.4.2)
rouge (1.10.1)
plist (3.2.0)
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)
Expand All @@ -71,4 +74,4 @@ DEPENDENCIES
xcpretty

BUNDLED WITH
1.11.2
1.12.5
Loading