Skip to content

Commit 21457a9

Browse files
authored
Merge branch 'master' into master
2 parents 492bba7 + ef9b00d commit 21457a9

File tree

173 files changed

+251
-11628
lines changed

Some content is hidden

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

173 files changed

+251
-11628
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ jobs:
2020
script:
2121
- test:ios
2222
- test:macos
23-
- test:facebook_utils:ios
24-
- test:twitter_utils:ios
2523
- test:parseui:all
2624
- test:parse_live_query:all
2725
- build:starters

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ docs/
3737

3838
## AppCode
3939
.idea/
40-
ParseFacebookUtils/Vendor
4140
ParseUI/Vendor
4241

4342
# VSC

CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
# [3.0.0](https://github.com/parse-community/Parse-SDK-iOS-OSX/compare/2.7.3...3.0.0) (2024-04-08)
2+
3+
4+
### Features
5+
6+
* Add `PFObject.isDataAvailableForKey` to check if data is available for individual key ([#1756](https://github.com/parse-community/Parse-SDK-iOS-OSX/issues/1756)) ([dd05d41](https://github.com/parse-community/Parse-SDK-iOS-OSX/commit/dd05d411a54712ee927e5fb8af390ae36a60ed7e))
7+
* Remove `ParseFacebookUtils` and `ParseTwitterUtils` ([#1779](https://github.com/parse-community/Parse-SDK-iOS-OSX/issues/1779)) ([f1311ee](https://github.com/parse-community/Parse-SDK-iOS-OSX/commit/f1311eee00a2419720e85d7ca90fe868e509e4ed))
8+
9+
10+
### BREAKING CHANGES
11+
12+
* Removes convenience modules `ParseFacebookUtils` and `ParseTwitterUtils`, instead manually add the 3rd party authentication service SDK to log in and provide the authentication data to `PFUser.logInWithAuthType` to link the Parse User. ([f1311ee](f1311ee))
13+
114
## [2.7.3](https://github.com/parse-community/Parse-SDK-iOS-OSX/compare/2.7.2...2.7.3) (2023-10-06)
215

316

CONTRIBUTING.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,8 @@
1212
For analyzing bugs, creating bug fixes and features we recommend to clone this repository locally and add it as a local package to your Xcode project. This way you can edit and inspect the Parse SDK while running your app. You can find step-by-step instructions for how do that in the [Xcode docs](https://developer.apple.com/documentation/xcode/editing-a-package-dependency-as-a-local-package).
1313

1414
1. Fork the repository and create a new branch.
15-
2. Add unit tests for any new code you add.
15+
2. Add unit tests for any new code you add:
1616
- Core Module - [/Parse/Tests/Unit/](/Parse/Tests/Unit/)
17-
- Facebook Utils - [/ParseFacebookUtils/Tests/Unit/](/ParseFacebookUtils/Tests/Unit/)
18-
- Twitter Utils - [/ParseTwitterUtils/Tests/Unit/](/ParseTwitterUtils/Tests/Unit/)
1917
3. If you've changed APIs, update the documentation and the [iOS Guide](https://github.com/parse-community/docs/tree/gh-pages/_includes/ios).
2018
4. Ensure the test suite passes.
2119
You can run the tests in the command line with rake.

Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ gem 'jazzy', '~> 0.14.4'
66
# Development
77
gem 'xcpretty'
88
gem 'rake'
9+
gem 'plist'

Gemfile.lock

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,25 @@ GEM
33
specs:
44
CFPropertyList (3.0.6)
55
rexml
6-
activesupport (7.1.0)
7-
base64
8-
bigdecimal
6+
activesupport (6.1.7.7)
97
concurrent-ruby (~> 1.0, >= 1.0.2)
10-
connection_pool (>= 2.2.5)
11-
drb
128
i18n (>= 1.6, < 2)
139
minitest (>= 5.1)
14-
mutex_m
1510
tzinfo (~> 2.0)
11+
zeitwerk (~> 2.3)
1612
addressable (2.8.5)
1713
public_suffix (>= 2.0.2, < 6.0)
1814
algoliasearch (1.27.5)
1915
httpclient (~> 2.8, >= 2.8.3)
2016
json (>= 1.5.1)
2117
atomos (0.1.3)
22-
base64 (0.1.1)
23-
bigdecimal (3.1.4)
2418
claide (1.1.0)
25-
cocoapods (1.13.0)
19+
cocoapods (1.15.2)
2620
addressable (~> 2.8)
2721
claide (>= 1.0.2, < 2.0)
28-
cocoapods-core (= 1.13.0)
22+
cocoapods-core (= 1.15.2)
2923
cocoapods-deintegrate (>= 1.0.3, < 2.0)
30-
cocoapods-downloader (>= 1.6.0, < 2.0)
24+
cocoapods-downloader (>= 2.1, < 3.0)
3125
cocoapods-plugins (>= 1.0.0, < 2.0)
3226
cocoapods-search (>= 1.0.0, < 2.0)
3327
cocoapods-trunk (>= 1.6.0, < 2.0)
@@ -40,7 +34,7 @@ GEM
4034
nap (~> 1.0)
4135
ruby-macho (>= 2.3.0, < 3.0)
4236
xcodeproj (>= 1.23.0, < 2.0)
43-
cocoapods-core (1.13.0)
37+
cocoapods-core (1.15.2)
4438
activesupport (>= 5.0, < 8)
4539
addressable (~> 2.8)
4640
algoliasearch (~> 1.0)
@@ -51,7 +45,7 @@ GEM
5145
public_suffix (~> 4.0)
5246
typhoeus (~> 1.0)
5347
cocoapods-deintegrate (1.0.5)
54-
cocoapods-downloader (1.6.3)
48+
cocoapods-downloader (2.1)
5549
cocoapods-plugins (1.0.0)
5650
nap
5751
cocoapods-search (1.0.1)
@@ -61,9 +55,6 @@ GEM
6155
cocoapods-try (1.2.0)
6256
colored2 (3.1.2)
6357
concurrent-ruby (1.2.2)
64-
connection_pool (2.4.1)
65-
drb (2.1.1)
66-
ruby2_keywords
6758
escape (0.0.4)
6859
ethon (0.16.0)
6960
ffi (>= 1.15.0)
@@ -90,18 +81,17 @@ GEM
9081
minitest (5.20.0)
9182
molinillo (0.8.0)
9283
mustache (1.1.1)
93-
mutex_m (0.1.2)
9484
nanaimo (0.3.0)
9585
nap (1.1.0)
9686
netrc (0.11.0)
9787
open4 (1.3.4)
88+
plist (3.7.1)
9889
public_suffix (4.0.7)
9990
rake (13.0.6)
10091
redcarpet (3.6.0)
10192
rexml (3.2.6)
10293
rouge (2.0.7)
10394
ruby-macho (2.5.1)
104-
ruby2_keywords (0.0.5)
10595
sassc (2.4.0)
10696
ffi (~> 1.9)
10797
sqlite3 (1.6.6)
@@ -121,14 +111,16 @@ GEM
121111
rexml (~> 3.2.4)
122112
xcpretty (0.3.0)
123113
rouge (~> 2.0.7)
114+
zeitwerk (2.6.13)
124115

125116
PLATFORMS
126117
ruby
127118

128119
DEPENDENCIES
129120
jazzy (~> 0.14.4)
121+
plist
130122
rake
131123
xcpretty
132124

133125
BUNDLED WITH
134-
2.1.4
126+
2.4.22

Package.resolved

Lines changed: 0 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Package.swift

Lines changed: 1 addition & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,13 @@ let package = Package(
1313
],
1414
products: [
1515
.library(name: "ParseObjC", targets: ["ParseCore"]),
16-
.library(name: "ParseFacebookUtils", targets: ["ParseFacebookUtils"]),
17-
.library(name: "ParseFacebookUtilsiOS", targets: ["ParseFacebookUtilsiOS"]),
18-
.library(name: "ParseFacebookUtilsTvOS", targets: ["ParseFacebookUtilsTvOS"]),
19-
.library(name: "ParseTwitterUtils", targets: ["ParseTwitterUtils"]),
2016
.library(name: "ParseUI", targets: ["ParseUI"]),
2117
.library(name: "ParseLiveQuery", targets: ["ParseLiveQuery"])
2218
],
2319
dependencies: [
2420
.package(url: "https://github.com/parse-community/Bolts-ObjC.git", from: "1.10.0"),
2521
.package(url: "https://github.com/BoltsFramework/Bolts-Swift.git", from: "1.5.0"),
2622
.package(url: "https://github.com/daltoniam/Starscream.git", from: "4.0.6"),
27-
.package(url: "https://github.com/facebook/facebook-ios-sdk.git", from: "15.1.0"),
2823
.package(name: "OCMock", url: "https://github.com/erikdoe/ocmock.git", .revision("67bb9602f0a7541f24dc2d6d0d7389ca3e4c2c89"))
2924
],
3025
targets: [
@@ -37,57 +32,10 @@ let package = Package(
3732
publicHeadersPath: "Source",
3833
cSettings: [.headerSearchPath("Internal/**")]
3934
),
40-
.target(
41-
name: "ParseFacebookUtils",
42-
dependencies: [
43-
"ParseCore",
44-
.product(name: "Bolts", package: "Bolts-ObjC"),
45-
.product(name: "FacebookCore", package: "facebook-ios-sdk", condition: .when(platforms: [.iOS, .tvOS])),
46-
.product(name: "FacebookLogin", package: "facebook-ios-sdk", condition: .when(platforms: [.iOS, .tvOS]))],
47-
path: "ParseFacebookUtils/ParseFacebookUtils",
48-
exclude: ["Resources/Info-tvOS.plist", "Resources/Info-iOS.plist"],
49-
resources: [.process("Resources")],
50-
publicHeadersPath: "Source"
51-
),
52-
.target(
53-
name: "ParseFacebookUtilsiOS",
54-
dependencies: [
55-
"ParseFacebookUtils"
56-
],
57-
path: "ParseFacebookUtilsiOS/ParseFacebookUtilsiOS",
58-
exclude: ["Resources/Info-iOS.plist"],
59-
resources: [.process("Resources")],
60-
publicHeadersPath: "Source",
61-
cSettings: [.headerSearchPath("Internal/**")]
62-
),
63-
.target(
64-
name: "ParseFacebookUtilsTvOS",
65-
dependencies: [
66-
"ParseFacebookUtils",
67-
.product(name: "FacebookTV", package: "facebook-ios-sdk", condition: .when(platforms: [.tvOS]))
68-
],
69-
path: "ParseFacebookUtilsTvOS/ParseFacebookUtilsTvOS",
70-
exclude: ["Resources/Info-tvOS.plist"],
71-
resources: [.process("Resources")],
72-
publicHeadersPath: "Source",
73-
cSettings: [.headerSearchPath("Internal/**")]
74-
),
75-
.target(
76-
name: "ParseTwitterUtils",
77-
dependencies: [
78-
"ParseCore"
79-
],
80-
path: "ParseTwitterUtils/ParseTwitterUtils",
81-
exclude: ["Resources/Info-iOS.plist"],
82-
resources: [.process("Resources")],
83-
publicHeadersPath: "Source",
84-
cSettings: [.headerSearchPath("Internal/**")]
85-
),
8635
.target(
8736
name: "ParseUI",
8837
dependencies: [
89-
"ParseFacebookUtilsiOS",
90-
"ParseTwitterUtils"
38+
"ParseCore"
9139
],
9240
path: "ParseUI/ParseUI",
9341
exclude: ["Resources/Info-iOS.plist"],

Parse.xcworkspace/contents.xcworkspacedata

Lines changed: 0 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Parse.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 0 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Parse/Parse/Internal/Object/PFObjectPrivate.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,8 +202,6 @@
202202
- (void)setHasBeenFetched:(BOOL)fetched;
203203
- (void)_setDeleted:(BOOL)deleted;
204204

205-
- (BOOL)isDataAvailableForKey:(NSString *)key;
206-
207205
- (BOOL)_hasChanges;
208206
- (BOOL)_hasOutstandingOperations;
209207
- (PFOperationSet *)unsavedChanges;

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>2.7.3</string>
16+
<string>3.0.0</string>
1717
<key>CFBundleSignature</key>
1818
<string>????</string>
1919
<key>CFBundleVersion</key>
20-
<string>2.7.3</string>
20+
<string>3.0.0</string>
2121
</dict>
2222
</plist>

Parse/Parse/Resources/Parse-iOS.Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
<key>CFBundlePackageType</key>
1414
<string>FMWK</string>
1515
<key>CFBundleShortVersionString</key>
16-
<string>2.7.3</string>
16+
<string>3.0.0</string>
1717
<key>CFBundleSignature</key>
1818
<string>????</string>
1919
<key>CFBundleSupportedPlatforms</key>
2020
<array>
2121
<string>iPhoneOS</string>
2222
</array>
2323
<key>CFBundleVersion</key>
24-
<string>2.7.3</string>
24+
<string>3.0.0</string>
2525
<key>MinimumOSVersion</key>
2626
<string>12.0</string>
2727
</dict>

Parse/Parse/Resources/Parse-tvOS.Info.plist

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>2.7.3</string>
18+
<string>3.0.0</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>
22-
<string>2.7.3</string>
22+
<string>3.0.0</string>
2323
<key>NSPrincipalClass</key>
24-
<string></string>
24+
<string/>
2525
</dict>
2626
</plist>

Parse/Parse/Resources/Parse-watchOS.Info.plist

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>2.7.3</string>
18+
<string>3.0.0</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>
22-
<string>2.7.3</string>
22+
<string>3.0.0</string>
2323
<key>NSPrincipalClass</key>
24-
<string></string>
24+
<string/>
2525
</dict>
2626
</plist>

Parse/Parse/Source/PFAnonymousUtils.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ NS_ASSUME_NONNULL_BEGIN
3232
Data associated with the anonymous user is retained.
3333
- logIn switches users without converting the anonymous user.
3434
Data associated with the anonymous user will be lost.
35-
- Service logIn (e.g. Facebook, Twitter) will attempt to convert
35+
- Authentication service logIn will attempt to convert
3636
the anonymous user into a standard user by linking it to the service.
3737
If a user already exists that is linked to the service, it will instead switch to the existing user.
38-
- Service linking (e.g. Facebook, Twitter) will convert the anonymous user
38+
- Authentication service linking will convert the anonymous user
3939
into a standard user by linking it to the service.
4040
*/
4141
@interface PFAnonymousUtils : NSObject

0 commit comments

Comments
 (0)