Skip to content

Commit f363831

Browse files
committed
Merges changes from rico237's fork
Updates FB libs to 5.x
2 parents cb39c83 + 804d5bf commit f363831

File tree

67 files changed

+176
-3481
lines changed

Some content is hidden

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

67 files changed

+176
-3481
lines changed

.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ defaults: &defaults
44
shell: /bin/bash --login -eo pipefail
55
aliases:
66
- &prepare
7-
|
7+
|
88
git submodule update --init --recursive
99
gem install bundler
1010
bundle install
@@ -66,7 +66,7 @@ jobs:
6666
- checkout
6767
- run: *prepare
6868
- run: |
69-
xcrun simctl create "Apple TV 1080p" com.apple.CoreSimulator.SimDeviceType.Apple-TV-1080p com.apple.CoreSimulator.SimRuntime.tvOS-11-0
69+
xcrun simctl create "Apple TV 1080p" com.apple.CoreSimulator.SimDeviceType.Apple-TV-1080p com.apple.CoreSimulator.SimRuntime.tvOS-12-2
7070
bundle exec rake package:release
7171
jazzy:
7272
<<: *defaults

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ xcuserdata
2929
## Dependency Managers
3030
Pods/
3131
Carthage/Build
32+
Carthage/Checkouts
3233
docs/
3334
./Bolts
3435

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
install: bundle install
1919
script:
2020
- ./Scripts/jazzy.sh
21-
- xcrun simctl create "Apple TV 1080p" com.apple.CoreSimulator.SimDeviceType.Apple-TV-1080p com.apple.CoreSimulator.SimRuntime.tvOS-11-0
21+
- xcrun simctl create "Apple TV 1080p" com.apple.CoreSimulator.SimDeviceType.Apple-TV-1080p com.apple.CoreSimulator.SimRuntime.tvOS-12-2
2222
- bundle exec rake package:release
2323
deploy:
2424
- provider: releases

CHANGELOG.md

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1-
# Parse-SDK-iOS-OSX Chnagelog
1+
# Parse-SDK-iOS-OSX Changelog
22

33
### master
4+
[Full Changelog](https://github.com/parse-community/Parse-SDK-iOS-OSX/compare/1.17.3...master)
5+
* _Contributing to this repo? Add info about your change here to be included in next release_
46

5-
* Fixes NSInternalInconsistencyException handling starting Bolts 1.9.0 by emitting soft NSErrors
6-
* Fixes issue affecting public getter/setters in PFACL's in Swift (#1083)
7-
* Prevent deadlocks when saving objects with cicrular references (#916)
8-
* Prevent deadlocks when running fetchAll with circluar references (#1184)
9-
* Adds NSNotification when an invalid session token is encountered
7+
### 1.17.3
8+
[Full Changelog](https://github.com/parse-community/Parse-SDK-iOS-OSX/compare/1.17.2...1.17.3)
109

10+
- FIX: Updates xcbuildtools submodule ([#1365](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1365)), thanks to [Darren Black](https://github.com/drdaz)
11+
- FIX: Bandaid for Crashlytics [#944](https://github.com/parse-community/Parse-SDK-iOS-OSX/issues/944) ([#1376](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1376)), thanks to [Rogers George](https://github.com/ceramicatheist)
12+
- NEW: tvOS push support ([#1375](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1375)), thanks to [Thomas Kollbach](https://github.com/toto)
13+
- FIX: Class properties ([#1400](https://github.com/parse-community/Parse-SDK-iOS-OSX/pull/1400)), thanks to [Thomas Kollbach](https://github.com/toto)
14+
- FIX: Upgrade ParseFacebookUtils dependency to Facebook SDK v5.2.1 ([#1411](https://github.com/parse-community/Parse-SDK-iOS-OSX/issues/1411)), thanks to [Herrick Wolber](https://github.com/rico237)

Cartfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
github "BoltsFramework/Bolts-ObjC" ~> 1.9
2-
github "facebook/facebook-objc-sdk" ~> 4.29
3-
2+
github "facebook/facebook-objc-sdk" ~> 5.2.1

Cartfile.resolved

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
github "BoltsFramework/Bolts-ObjC" "1.9.0"
22
github "erikdoe/OCMock" "v3.4.3"
3-
github "facebook/facebook-objc-sdk" "v4.44.1"
3+
github "facebook/facebook-objc-sdk" "v5.2.1"

Carthage/Checkouts/OCMock

Submodule OCMock updated 92 files

Parse.podspec

Lines changed: 10 additions & 10 deletions
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.17.2'
3+
s.version = '1.17.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.'
@@ -16,15 +16,15 @@ Pod::Spec.new do |s|
1616
s.watchos.deployment_target = '2.0'
1717

1818
s.default_subspec = 'Core'
19-
19+
2020
s.subspec 'Core' do |s|
2121
s.requires_arc = true
2222

2323
s.source_files = 'Parse/Parse/*.{h,m}',
2424
'Parse/Parse/Internal/**/*.{h,m}'
2525
s.public_header_files = 'Parse/Parse/*.h'
2626
s.private_header_files = 'Parse/Parse/Internal/**/*.h'
27-
27+
2828
s.ios.exclude_files = 'Parse/Parse/Internal/PFMemoryEventuallyQueue.{h,m}'
2929
s.osx.exclude_files = 'Parse/Parse/PFNetworkActivityIndicatorManager.{h,m}',
3030
'Parse/Parse/PFProduct.{h,m}',
@@ -53,9 +53,9 @@ Pod::Spec.new do |s|
5353
'Parse/Parse/Internal/Installation/PFInstallationPrivate.h',
5454
'Parse/Parse/Internal/Commands/PFRESTPushCommand.{h,m}',
5555
'Parse/Parse/Internal/PFMemoryEventuallyQueue.{h,m}'
56-
56+
5757
s.resource_bundle = { 'Parse' => 'Parse/Parse/Resources/en.lproj' }
58-
58+
5959
s.ios.frameworks = 'AudioToolbox',
6060
'CFNetwork',
6161
'CoreGraphics',
@@ -77,9 +77,9 @@ Pod::Spec.new do |s|
7777
'StoreKit',
7878
'SystemConfiguration',
7979
'Security'
80-
80+
8181
s.libraries = 'z', 'sqlite3'
82-
82+
8383
s.dependency 'Bolts/Tasks', '~> 1.9'
8484
end
8585

@@ -104,7 +104,7 @@ Pod::Spec.new do |s|
104104

105105
s.dependency 'Parse/Core'
106106
s.dependency 'Bolts', '~> 1.9'
107-
s.dependency 'FBSDKLoginKit', '~> 4.33'
107+
s.dependency 'FBSDKLoginKit', '~> 5.2.1'
108108
end
109109

110110
s.subspec 'FacebookUtils-tvOS' do |s|
@@ -126,8 +126,8 @@ Pod::Spec.new do |s|
126126

127127
s.dependency 'Parse/Core'
128128
s.dependency 'Bolts', '~> 1.9'
129-
s.dependency 'FBSDKTVOSKit', '~> 4.33'
130-
s.dependency 'FBSDKShareKit', '~> 4.33'
129+
s.dependency 'FBSDKTVOSKit', '~> 5.2.1'
130+
s.dependency 'FBSDKShareKit', '~> 5.2.1'
131131
end
132132

133133
s.subspec 'TwitterUtils' do |s|

Parse/Parse/PFConstants.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#pragma mark - SDK Version
1414
///--------------------------------------
1515

16-
#define PARSE_VERSION @"1.17.2"
16+
#define PARSE_VERSION @"1.17.3"
1717

1818
///--------------------------------------
1919
#pragma mark - Platform

Parse/Parse/Resources/Parse-OSX.Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
<key>CFBundlePackageType</key>
1414
<string>FMWK</string>
1515
<key>CFBundleShortVersionString</key>
16-
<string>1.17.2</string>
16+
<string>1.17.3</string>
1717
<key>CFBundleSignature</key>
1818
<string>????</string>
1919
<key>CFBundleVersion</key>
20-
<string>1.17.2</string>
20+
<string>1.17.3</string>
2121
</dict>
2222
</plist>

0 commit comments

Comments
 (0)