Skip to content

Commit

Permalink
Merge branch 'master' into pffileobject-secure-coding
Browse files Browse the repository at this point in the history
  • Loading branch information
mtrezza authored Apr 8, 2024
2 parents 0d28a0f + ef9b00d commit ea4346d
Show file tree
Hide file tree
Showing 173 changed files with 251 additions and 11,628 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ jobs:
script:
- test:ios
- test:macos
- test:facebook_utils:ios
- test:twitter_utils:ios
- test:parseui:all
- test:parse_live_query:all
- build:starters
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ docs/

## AppCode
.idea/
ParseFacebookUtils/Vendor
ParseUI/Vendor

# VSC
Expand Down
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
# [3.0.0](https://github.com/parse-community/Parse-SDK-iOS-OSX/compare/2.7.3...3.0.0) (2024-04-08)


### Features

* 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))
* 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))


### BREAKING CHANGES

* 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))

## [2.7.3](https://github.com/parse-community/Parse-SDK-iOS-OSX/compare/2.7.2...2.7.3) (2023-10-06)


Expand Down
4 changes: 1 addition & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,8 @@
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).

1. Fork the repository and create a new branch.
2. Add unit tests for any new code you add.
2. Add unit tests for any new code you add:
- Core Module - [/Parse/Tests/Unit/](/Parse/Tests/Unit/)
- Facebook Utils - [/ParseFacebookUtils/Tests/Unit/](/ParseFacebookUtils/Tests/Unit/)
- Twitter Utils - [/ParseTwitterUtils/Tests/Unit/](/ParseTwitterUtils/Tests/Unit/)
3. If you've changed APIs, update the documentation and the [iOS Guide](https://github.com/parse-community/docs/tree/gh-pages/_includes/ios).
4. Ensure the test suite passes.
You can run the tests in the command line with rake.
Expand Down
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ gem 'jazzy', '~> 0.14.4'
# Development
gem 'xcpretty'
gem 'rake'
gem 'plist'
30 changes: 11 additions & 19 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,25 @@ GEM
specs:
CFPropertyList (3.0.6)
rexml
activesupport (7.1.0)
base64
bigdecimal
activesupport (6.1.7.7)
concurrent-ruby (~> 1.0, >= 1.0.2)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
minitest (>= 5.1)
mutex_m
tzinfo (~> 2.0)
zeitwerk (~> 2.3)
addressable (2.8.5)
public_suffix (>= 2.0.2, < 6.0)
algoliasearch (1.27.5)
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
atomos (0.1.3)
base64 (0.1.1)
bigdecimal (3.1.4)
claide (1.1.0)
cocoapods (1.13.0)
cocoapods (1.15.2)
addressable (~> 2.8)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.13.0)
cocoapods-core (= 1.15.2)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.6.0, < 2.0)
cocoapods-downloader (>= 2.1, < 3.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
cocoapods-search (>= 1.0.0, < 2.0)
cocoapods-trunk (>= 1.6.0, < 2.0)
Expand All @@ -40,7 +34,7 @@ GEM
nap (~> 1.0)
ruby-macho (>= 2.3.0, < 3.0)
xcodeproj (>= 1.23.0, < 2.0)
cocoapods-core (1.13.0)
cocoapods-core (1.15.2)
activesupport (>= 5.0, < 8)
addressable (~> 2.8)
algoliasearch (~> 1.0)
Expand All @@ -51,7 +45,7 @@ GEM
public_suffix (~> 4.0)
typhoeus (~> 1.0)
cocoapods-deintegrate (1.0.5)
cocoapods-downloader (1.6.3)
cocoapods-downloader (2.1)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.1)
Expand All @@ -61,9 +55,6 @@ GEM
cocoapods-try (1.2.0)
colored2 (3.1.2)
concurrent-ruby (1.2.2)
connection_pool (2.4.1)
drb (2.1.1)
ruby2_keywords
escape (0.0.4)
ethon (0.16.0)
ffi (>= 1.15.0)
Expand All @@ -90,18 +81,17 @@ GEM
minitest (5.20.0)
molinillo (0.8.0)
mustache (1.1.1)
mutex_m (0.1.2)
nanaimo (0.3.0)
nap (1.1.0)
netrc (0.11.0)
open4 (1.3.4)
plist (3.7.1)
public_suffix (4.0.7)
rake (13.0.6)
redcarpet (3.6.0)
rexml (3.2.6)
rouge (2.0.7)
ruby-macho (2.5.1)
ruby2_keywords (0.0.5)
sassc (2.4.0)
ffi (~> 1.9)
sqlite3 (1.6.6)
Expand All @@ -121,14 +111,16 @@ GEM
rexml (~> 3.2.4)
xcpretty (0.3.0)
rouge (~> 2.0.7)
zeitwerk (2.6.13)

PLATFORMS
ruby

DEPENDENCIES
jazzy (~> 0.14.4)
plist
rake
xcpretty

BUNDLED WITH
2.1.4
2.4.22
9 changes: 0 additions & 9 deletions Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,6 @@
"version": "1.5.0"
}
},
{
"package": "Facebook",
"repositoryURL": "https://github.com/facebook/facebook-ios-sdk",
"state": {
"branch": null,
"revision": "7fd8a930a5b2c940a22efafe0e214ed0df671312",
"version": "15.1.0"
}
},
{
"package": "OCMock",
"repositoryURL": "https://github.com/erikdoe/ocmock.git",
Expand Down
54 changes: 1 addition & 53 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,13 @@ let package = Package(
],
products: [
.library(name: "ParseObjC", targets: ["ParseCore"]),
.library(name: "ParseFacebookUtils", targets: ["ParseFacebookUtils"]),
.library(name: "ParseFacebookUtilsiOS", targets: ["ParseFacebookUtilsiOS"]),
.library(name: "ParseFacebookUtilsTvOS", targets: ["ParseFacebookUtilsTvOS"]),
.library(name: "ParseTwitterUtils", targets: ["ParseTwitterUtils"]),
.library(name: "ParseUI", targets: ["ParseUI"]),
.library(name: "ParseLiveQuery", targets: ["ParseLiveQuery"])
],
dependencies: [
.package(url: "https://github.com/parse-community/Bolts-ObjC.git", from: "1.10.0"),
.package(url: "https://github.com/BoltsFramework/Bolts-Swift.git", from: "1.5.0"),
.package(url: "https://github.com/daltoniam/Starscream.git", from: "4.0.6"),
.package(url: "https://github.com/facebook/facebook-ios-sdk.git", from: "15.1.0"),
.package(name: "OCMock", url: "https://github.com/erikdoe/ocmock.git", .revision("67bb9602f0a7541f24dc2d6d0d7389ca3e4c2c89"))
],
targets: [
Expand All @@ -37,57 +32,10 @@ let package = Package(
publicHeadersPath: "Source",
cSettings: [.headerSearchPath("Internal/**")]
),
.target(
name: "ParseFacebookUtils",
dependencies: [
"ParseCore",
.product(name: "Bolts", package: "Bolts-ObjC"),
.product(name: "FacebookCore", package: "facebook-ios-sdk", condition: .when(platforms: [.iOS, .tvOS])),
.product(name: "FacebookLogin", package: "facebook-ios-sdk", condition: .when(platforms: [.iOS, .tvOS]))],
path: "ParseFacebookUtils/ParseFacebookUtils",
exclude: ["Resources/Info-tvOS.plist", "Resources/Info-iOS.plist"],
resources: [.process("Resources")],
publicHeadersPath: "Source"
),
.target(
name: "ParseFacebookUtilsiOS",
dependencies: [
"ParseFacebookUtils"
],
path: "ParseFacebookUtilsiOS/ParseFacebookUtilsiOS",
exclude: ["Resources/Info-iOS.plist"],
resources: [.process("Resources")],
publicHeadersPath: "Source",
cSettings: [.headerSearchPath("Internal/**")]
),
.target(
name: "ParseFacebookUtilsTvOS",
dependencies: [
"ParseFacebookUtils",
.product(name: "FacebookTV", package: "facebook-ios-sdk", condition: .when(platforms: [.tvOS]))
],
path: "ParseFacebookUtilsTvOS/ParseFacebookUtilsTvOS",
exclude: ["Resources/Info-tvOS.plist"],
resources: [.process("Resources")],
publicHeadersPath: "Source",
cSettings: [.headerSearchPath("Internal/**")]
),
.target(
name: "ParseTwitterUtils",
dependencies: [
"ParseCore"
],
path: "ParseTwitterUtils/ParseTwitterUtils",
exclude: ["Resources/Info-iOS.plist"],
resources: [.process("Resources")],
publicHeadersPath: "Source",
cSettings: [.headerSearchPath("Internal/**")]
),
.target(
name: "ParseUI",
dependencies: [
"ParseFacebookUtilsiOS",
"ParseTwitterUtils"
"ParseCore"
],
path: "ParseUI/ParseUI",
exclude: ["Resources/Info-iOS.plist"],
Expand Down
12 changes: 0 additions & 12 deletions Parse.xcworkspace/contents.xcworkspacedata

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 0 additions & 9 deletions Parse.xcworkspace/xcshareddata/swiftpm/Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,6 @@
"version": "1.5.0"
}
},
{
"package": "Facebook",
"repositoryURL": "https://github.com/facebook/facebook-ios-sdk.git",
"state": {
"branch": null,
"revision": "7fd8a930a5b2c940a22efafe0e214ed0df671312",
"version": "15.1.0"
}
},
{
"package": "OCMock",
"repositoryURL": "https://github.com/erikdoe/ocmock.git",
Expand Down
2 changes: 0 additions & 2 deletions Parse/Parse/Internal/Object/PFObjectPrivate.h
Original file line number Diff line number Diff line change
Expand Up @@ -202,8 +202,6 @@
- (void)setHasBeenFetched:(BOOL)fetched;
- (void)_setDeleted:(BOOL)deleted;

- (BOOL)isDataAvailableForKey:(NSString *)key;

- (BOOL)_hasChanges;
- (BOOL)_hasOutstandingOperations;
- (PFOperationSet *)unsavedChanges;
Expand Down
4 changes: 2 additions & 2 deletions Parse/Parse/Resources/Parse-OSX.Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>2.7.3</string>
<string>3.0.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>2.7.3</string>
<string>3.0.0</string>
</dict>
</plist>
4 changes: 2 additions & 2 deletions Parse/Parse/Resources/Parse-iOS.Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>2.7.3</string>
<string>3.0.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleSupportedPlatforms</key>
<array>
<string>iPhoneOS</string>
</array>
<key>CFBundleVersion</key>
<string>2.7.3</string>
<string>3.0.0</string>
<key>MinimumOSVersion</key>
<string>12.0</string>
</dict>
Expand Down
6 changes: 3 additions & 3 deletions Parse/Parse/Resources/Parse-tvOS.Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>2.7.3</string>
<string>3.0.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>2.7.3</string>
<string>3.0.0</string>
<key>NSPrincipalClass</key>
<string></string>
<string/>
</dict>
</plist>
6 changes: 3 additions & 3 deletions Parse/Parse/Resources/Parse-watchOS.Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>2.7.3</string>
<string>3.0.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>2.7.3</string>
<string>3.0.0</string>
<key>NSPrincipalClass</key>
<string></string>
<string/>
</dict>
</plist>
4 changes: 2 additions & 2 deletions Parse/Parse/Source/PFAnonymousUtils.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ NS_ASSUME_NONNULL_BEGIN
Data associated with the anonymous user is retained.
- logIn switches users without converting the anonymous user.
Data associated with the anonymous user will be lost.
- Service logIn (e.g. Facebook, Twitter) will attempt to convert
- Authentication service logIn will attempt to convert
the anonymous user into a standard user by linking it to the service.
If a user already exists that is linked to the service, it will instead switch to the existing user.
- Service linking (e.g. Facebook, Twitter) will convert the anonymous user
- Authentication service linking will convert the anonymous user
into a standard user by linking it to the service.
*/
@interface PFAnonymousUtils : NSObject
Expand Down
Loading

0 comments on commit ea4346d

Please sign in to comment.