Skip to content

Commit 30b6843

Browse files
author
Phil Jacobsen
committed
Merge branch 'parseOriginal'
* parseOriginal: (211 commits) Parse 1.14.2 ☁️ (parse-community#988) Fixed crash when an NSBundle without executable is loaded (parse-community#981) Parse 1.14.1 ☁️ (parse-community#977) Fix not automatically registered subclasses of built-in subclasses of PFObject. (parse-community#976) Parse 1.14.0 ☁️ (parse-community#973) Update xctoolchain to latest. Improve code coverage for PFFileState. Update Carthage dependencies. Update gem dependencies. Update PFObjectState.m (parse-community#922) Added automatic PFObject subclass registration. (parse-community#967) Fix non-faulted task when loading installationId from persistence group fails. (parse-community#970) Remove no longer required bitcode flag for iOS. Update Travis-CI configuration to use macOS name. Update Rakefile to use macOS instead of OSX. Update all gems to latest. Update xctoolchain to latest. Update all xcode configurations to latest. Update Carthage dependencies. Update starter projects to use configuration-based initialization API. (parse-community#957) ...
2 parents 0e73307 + 7a820b7 commit 30b6843

File tree

416 files changed

+11765
-6958
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

416 files changed

+11765
-6958
lines changed

.codecov.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
coverage:
2+
ignore:
3+
- Tests/.*
4+
status:
5+
patch: false
6+
changes: false
7+
project:
8+
default:
9+
target: 65
10+
comment: false

.gitmodules

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
[submodule "Vendor/Bolts-ObjC"]
2-
path = Vendor/Bolts-ObjC
3-
url = https://github.com/BoltsFramework/Bolts-iOS.git
4-
[submodule "Vendor/OCMock"]
5-
path = Vendor/OCMock
6-
url = https://github.com/erikdoe/ocmock.git
71
[submodule "Vendor/xctoolchain"]
82
path = Vendor/xctoolchain
93
url = https://github.com/ParsePlatform/xctoolchain.git
4+
[submodule "Carthage/Checkouts/OCMock"]
5+
path = Carthage/Checkouts/OCMock
6+
url = https://github.com/erikdoe/OCMock.git
7+
[submodule "Carthage/Checkouts/Bolts-ObjC"]
8+
path = Carthage/Checkouts/Bolts-ObjC
9+
url = https://github.com/BoltsFramework/Bolts-ObjC.git

.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 & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@ branches:
33
- master
44
language: objective-c
55
os: osx
6-
osx_image: xcode7.1
6+
osx_image: xcode7.3
77
env:
88
global:
99
- LC_CTYPE=en_US.UTF-8
1010
- LANG=en_US.UTF-8
1111
matrix:
12-
- TEST_TYPE=ios
13-
- TEST_TYPE=osx
14-
- TEST_TYPE=deployment
15-
- TEST_TYPE=starters
16-
- TEST_TYPE=podspecs
12+
- TEST_TYPE=iOS
13+
- TEST_TYPE=macOS
14+
- TEST_TYPE=Deployment
15+
- TEST_TYPE=Starters
16+
- TEST_TYPE=CocoaPods
1717
git:
1818
submodules: false
1919
before_install:
@@ -22,11 +22,17 @@ install:
2222
- |
2323
if [ -n "$TEST_TYPE" ]; then
2424
bundle install
25+
if [ "$TEST_TYPE" == "Carthage" ]; then
26+
brew update
27+
brew install carthage || brew upgrade carthage
28+
fi
2529
fi
2630
script:
27-
- bundle exec rake test:$TEST_TYPE
31+
- |
32+
RAKE_TASK_NAME=$(echo "$TEST_TYPE" | tr '[:upper:]' '[:lower:]')
33+
bundle exec rake test:$RAKE_TASK_NAME
2834
after_success:
29-
- |
30-
if [ "$TEST_TYPE" = "ios" ] || [ "$TEST_TYPE" = "osx" ]; then
35+
- |
36+
if [ "$TEST_TYPE" = iOS ] || [ "$TEST_TYPE" = macOS ]; then
3137
bash <(curl -s https://codecov.io/bash)
32-
fi
38+
fi

Cartfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
github "BoltsFramework/Bolts-ObjC" ~> 1.6

Cartfile.private

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
github "erikdoe/OCMock" ~> 3.2

Cartfile.resolved

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
github "BoltsFramework/Bolts-ObjC" "1.8.4"
2+
github "erikdoe/OCMock" "v3.3.1"

Carthage/Checkouts/Bolts-ObjC

Submodule Bolts-ObjC added at e64deec

Carthage/Checkouts/OCMock

Submodule OCMock added at 5bc8369

Configurations/Bolts-OSX.xcconfig

Lines changed: 0 additions & 10 deletions
This file was deleted.

Configurations/Bolts-iOS.xcconfig

Lines changed: 0 additions & 10 deletions
This file was deleted.

Configurations/Bolts-tvOS.xcconfig

Lines changed: 0 additions & 10 deletions
This file was deleted.

Configurations/Bolts-watchOS.xcconfig

Lines changed: 0 additions & 10 deletions
This file was deleted.
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
//
2+
// Copyright (c) 2015-present, Parse, LLC.
3+
// All rights reserved.
4+
//
5+
// This source code is licensed under the BSD-style license found in the
6+
// LICENSE file in the root directory of this source tree. An additional grant
7+
// of patent rights can be found in the PATENTS file in the same directory.
8+
//
9+
10+
#include "Shared/Platform/iOS.xcconfig"
11+
#include "Shared/Product/DynamicFramework.xcconfig"
12+
13+
PRODUCT_NAME = Parse
14+
PRODUCT_BUNDLE_IDENTIFIER = com.parse.ios
15+
16+
IPHONEOS_DEPLOYMENT_TARGET = 8.0
17+
18+
INFOPLIST_FILE = $(PROJECT_DIR)/Parse/Resources/Parse-iOS.Info.plist
19+
20+
// TODO: (nlutsenko) Cleanup source code so we can safely ignore local variable shadow warnings.
21+
GCC_WARN_SHADOW = NO

Configurations/Parse-iOS.xcconfig

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,13 @@
88
//
99

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

1313
PRODUCT_NAME = Parse
14-
15-
MACH_O_TYPE = staticlib
16-
DEFINES_MODULE = YES
17-
18-
FRAMEWORK_SEARCH_PATHS = $(inherited) $(BUILT_PRODUCTS_DIR) $(VENDOR_DIR)/Bolts-ObjC/build/ios/
14+
PRODUCT_BUNDLE_IDENTIFIER = com.parse.ios
15+
APPLICATION_EXTENSION_API_ONLY = YES
1916

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

22-
OTHER_CFLAGS[sdk=iphoneos9.*] = $(inherited) -fembed-bitcode
19+
// TODO: (nlutsenko) Cleanup source code so we can safely ignore local variable shadow warnings.
20+
GCC_WARN_SHADOW = NO

Configurations/Parse-OSX.xcconfig renamed to Configurations/Parse-macOS.xcconfig

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,13 @@
77
// of patent rights can be found in the PATENTS file in the same directory.
88
//
99

10-
#include "Shared/Platform/OSX.xcconfig"
11-
#include "Shared/Product/Framework.xcconfig"
10+
#include "Shared/Platform/macOS.xcconfig"
11+
#include "Shared/Product/DynamicFramework.xcconfig"
1212

1313
PRODUCT_NAME = Parse
14-
15-
MACH_O_TYPE = mh_dylib
16-
DEFINES_MODULE = YES
17-
DYLIB_INSTALL_NAME_BASE = @rpath
18-
19-
FRAMEWORK_SEARCH_PATHS = $(inherited) $(BUILT_PRODUCTS_DIR) $(VENDOR_DIR)/Bolts-ObjC/build/osx/
14+
PRODUCT_BUNDLE_IDENTIFIER = com.parse.macos
2015

2116
INFOPLIST_FILE = $(PROJECT_DIR)/Parse/Resources/Parse-OSX.Info.plist
17+
18+
// TODO: (nlutsenko) Cleanup source code so we can safely ignore local variable shadow warnings.
19+
GCC_WARN_SHADOW = NO
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
//
2+
// Copyright (c) 2015-present, Parse, LLC.
3+
// All rights reserved.
4+
//
5+
// This source code is licensed under the BSD-style license found in the
6+
// LICENSE file in the root directory of this source tree. An additional grant
7+
// of patent rights can be found in the PATENTS file in the same directory.
8+
//
9+
10+
#include "Shared/Platform/tvOS.xcconfig"
11+
#include "Shared/Product/DynamicFramework.xcconfig"
12+
13+
PRODUCT_NAME = Parse
14+
PRODUCT_BUNDLE_IDENTIFIER = com.parse.tvos
15+
16+
INFOPLIST_FILE = $(PROJECT_DIR)/Parse/Resources/Parse-tvOS.Info.plist
17+
18+
// TODO: (nlutsenko) Cleanup source code so we can safely ignore local variable shadow warnings.
19+
GCC_WARN_SHADOW = NO

Configurations/Parse-tvOS.xcconfig

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,12 @@
88
//
99

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

1313
PRODUCT_NAME = Parse
14-
15-
MACH_O_TYPE = staticlib
16-
APPLICATION_EXTENSION_API_ONLY = YES
17-
DEFINES_MODULE = YES
18-
19-
OTHER_LDFLAGS = $(inherited) -ObjC
20-
21-
FRAMEWORK_SEARCH_PATHS = $(inherited) $(BUILT_PRODUCTS_DIR) $(VENDOR_DIR)/Bolts-ObjC/build/tvOS/
14+
PRODUCT_BUNDLE_IDENTIFIER = com.parse.tvos
2215

2316
INFOPLIST_FILE = $(PROJECT_DIR)/Parse/Resources/Parse-tvOS.Info.plist
17+
18+
// TODO: (nlutsenko) Cleanup source code so we can safely ignore local variable shadow warnings.
19+
GCC_WARN_SHADOW = NO
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
//
2+
// Copyright (c) 2015-present, Parse, LLC.
3+
// All rights reserved.
4+
//
5+
// This source code is licensed under the BSD-style license found in the
6+
// LICENSE file in the root directory of this source tree. An additional grant
7+
// of patent rights can be found in the PATENTS file in the same directory.
8+
//
9+
10+
#include "Shared/Platform/watchOS.xcconfig"
11+
#include "Shared/Product/DynamicFramework.xcconfig"
12+
13+
PRODUCT_NAME = Parse
14+
PRODUCT_BUNDLE_IDENTIFIER = com.parse.watchos
15+
16+
INFOPLIST_FILE = $(PROJECT_DIR)/Parse/Resources/Parse-watchOS.Info.plist
17+
18+
// TODO: (nlutsenko) Cleanup source code so we can safely ignore local variable shadow warnings.
19+
GCC_WARN_SHADOW = NO

Configurations/Parse-watchOS.xcconfig

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,12 @@
88
//
99

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

1313
PRODUCT_NAME = Parse
14-
15-
MACH_O_TYPE = staticlib
16-
APPLICATION_EXTENSION_API_ONLY = YES
17-
DEFINES_MODULE = YES
18-
19-
OTHER_LDFLAGS = $(inherited) -ObjC
20-
21-
FRAMEWORK_SEARCH_PATHS = $(inherited) $(BUILT_PRODUCTS_DIR) $(VENDOR_DIR)/Bolts-ObjC/build/watchOS/
14+
PRODUCT_BUNDLE_IDENTIFIER = com.parse.watchos
2215

2316
INFOPLIST_FILE = $(PROJECT_DIR)/Parse/Resources/Parse-watchOS.Info.plist
17+
18+
// TODO: (nlutsenko) Cleanup source code so we can safely ignore local variable shadow warnings.
19+
GCC_WARN_SHADOW = NO

Configurations/ParseUnitTests-iOS.xcconfig

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

1010
#include "Shared/Platform/iOS.xcconfig"
11-
#include "Shared/Product/UnitTest.xcconfig"
11+
#include "Shared/Product/LogicTests.xcconfig"
1212

1313
PRODUCT_NAME = ParseUnitTests-iOS
1414
PRODUCT_MODULE_NAME = ParseUnitTests
15+
PRODUCT_BUNDLE_IDENTIFIER = com.parse.unit.ios
1516

16-
INFOPLIST_FILE = $(SRCROOT)/Tests/Resources/ParseUnitTests-iOS-Info.plist
17-
LIBRARY_SEARCH_PATHS = $(inherited) $(BUILT_PRODUCTS_DIR)
17+
IPHONEOS_DEPLOYMENT_TARGET = 8.0
1818

19-
FRAMEWORK_SEARCH_PATHS = $(inherited) $(VENDOR_DIR)/Bolts-ObjC/build/ios
19+
INFOPLIST_FILE = $(SRCROOT)/Tests/Resources/ParseUnitTests-iOS-Info.plist
2020

21-
HEADER_SEARCH_PATHS = $(inherited) $(BUILT_PRODUCTS_DIR)
2221
USER_HEADER_SEARCH_PATHS = $(inherited) $(PARSE_DIR)/Parse/Internal/**
2322

24-
// Swift
25-
SWIFT_OBJC_BRIDGING_HEADER = $(SRCROOT)/Tests/Other/Swift/ParseUnitTests-iOS-Bridging-Header.h
23+
// TODO: (nlutsenko) Cleanup source code so we can safely ignore local variable shadow warnings.
24+
GCC_WARN_SHADOW = NO

Configurations/ParseUnitTests-OSX.xcconfig renamed to Configurations/ParseUnitTests-macOS.xcconfig

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,16 @@
77
// of patent rights can be found in the PATENTS file in the same directory.
88
//
99

10-
#include "Shared/Platform/OSX.xcconfig"
11-
#include "Shared/Product/UnitTest.xcconfig"
10+
#include "Shared/Platform/macOS.xcconfig"
11+
#include "Shared/Product/LogicTests.xcconfig"
1212

13-
PRODUCT_NAME = ParseUnitTests-OSX
13+
PRODUCT_NAME = ParseUnitTests-macOS
1414
PRODUCT_MODULE_NAME = ParseUnitTests
15+
PRODUCT_BUNDLE_IDENTIFIER = com.parse.unit.macOS
1516

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

19-
FRAMEWORK_SEARCH_PATHS = $(inherited) $(VENDOR_DIR)/Bolts-ObjC/build/osx
20-
21-
HEADER_SEARCH_PATHS = $(inherited) $(BUILT_PRODUCTS_DIR)
2219
USER_HEADER_SEARCH_PATHS = $(inherited) $(PARSE_DIR)/Parse/Internal/**
2320

24-
// Swift
25-
SWIFT_OBJC_BRIDGING_HEADER = $(SRCROOT)/Tests/Other/Swift/ParseUnitTests-OSX-Bridging-Header.h
21+
// TODO: (nlutsenko) Cleanup source code so we can safely ignore local variable shadow warnings.
22+
GCC_WARN_SHADOW = NO

0 commit comments

Comments
 (0)