Skip to content

Commit d9c6542

Browse files
tkhoa87tkhoa87
committed
Merge branch 'master' into release/1.15.3
* master: ⚡ Release 1.15.3 Remove PFEventuallyQueueTestHelper because (1) it was causing memory leaks in production code, and (2) it wasn't actually used in any tests. (parse-community#1188) Fix some issues where nil was passed to a method requiring a non-nil parameter (parse-community#1187) Xcode 9 modernization (parse-community#1186) fixes issue affecting list of listeners (parse-community#1182)
2 parents ff5da6e + a6c2391 commit d9c6542

File tree

64 files changed

+849
-170
lines changed

Some content is hidden

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

64 files changed

+849
-170
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ env:
1212
- TEST_TYPE=iOS
1313
- TEST_TYPE=macOS
1414
- TEST_TYPE=Deployment
15-
- TEST_TYPE=Starters
15+
- TEST_TYPE=Carthage
1616
- TEST_TYPE=CocoaPods
1717
git:
1818
submodules: false

‎Carthage/Checkouts/OCMock‎

Submodule OCMock updated 33 files

‎Parse.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'Parse'
3-
s.version = '1.15.2'
3+
s.version = '1.15.3'
44
s.license = { :type => 'BSD', :file => 'LICENSE' }
55
s.homepage = 'http://parseplatform.org/'
66
s.summary = 'A library that gives you access to the powerful Parse cloud platform from your iOS/OS X/watchOS/tvOS app.'

‎Parse.xcodeproj/project.pbxproj‎

Lines changed: 227 additions & 1 deletion
Large diffs are not rendered by default.

‎Parse.xcodeproj/xcshareddata/xcschemes/Parse-iOS-Dynamic.xcscheme‎

Lines changed: 3 additions & 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 = "0830"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<Testables>
3132
</Testables>
@@ -36,6 +37,7 @@
3637
buildConfiguration = "Debug"
3738
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
3839
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
40+
language = ""
3941
launchStyle = "0"
4042
useCustomWorkingDirectory = "NO"
4143
ignoresPersistentStateOnLaunch = "NO"

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0830"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -40,9 +40,10 @@
4040
buildConfiguration = "Debug"
4141
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4242
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
43+
enableAddressSanitizer = "YES"
44+
language = ""
4345
shouldUseLaunchSchemeArgsEnv = "YES"
44-
codeCoverageEnabled = "YES"
45-
enableAddressSanitizer = "YES">
46+
codeCoverageEnabled = "YES">
4647
<Testables>
4748
<TestableReference
4849
skipped = "NO">
@@ -71,6 +72,7 @@
7172
buildConfiguration = "Debug"
7273
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
7374
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
75+
language = ""
7476
launchStyle = "0"
7577
useCustomWorkingDirectory = "NO"
7678
ignoresPersistentStateOnLaunch = "NO"

‎Parse.xcodeproj/xcshareddata/xcschemes/Parse-macOS.xcscheme‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0830"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -40,9 +40,10 @@
4040
buildConfiguration = "Debug"
4141
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4242
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
43+
enableAddressSanitizer = "YES"
44+
language = ""
4345
shouldUseLaunchSchemeArgsEnv = "YES"
44-
codeCoverageEnabled = "YES"
45-
enableAddressSanitizer = "YES">
46+
codeCoverageEnabled = "YES">
4647
<Testables>
4748
<TestableReference
4849
skipped = "NO">
@@ -71,6 +72,7 @@
7172
buildConfiguration = "Debug"
7273
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
7374
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
75+
language = ""
7476
launchStyle = "0"
7577
useCustomWorkingDirectory = "NO"
7678
ignoresPersistentStateOnLaunch = "NO"

‎Parse.xcodeproj/xcshareddata/xcschemes/Parse-tvOS-Dynamic.xcscheme‎

Lines changed: 3 additions & 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 = "0830"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<Testables>
3132
</Testables>
@@ -36,6 +37,7 @@
3637
buildConfiguration = "Debug"
3738
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
3839
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
40+
language = ""
3941
launchStyle = "0"
4042
useCustomWorkingDirectory = "NO"
4143
ignoresPersistentStateOnLaunch = "NO"

‎Parse.xcodeproj/xcshareddata/xcschemes/Parse-tvOS.xcscheme‎

Lines changed: 3 additions & 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 = "0830"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<Testables>
3132
</Testables>
@@ -36,6 +37,7 @@
3637
buildConfiguration = "Debug"
3738
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
3839
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
40+
language = ""
3941
launchStyle = "0"
4042
useCustomWorkingDirectory = "NO"
4143
ignoresPersistentStateOnLaunch = "NO"

‎Parse.xcodeproj/xcshareddata/xcschemes/Parse-watchOS-Dynamic.xcscheme‎

Lines changed: 3 additions & 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 = "0830"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<Testables>
3132
</Testables>
@@ -36,6 +37,7 @@
3637
buildConfiguration = "Debug"
3738
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
3839
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
40+
language = ""
3941
launchStyle = "0"
4042
useCustomWorkingDirectory = "NO"
4143
ignoresPersistentStateOnLaunch = "NO"

0 commit comments

Comments
 (0)