Skip to content

Commit 5dd73b8

Browse files
vazarkevychvazarkevych
committed
fix: fixed functionality with SPM
1 parent 78d0412 commit 5dd73b8

File tree

401 files changed

+8319
-4648
lines changed

Some content is hidden

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

401 files changed

+8319
-4648
lines changed

‎Cartfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
github "BoltsFramework/Bolts-ObjC" ~> 1.9.1
2-
github "facebook/facebook-ios-sdk" == 11.0.1
1+
github "vazarkevych/Bolts-ObjC" "spm"
2+
github "facebook/facebook-ios-sdk" == 15.1.0

‎Package.swift

Lines changed: 67 additions & 128 deletions
Original file line numberDiff line numberDiff line change
@@ -1,143 +1,82 @@
1-
// swift-tools-version: 5.7
2-
// The swift-tools-version declares the minimum version of Swift required to build this package.
1+
// swift-tools-version:5.5
32

43
import PackageDescription
54

65
let package = Package(
7-
name: "Parse-SDK-iOS-OSX",
6+
name: "ParseObjC",
87
defaultLocalization: "en",
9-
platforms: [
10-
.macOS(.v10_15),
11-
.iOS(.v12),
12-
.tvOS(.v12),
13-
.watchOS(.v5)
14-
],
8+
platforms: [.iOS(.v12),
9+
.macOS(.v10_10),
10+
.tvOS(.v12),
11+
.watchOS(.v2)],
1512
products: [
16-
.library(
17-
name: "Parse",
18-
type: .dynamic,
19-
targets: ["Parse-iOS"]
20-
)
13+
.library(name: "ParseObjC", targets: ["ParseCore"]),
14+
.library(name: "ParseFacebookUtilsiOS", targets: ["ParseFacebookUtilsiOS"]),
15+
.library(name: "ParseFacebookUtilsTvOS", targets: ["ParseFacebookUtilsTvOS"]),
16+
.library(name: "ParseTwitterUtils", targets: ["ParseTwitterUtils"]),
17+
.library(name: "ParseUI", targets: ["ParseUI"])
2118
],
2219
dependencies: [
23-
// Dependencies declare other packages that this package depends on.
24-
// .package(url: /* package url */, from: "1.0.0"),
25-
// .package(url: "https://github.com/BoltsFramework/Bolts-Swift", branch: "main")
26-
.package(url: "https://github.com/mman/Bolts-ObjC.git", branch: "spm"),
27-
.package(url: "https://github.com/erikdoe/ocmock.git", branch: "master")
20+
.package(url: "https://github.com/vazarkevych/Bolts-ObjC.git", branch: "spm"),
21+
.package(url: "https://github.com/facebook/facebook-ios-sdk", from: "15.1.0")
2822
],
2923
targets: [
30-
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
31-
// Targets can depend on other targets in this package, and on products in packages this package depends on.
32-
// .target(
33-
// name: "Bolt-iOS",
34-
// dependencies: [
35-
// // .product(name: "BoltsSwift", package: "Bolts-Swift")
36-
// ],
37-
// path: "Carthage/Checkouts/Bolts-ObjC/Bolts",
38-
// publicHeadersPath: ".",
39-
// cSettings: [
40-
// .headerSearchPath("Internal"),
41-
// ]
42-
// ),
4324
.target(
44-
name: "Parse-iOS",
25+
name: "ParseCore",
26+
dependencies: [.product(name: "Bolts", package: "Bolts-ObjC")],
27+
path: "Parse/Parse",
28+
exclude: ["Resources/Parse-tvOS.Info.plist", "Resources/Parse-iOS.Info.plist", "Resources/Parse-OSX.Info.plist", "Resources/Parse-watchOS.Info.plist"],
29+
resources: [.process("Resources")],
30+
publicHeadersPath: "Source",
31+
cSettings: [.headerSearchPath("Internal/**")]),
32+
.target(
33+
name: "ParseFacebookUtils",
4534
dependencies: [
35+
"ParseCore",
4636
.product(name: "Bolts", package: "Bolts-ObjC"),
47-
.product(name: "OCMock", package: "ocmock")
48-
],
49-
path: "Parse/Parse",
50-
publicHeadersPath: ".",
51-
cSettings: [
52-
.headerSearchPath("."),
53-
.headerSearchPath("Internal"),
54-
.headerSearchPath("Internal/Object"),
55-
.headerSearchPath("Internal/Object/Controller/OfflineController"),
56-
.headerSearchPath("Internal/Object/LocalIdStore"),
57-
.headerSearchPath("Internal/Object/EstimatedData"),
58-
.headerSearchPath("Internal/Object/BatchController"),
59-
.headerSearchPath("Internal/Object/PinningStore"),
60-
.headerSearchPath("Internal/Object/OperationSet"),
61-
.headerSearchPath("Internal/Object/State"),
62-
.headerSearchPath("Internal/Object/Constants"),
63-
.headerSearchPath("Internal/Object/Subclassing"),
64-
.headerSearchPath("Internal/Object/Utilities"),
65-
.headerSearchPath("Internal/Object/Coder/File"),
66-
.headerSearchPath("Internal/Object/Controller"),
67-
.headerSearchPath("Internal/Object/FilePersistence"),
68-
.headerSearchPath("Internal/Object/CurrentController"),
69-
.headerSearchPath("Internal/User"),
70-
.headerSearchPath("Internal/User/AuthenticationProviders/Providers/Anonymous"),
71-
.headerSearchPath("Internal/User/AuthenticationProviders/Controller"),
72-
.headerSearchPath("Internal/User/Constants"),
73-
.headerSearchPath("Internal/User/Controller"),
74-
.headerSearchPath("Internal/User/State"),
75-
.headerSearchPath("Internal/User/Coder/File"),
76-
.headerSearchPath("Internal/User/CurrentUserController"),
77-
.headerSearchPath("Internal/Product"),
78-
.headerSearchPath("Internal/Product/ProductsRequestHandler"),
79-
.headerSearchPath("Internal/LocalDataStore"),
80-
.headerSearchPath("Internal/LocalDataStore/SQLite"),
81-
.headerSearchPath("Internal/LocalDataStore/OfflineQueryLogic"),
82-
.headerSearchPath("Internal/LocalDataStore/OfflineStore"),
83-
.headerSearchPath("Internal/LocalDataStore/Pin"),
84-
.headerSearchPath("Internal/Commands"),
85-
.headerSearchPath("Internal/Commands/CommandRunner"),
86-
.headerSearchPath("Internal/Commands/CommandRunner/URLRequestConstructor"),
87-
.headerSearchPath("Internal/Commands/CommandRunner/URLSession"),
88-
.headerSearchPath("Internal/Commands/CommandRunner/URLSession/Session"),
89-
.headerSearchPath("Internal/Commands/CommandRunner/URLSession/Session/TaskDelegate"),
90-
.headerSearchPath("Internal/Relation"),
91-
.headerSearchPath("Internal/Relation/State"),
92-
.headerSearchPath("Internal/Analytics"),
93-
.headerSearchPath("Internal/Analytics/Utilities"),
94-
.headerSearchPath("Internal/Analytics/Controller"),
95-
.headerSearchPath("Internal/FieldOperation"),
96-
.headerSearchPath("Internal/Installation/Constants"),
97-
.headerSearchPath("Internal/Installation/InstallationIdentifierStore"),
98-
.headerSearchPath("Internal/Installation/CurrentInstallationController"),
99-
.headerSearchPath("Internal/Query"),
100-
.headerSearchPath("Internal/Query/Controller"),
101-
.headerSearchPath("Internal/Query/State"),
102-
.headerSearchPath("Internal/Query/Utilities"),
103-
.headerSearchPath("Internal/KeyValueCache"),
104-
.headerSearchPath("Internal/MultiProcessLock"),
105-
.headerSearchPath("Internal/ACL"),
106-
.headerSearchPath("Internal/ACL/State"),
107-
.headerSearchPath("Internal/ACL/DefaultACLController"),
108-
.headerSearchPath("Internal/Purchase/PaymentTransactionObserver"),
109-
.headerSearchPath("Internal/Purchase/Controller"),
110-
.headerSearchPath("Internal/Session/Controller"),
111-
.headerSearchPath("Internal/Session/Utilities"),
112-
.headerSearchPath("Internal/File"),
113-
.headerSearchPath("Internal/File/State"),
114-
.headerSearchPath("Internal/File/Controller"),
115-
.headerSearchPath("Internal/File/FileDataStream"),
116-
.headerSearchPath("Internal/Persistence"),
117-
.headerSearchPath("Internal/Persistence/Group"),
118-
.headerSearchPath("Internal/Installation"),
119-
.headerSearchPath("Internal/Installation/Controller"),
120-
.headerSearchPath("Internal/PropertyInfo"),
121-
.headerSearchPath("Internal/CloudCode"),
122-
.headerSearchPath("Internal/Config"),
123-
.headerSearchPath("Internal/Config/Controller"),
124-
.headerSearchPath("Internal/Push"),
125-
.headerSearchPath("Internal/Push/State"),
126-
.headerSearchPath("Internal/Push/Utilites"),
127-
.headerSearchPath("Internal/Push/Manager"),
128-
.headerSearchPath("Internal/Push/Controller"),
129-
.headerSearchPath("Internal/Push/ChannelsController"),
130-
.headerSearchPath("Internal/ThreadSafety"),
131-
.headerSearchPath("Internal/HTTPRequest/RequestConstructor"),
132-
.headerSearchPath("Internal/HTTPRequest")
133-
]
134-
)
135-
136-
// .executableTarget(
137-
// name: "Parse-SDK-iOS-OSX",
138-
// dependencies: []),
139-
// .testTarget(
140-
// name: "Parse-SDK-iOS-OSXTests",
141-
// dependencies: ["Parse-SDK-iOS-OSX"]),
37+
.product(name: "FacebookCore", package: "facebook-ios-sdk", condition: .when(platforms: [.iOS, .tvOS])),
38+
.product(name: "FacebookLogin", package: "facebook-ios-sdk", condition: .when(platforms: [.iOS, .tvOS]))],
39+
path: "ParseFacebookUtils/ParseFacebookUtils",
40+
exclude: ["exclude", "Resources/Info-tvOS.plist", "Resources/Info-iOS.plist"],
41+
resources: [.process("Resources")],
42+
publicHeadersPath: "Source"),
43+
.target(name: "ParseFacebookUtilsiOS",
44+
dependencies: [
45+
"ParseFacebookUtils"
46+
],
47+
path: "ParseFacebookUtilsiOS/ParseFacebookUtilsiOS",
48+
exclude: ["exclude", "Resources/Info-iOS.plist"],
49+
resources: [.process("Resources")],
50+
publicHeadersPath: "Source",
51+
cSettings: [.headerSearchPath("Internal/**")]),
52+
.target(name: "ParseFacebookUtilsTvOS",
53+
dependencies: [
54+
"ParseFacebookUtils",
55+
.product(name: "FacebookTV", package: "facebook-ios-sdk", condition: .when(platforms: [.tvOS]))
56+
],
57+
path: "ParseFacebookUtilsTvOS/ParseFacebookUtilsTvOS",
58+
exclude: ["exclude", "Resources/Info-tvOS.plist"],
59+
resources: [.process("Resources")],
60+
publicHeadersPath: "Source",
61+
cSettings: [.headerSearchPath("Internal/**")]),
62+
.target(name: "ParseTwitterUtils",
63+
dependencies: [
64+
"ParseCore"
65+
],
66+
path: "ParseTwitterUtils/ParseTwitterUtils",
67+
exclude: ["Resources/Info-iOS.plist"],
68+
resources: [.process("Resources")],
69+
publicHeadersPath: "Source",
70+
cSettings: [.headerSearchPath("Internal/**")]),
71+
.target(name: "ParseUI",
72+
dependencies: [
73+
"ParseFacebookUtilsiOS",
74+
"ParseTwitterUtils"
75+
],
76+
path: "ParseUI/ParseUI",
77+
exclude: ["Resources/Info-iOS.plist"],
78+
resources: [.process("Resources")],
79+
publicHeadersPath: "Source",
80+
cSettings: [.headerSearchPath("Internal/**")]),
14281
]
14382
)

0 commit comments

Comments
 (0)