Skip to content

Commit

Permalink
Point Parse to ParseCore
Browse files Browse the repository at this point in the history
  • Loading branch information
dplewis committed Jun 5, 2023
1 parent 2eea533 commit 1f02173
Show file tree
Hide file tree
Showing 16 changed files with 38 additions and 38 deletions.
26 changes: 13 additions & 13 deletions Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,14 @@
"version": "1.10.0"
}
},
{
"package": "Bolts",
"repositoryURL": "https://github.com/BoltsFramework/Bolts-Swift.gitSwift",
{
"package": "BoltsSwift",
"repositoryURL": "https://github.com/BoltsFramework/Bolts-Swift.git",
"state": {
"branch": null,
"revision": "1eee96ad3bcfc8964c0a5815ce94f491eb6ac8c2",
"revision": "d8c07eee2045a13f34330c0a4664053b5176e3f0",
"version": "1.5.0"
}
},
{
"package": "Starscream",
"repositoryURL": "https://github.com/daltoniam/Starscream.git",
"state": {
"branch": null,
"revision": "1eee96ad3bcfc8964c0a5815ce94f491eb6ac8c2",
"version": "4.0.4"
}
},
{
"package": "Facebook",
Expand All @@ -36,6 +27,15 @@
"revision": "7fd8a930a5b2c940a22efafe0e214ed0df671312",
"version": "15.1.0"
}
},
{
"package": "Starscream",
"repositoryURL": "https://github.com/daltoniam/Starscream.git",
"state": {
"branch": null,
"revision": "df8d82047f6654d8e4b655d1b1525c64e1059d21",
"version": "4.0.4"
}
}
]
},
Expand Down
22 changes: 11 additions & 11 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ let package = Package(
name: "ParseObjC",
defaultLocalization: "en",
platforms: [.iOS(.v12),
.macOS(.v10_10),
.macOS(.v10_15),
.tvOS(.v12),
.watchOS(.v2)],
products: [
.library(name: "ParseObjC", targets: ["Parse"]),
.library(name: "ParseObjC", targets: ["ParseCore"]),
.library(name: "ParseFacebookUtilsiOS", targets: ["ParseFacebookUtilsiOS"]),
.library(name: "ParseFacebookUtilsTvOS", targets: ["ParseFacebookUtilsTvOS"]),
.library(name: "ParseTwitterUtils", targets: ["ParseTwitterUtils"]),
Expand All @@ -25,7 +25,7 @@ let package = Package(
],
targets: [
.target(
name: "Parse",
name: "ParseCore",
dependencies: [.product(name: "Bolts", package: "Bolts-ObjC")],
path: "Parse/Parse",
exclude: ["Resources/Parse-tvOS.Info.plist", "Resources/Parse-iOS.Info.plist", "Resources/Parse-OSX.Info.plist", "Resources/Parse-watchOS.Info.plist"],
Expand All @@ -35,20 +35,20 @@ let package = Package(
.target(
name: "ParseFacebookUtils",
dependencies: [
"Parse",
"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: ["exclude", "Resources/Info-tvOS.plist", "Resources/Info-iOS.plist"],
exclude: ["Resources/Info-tvOS.plist", "Resources/Info-iOS.plist"],
resources: [.process("Resources")],
publicHeadersPath: "Source"),
.target(name: "ParseFacebookUtilsiOS",
dependencies: [
"ParseFacebookUtils"
],
path: "ParseFacebookUtilsiOS/ParseFacebookUtilsiOS",
exclude: ["exclude", "Resources/Info-iOS.plist"],
exclude: ["Resources/Info-iOS.plist"],
resources: [.process("Resources")],
publicHeadersPath: "Source",
cSettings: [.headerSearchPath("Internal/**")]),
Expand All @@ -58,13 +58,13 @@ let package = Package(
.product(name: "FacebookTV", package: "facebook-ios-sdk", condition: .when(platforms: [.tvOS]))
],
path: "ParseFacebookUtilsTvOS/ParseFacebookUtilsTvOS",
exclude: ["exclude", "Resources/Info-tvOS.plist"],
exclude: ["Resources/Info-tvOS.plist"],
resources: [.process("Resources")],
publicHeadersPath: "Source",
cSettings: [.headerSearchPath("Internal/**")]),
.target(name: "ParseTwitterUtils",
dependencies: [
"Parse"
"ParseCore"
],
path: "ParseTwitterUtils/ParseTwitterUtils",
exclude: ["Resources/Info-iOS.plist"],
Expand All @@ -81,11 +81,11 @@ let package = Package(
resources: [.process("Resources")],
publicHeadersPath: "Source",
cSettings: [.headerSearchPath("Internal/**")]),
.target(name: "ParseLiveQuery",
.target(name: "ParseLiveQuery",
dependencies: [
.product(name: "BoltsSwift", package: "Bolts-Swift"),
"Starscream",
"Parse"
"Starscream",
"ParseCore"
],
path: "ParseLiveQuery/ParseLiveQuery",
exclude: ["Resources/Info.plist"],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*/

@import Foundation;
@import Parse;
@import ParseCore;
@import ParseLiveQuery;

#import "Message.h"
Expand Down
2 changes: 1 addition & 1 deletion ParseLiveQuery/Examples/LiveQueryDemo-ObjC/Message.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* of patent rights can be found in the PATENTS file in the same directory.
*/

@import Parse;
@import ParseCore;

NS_ASSUME_NONNULL_BEGIN

Expand Down
2 changes: 1 addition & 1 deletion ParseLiveQuery/Examples/LiveQueryDemo-ObjC/main.m
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*/

@import Foundation;
@import Parse;
@import ParseCore;
@import ParseLiveQuery;

#import "ChatRoomManager.h"
Expand Down
2 changes: 1 addition & 1 deletion ParseLiveQuery/Examples/LiveQueryDemo/Message.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*/

import Foundation
import Parse
import ParseCore

class Message: PFObject, PFSubclassing {
@NSManaged var author: PFUser?
Expand Down
2 changes: 1 addition & 1 deletion ParseLiveQuery/Examples/LiveQueryDemo/Room.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*/

import Foundation
import Parse
import ParseCore

class Room: PFObject, PFSubclassing {
@NSManaged var name: String?
Expand Down
2 changes: 1 addition & 1 deletion ParseLiveQuery/Examples/LiveQueryDemo/main.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*/

import Foundation
import Parse
import ParseCore
import ParseLiveQuery

Message.registerSubclass()
Expand Down
2 changes: 1 addition & 1 deletion ParseLiveQuery/ParseLiveQuery/Client.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*/

import Foundation
import Parse
import ParseCore
import BoltsSwift
import Starscream

Expand Down
2 changes: 1 addition & 1 deletion ParseLiveQuery/ParseLiveQuery/Internal/ClientPrivate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*/

import Foundation
import Parse
import ParseCore
import Starscream
import BoltsSwift

Expand Down
2 changes: 1 addition & 1 deletion ParseLiveQuery/ParseLiveQuery/Internal/Operation.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*/

import Foundation
import Parse
import ParseCore

enum ClientOperation {
case connect(applicationId: String, sessionToken: String, clientKey: String?)
Expand Down
2 changes: 1 addition & 1 deletion ParseLiveQuery/ParseLiveQuery/Internal/QueryEncoder.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*/

import Foundation
import Parse
import ParseCore

/**
NOTE: This is super hacky, and we need a better answer for this.
Expand Down
2 changes: 1 addition & 1 deletion ParseLiveQuery/ParseLiveQuery/ObjCCompat.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*/

import Foundation
import Parse
import ParseCore
import BoltsSwift

/**
Expand Down
2 changes: 1 addition & 1 deletion ParseLiveQuery/ParseLiveQuery/PFQuery+Subscribe.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
*/

import Foundation
import Parse
import ParseCore


2 changes: 1 addition & 1 deletion ParseLiveQuery/ParseLiveQuery/Parse+LiveQuery.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* of patent rights can be found in the PATENTS file in the same directory.
*/

import Parse
import ParseCore

extension Parse {
static func validatedCurrentConfiguration() -> ParseClientConfiguration {
Expand Down
2 changes: 1 addition & 1 deletion ParseLiveQuery/ParseLiveQuery/Subscription.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*/

import Foundation
import Parse
import ParseCore
import BoltsSwift

/**
Expand Down

0 comments on commit 1f02173

Please sign in to comment.