Skip to content

Commit 738eccd

Browse files
committed
Bring Xcode, SPM, and Cocoapods minimum deployments to the same level:
[.iOS(.v12), .macOS(.v10_13), .tvOS(.v12), .watchOS(.v5)]
1 parent f34f34f commit 738eccd

File tree

6 files changed

+25
-11
lines changed

6 files changed

+25
-11
lines changed

Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import PackageDescription
44

55
let package = Package(
66
name: "ParseSwift",
7-
platforms: [.iOS(.v11), .macOS(.v10_13), .tvOS(.v11), .watchOS(.v4)],
7+
platforms: [.iOS(.v12), .macOS(.v10_13), .tvOS(.v12), .watchOS(.v5)],
88
products: [
99
.library(
1010
name: "ParseSwift",

ParseSwift.podspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ Pod::Spec.new do |s|
1010
:git => "#{s.homepage}.git",
1111
:tag => "#{s.version}",
1212
}
13-
s.ios.deployment_target = "11.0"
13+
s.ios.deployment_target = "12.0"
1414
s.osx.deployment_target = "10.13"
15-
s.tvos.deployment_target = "11.0"
16-
s.watchos.deployment_target = "4.0"
15+
s.tvos.deployment_target = "12.0"
16+
s.watchos.deployment_target = "5.0"
1717
s.swift_versions = ['5.1', '5.2', '5.3']
1818
s.source_files = "Sources/ParseSwift/**/*.swift"
1919
s.license = {

ParseSwift.xcodeproj/project.pbxproj

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2232,6 +2232,8 @@
22322232
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
22332233
SWIFT_VERSION = 5.0;
22342234
TARGETED_DEVICE_FAMILY = "1,2";
2235+
TVOS_DEPLOYMENT_TARGET = 12.0;
2236+
WATCHOS_DEPLOYMENT_TARGET = 5.0;
22352237
};
22362238
name = Debug;
22372239
};
@@ -2254,6 +2256,8 @@
22542256
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
22552257
SWIFT_VERSION = 5.0;
22562258
TARGETED_DEVICE_FAMILY = "1,2";
2259+
TVOS_DEPLOYMENT_TARGET = 12.0;
2260+
WATCHOS_DEPLOYMENT_TARGET = 5.0;
22572261
};
22582262
name = Release;
22592263
};
@@ -2318,6 +2322,8 @@
23182322
SKIP_INSTALL = YES;
23192323
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
23202324
SWIFT_VERSION = 5.0;
2325+
TVOS_DEPLOYMENT_TARGET = 12.0;
2326+
WATCHOS_DEPLOYMENT_TARGET = 5.0;
23212327
};
23222328
name = Debug;
23232329
};
@@ -2342,6 +2348,8 @@
23422348
SKIP_INSTALL = YES;
23432349
SWIFT_SWIFT3_OBJC_INFERENCE = Off;
23442350
SWIFT_VERSION = 5.0;
2351+
TVOS_DEPLOYMENT_TARGET = 12.0;
2352+
WATCHOS_DEPLOYMENT_TARGET = 5.0;
23452353
};
23462354
name = Release;
23472355
};
@@ -2490,7 +2498,8 @@
24902498
SKIP_INSTALL = YES;
24912499
SWIFT_VERSION = 5.0;
24922500
TARGETED_DEVICE_FAMILY = 4;
2493-
WATCHOS_DEPLOYMENT_TARGET = 4.0;
2501+
TVOS_DEPLOYMENT_TARGET = 12.0;
2502+
WATCHOS_DEPLOYMENT_TARGET = 5.0;
24942503
};
24952504
name = Debug;
24962505
};
@@ -2517,7 +2526,8 @@
25172526
SKIP_INSTALL = YES;
25182527
SWIFT_VERSION = 5.0;
25192528
TARGETED_DEVICE_FAMILY = 4;
2520-
WATCHOS_DEPLOYMENT_TARGET = 4.0;
2529+
TVOS_DEPLOYMENT_TARGET = 12.0;
2530+
WATCHOS_DEPLOYMENT_TARGET = 5.0;
25212531
};
25222532
name = Release;
25232533
};
@@ -2545,6 +2555,7 @@
25452555
SWIFT_VERSION = 5.0;
25462556
TARGETED_DEVICE_FAMILY = 3;
25472557
TVOS_DEPLOYMENT_TARGET = 12.0;
2558+
WATCHOS_DEPLOYMENT_TARGET = 5.0;
25482559
};
25492560
name = Debug;
25502561
};
@@ -2571,6 +2582,7 @@
25712582
SWIFT_VERSION = 5.0;
25722583
TARGETED_DEVICE_FAMILY = 3;
25732584
TVOS_DEPLOYMENT_TARGET = 12.0;
2585+
WATCHOS_DEPLOYMENT_TARGET = 5.0;
25742586
};
25752587
name = Release;
25762588
};

Sources/ParseSwift/Authentication/3rd Party/ParseApple.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ public extension ParseApple {
186186
identityToken: String,
187187
options: API.Options = []) -> Future<AuthenticatedUser, ParseError> {
188188
linkPublisher(authData: AuthenticationKeys.id.makeDictionary(user: user, identityToken: identityToken),
189-
options: options)
189+
options: options)
190190
}
191191

192192
@available(macOS 10.15, iOS 13.0, macCatalyst 13.0, watchOS 6.0, tvOS 13.0, *)
@@ -201,8 +201,8 @@ public extension ParseApple {
201201
}
202202
}
203203
return AuthenticatedUser.linkPublisher(Self.__type,
204-
authData: authData,
205-
options: options)
204+
authData: authData,
205+
options: options)
206206
}
207207

208208
#endif

Sources/ParseSwift/Objects/ParseUser+combine.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,8 @@ public extension ParseUser {
114114
- parameter options: A set of header options sent to the server. Defaults to an empty set.
115115
- returns: A publisher that eventually produces a single value and then finishes or fails.
116116
*/
117-
static func passwordResetPublisher(email: String, options: API.Options = []) -> Future<Void, ParseError> {
117+
static func passwordResetPublisher(email: String,
118+
options: API.Options = []) -> Future<Void, ParseError> {
118119
Future { promise in
119120
Self.passwordReset(email: email, options: options, completion: promise)
120121
}

Tests/ParseSwiftTests/ParseAuthenticationTests.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ class ParseAuthenticationTests: XCTestCase {
6161
}
6262

6363
@available(macOS 10.15, iOS 13.0, macCatalyst 13.0, watchOS 6.0, tvOS 13.0, *)
64-
func linkPublisher(authData: [String: String]?, options: API.Options) -> Future<AuthenticatedUser, ParseError> {
64+
func linkPublisher(authData: [String: String]?,
65+
options: API.Options) -> Future<AuthenticatedUser, ParseError> {
6566
let error = ParseError(code: .unknownError, message: "Not implemented")
6667
return Future { promise in
6768
promise(.failure(error))

0 commit comments

Comments
 (0)