Skip to content

Commit 6c8bb2e

Browse files
MaxDesiatovMaxDesiatov
authored
Update iOS/tvOS deployment targets according to the SDKs (#7014)
Cherry picked from commit c4986ac33665f070b7611f63f56b7bc8ebb8ae54 with additional changes applied to `Tests/BuildTests/BuildPlanTests.swift` to fix the tests. Resolves rdar://108288672. Resolves rdar://116213222.
1 parent aad39fb commit 6c8bb2e

File tree

4 files changed

+26
-16
lines changed

4 files changed

+26
-16
lines changed

‎Sources/PackageModel/Platform.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ public struct Platform: Equatable, Hashable, Codable {
3939

4040
public static let macOS: Platform = Platform(name: "macos", oldestSupportedVersion: "10.13")
4141
public static let macCatalyst: Platform = Platform(name: "maccatalyst", oldestSupportedVersion: "13.0")
42-
public static let iOS: Platform = Platform(name: "ios", oldestSupportedVersion: "11.0")
43-
public static let tvOS: Platform = Platform(name: "tvos", oldestSupportedVersion: "11.0")
42+
public static let iOS: Platform = Platform(name: "ios", oldestSupportedVersion: "12.0")
43+
public static let tvOS: Platform = Platform(name: "tvos", oldestSupportedVersion: "12.0")
4444
public static let watchOS: Platform = Platform(name: "watchos", oldestSupportedVersion: "4.0")
4545
public static let visionOS: Platform = Platform(name: "visionos", oldestSupportedVersion: "1.0")
4646
public static let driverKit: Platform = Platform(name: "driverkit", oldestSupportedVersion: "19.0")

‎Tests/BuildTests/BuildPlanTests.swift

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3319,10 +3319,20 @@ final class BuildPlanTests: XCTestCase {
33193319
let targetTriple = try Triple("arm64-apple-ios")
33203320

33213321
let aTarget = try result.target(for: "ATarget").swiftTarget().compileArguments()
3322-
XCTAssertMatch(aTarget, [.equal("-target"), .equal(targetTriple.tripleString(forPlatformVersion: "11.0")), .anySequence])
3322+
let expectedVersion = Platform.iOS.oldestSupportedVersion.versionString
3323+
3324+
XCTAssertMatch(aTarget, [
3325+
.equal("-target"),
3326+
.equal(targetTriple.tripleString(forPlatformVersion: expectedVersion)),
3327+
.anySequence
3328+
])
33233329

33243330
let bTarget = try result.target(for: "BTarget").swiftTarget().compileArguments()
3325-
XCTAssertMatch(bTarget, [.equal("-target"), .equal(targetTriple.tripleString(forPlatformVersion: "11.0")), .anySequence])
3331+
XCTAssertMatch(bTarget, [
3332+
.equal("-target"),
3333+
.equal(targetTriple.tripleString(forPlatformVersion: expectedVersion)),
3334+
.anySequence
3335+
])
33263336
}
33273337

33283338
func testPlatformsValidation() throws {

‎Tests/PackageGraphTests/PackageGraphTests.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2220,8 +2220,8 @@ class PackageGraphTests: XCTestCase {
22202220
"linux": "0.0",
22212221
"macos": "10.13",
22222222
"maccatalyst": "13.0",
2223-
"ios": "11.0",
2224-
"tvos": "11.0",
2223+
"ios": "12.0",
2224+
"tvos": "12.0",
22252225
"driverkit": "19.0",
22262226
"watchos": "4.0",
22272227
"visionos": "1.0",
@@ -2233,8 +2233,8 @@ class PackageGraphTests: XCTestCase {
22332233

22342234
let customXCTestMinimumDeploymentTargets = [
22352235
PackageModel.Platform.macOS: PlatformVersion("10.15"),
2236-
PackageModel.Platform.iOS: PlatformVersion("11.0"),
2237-
PackageModel.Platform.tvOS: PlatformVersion("10.0"),
2236+
PackageModel.Platform.iOS: PlatformVersion("12.0"),
2237+
PackageModel.Platform.tvOS: PlatformVersion("12.0"),
22382238
PackageModel.Platform.watchOS: PlatformVersion("4.0"),
22392239
PackageModel.Platform.visionOS: PlatformVersion("1.0"),
22402240
]
@@ -2471,8 +2471,8 @@ class PackageGraphTests: XCTestCase {
24712471
"linux": "0.0",
24722472
"macos": "10.13",
24732473
"maccatalyst": "13.0",
2474-
"ios": "11.0",
2475-
"tvos": "11.0",
2474+
"ios": "12.0",
2475+
"tvos": "12.0",
24762476
"driverkit": "19.0",
24772477
"watchos": "4.0",
24782478
"visionos": "1.0",

‎Tests/XCBuildSupportTests/PIFBuilderTests.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ class PIFBuilderTests: XCTestCase {
189189
XCTAssertEqual(settings[.ENTITLEMENTS_REQUIRED], "NO")
190190
XCTAssertEqual(settings[.GCC_OPTIMIZATION_LEVEL], "0")
191191
XCTAssertEqual(settings[.GCC_PREPROCESSOR_DEFINITIONS], ["$(inherited)", "SWIFT_PACKAGE", "DEBUG=1"])
192-
XCTAssertEqual(settings[.IPHONEOS_DEPLOYMENT_TARGET], "11.0")
192+
XCTAssertEqual(settings[.IPHONEOS_DEPLOYMENT_TARGET], "12.0")
193193
XCTAssertEqual(settings[.IPHONEOS_DEPLOYMENT_TARGET, for: .macCatalyst], "13.0")
194194
XCTAssertEqual(settings[.KEEP_PRIVATE_EXTERNS], "NO")
195195
XCTAssertEqual(settings[.MACOSX_DEPLOYMENT_TARGET], "10.13")
@@ -204,7 +204,7 @@ class PIFBuilderTests: XCTestCase {
204204
XCTAssertEqual(settings[.SWIFT_INSTALL_OBJC_HEADER], "NO")
205205
XCTAssertEqual(settings[.SWIFT_OBJC_INTERFACE_HEADER_NAME], "")
206206
XCTAssertEqual(settings[.SWIFT_OPTIMIZATION_LEVEL], "-Onone")
207-
XCTAssertEqual(settings[.TVOS_DEPLOYMENT_TARGET], "11.0")
207+
XCTAssertEqual(settings[.TVOS_DEPLOYMENT_TARGET], "12.0")
208208
XCTAssertEqual(settings[.USE_HEADERMAP], "NO")
209209
XCTAssertEqual(settings[.WATCHOS_DEPLOYMENT_TARGET], "4.0")
210210
XCTAssertEqual(settings[.XROS_DEPLOYMENT_TARGET], "1.0")
@@ -236,7 +236,7 @@ class PIFBuilderTests: XCTestCase {
236236
XCTAssertEqual(settings[.ENTITLEMENTS_REQUIRED], "NO")
237237
XCTAssertEqual(settings[.GCC_OPTIMIZATION_LEVEL], "s")
238238
XCTAssertEqual(settings[.GCC_PREPROCESSOR_DEFINITIONS], ["$(inherited)", "SWIFT_PACKAGE"])
239-
XCTAssertEqual(settings[.IPHONEOS_DEPLOYMENT_TARGET], "11.0")
239+
XCTAssertEqual(settings[.IPHONEOS_DEPLOYMENT_TARGET], "12.0")
240240
XCTAssertEqual(settings[.IPHONEOS_DEPLOYMENT_TARGET, for: .macCatalyst], "13.0")
241241
XCTAssertEqual(settings[.KEEP_PRIVATE_EXTERNS], "NO")
242242
XCTAssertEqual(settings[.MACOSX_DEPLOYMENT_TARGET], "10.13")
@@ -250,7 +250,7 @@ class PIFBuilderTests: XCTestCase {
250250
XCTAssertEqual(settings[.SWIFT_INSTALL_OBJC_HEADER], "NO")
251251
XCTAssertEqual(settings[.SWIFT_OBJC_INTERFACE_HEADER_NAME], "")
252252
XCTAssertEqual(settings[.SWIFT_OPTIMIZATION_LEVEL], "-Owholemodule")
253-
XCTAssertEqual(settings[.TVOS_DEPLOYMENT_TARGET], "11.0")
253+
XCTAssertEqual(settings[.TVOS_DEPLOYMENT_TARGET], "12.0")
254254
XCTAssertEqual(settings[.USE_HEADERMAP], "NO")
255255
XCTAssertEqual(settings[.WATCHOS_DEPLOYMENT_TARGET], "4.0")
256256
XCTAssertEqual(settings[.XROS_DEPLOYMENT_TARGET], "1.0")
@@ -308,7 +308,7 @@ class PIFBuilderTests: XCTestCase {
308308
XCTAssertEqual(settings[.SWIFT_INSTALL_OBJC_HEADER], "NO")
309309
XCTAssertEqual(settings[.SWIFT_OBJC_INTERFACE_HEADER_NAME], "")
310310
XCTAssertEqual(settings[.SWIFT_OPTIMIZATION_LEVEL], "-Onone")
311-
XCTAssertEqual(settings[.TVOS_DEPLOYMENT_TARGET], "11.0")
311+
XCTAssertEqual(settings[.TVOS_DEPLOYMENT_TARGET], "12.0")
312312
XCTAssertEqual(settings[.USE_HEADERMAP], "NO")
313313
XCTAssertEqual(settings[.WATCHOS_DEPLOYMENT_TARGET], "6.0")
314314
XCTAssertEqual(settings[.XROS_DEPLOYMENT_TARGET], "1.0")
@@ -354,7 +354,7 @@ class PIFBuilderTests: XCTestCase {
354354
XCTAssertEqual(settings[.SWIFT_INSTALL_OBJC_HEADER], "NO")
355355
XCTAssertEqual(settings[.SWIFT_OBJC_INTERFACE_HEADER_NAME], "")
356356
XCTAssertEqual(settings[.SWIFT_OPTIMIZATION_LEVEL], "-Owholemodule")
357-
XCTAssertEqual(settings[.TVOS_DEPLOYMENT_TARGET], "11.0")
357+
XCTAssertEqual(settings[.TVOS_DEPLOYMENT_TARGET], "12.0")
358358
XCTAssertEqual(settings[.USE_HEADERMAP], "NO")
359359
XCTAssertEqual(settings[.WATCHOS_DEPLOYMENT_TARGET], "6.0")
360360
XCTAssertEqual(settings[.XROS_DEPLOYMENT_TARGET], "1.0")

0 commit comments

Comments
 (0)