Skip to content

Commit 96c2c2e

Browse files
shahmishalshahmishal
committed
Update 4.2 to build with Xcode 10 beta 5, macOS 10.14, iOS 12, tvOS 12, and watchOS 5 SDKs.
1 parent 68020bd commit 96c2c2e

22 files changed

+467
-132
lines changed

‎lib/Migrator/overlay3.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1318,7 +1318,7 @@
13181318
},
13191319
{
13201320
"DiffItemKind": "SpecialCaseDiffItem",
1321-
"Usr": "c:@F@UIApplicationMain",
1321+
"Usr": "s:5UIKit17UIApplicationMainys5Int32VAD_SpySpys4Int8VGGSgSSSgAJtF",
13221322
"SpecialCaseId": "UIApplicationMain"
13231323
}
13241324
]

‎lib/Migrator/overlay4.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1318,7 +1318,7 @@
13181318
},
13191319
{
13201320
"DiffItemKind": "SpecialCaseDiffItem",
1321-
"Usr": "c:@F@UIApplicationMain",
1321+
"Usr": "s:5UIKit17UIApplicationMainys5Int32VAD_SpySpys4Int8VGGSgSSSgAJtF",
13221322
"SpecialCaseId": "UIApplicationMain"
13231323
}
13241324
]

‎stdlib/public/SDK/Intents/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ add_swift_library(swiftIntents ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_O
88
INGetCarLockStatusIntentResponse.swift
99
INGetCarPowerLevelStatusIntentResponse.swift
1010
INIntegerResolutionResult.swift
11+
INIntent.swift
1112
INNotebookItemTypeResolutionResult.swift
1213
INParameter.swift
1314
INPlayMediaIntent.swift

‎stdlib/public/SDK/Intents/INGetCarPowerLevelStatusIntentResponse.swift

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,27 @@ extension INGetCarPowerLevelStatusIntentResponse {
3535
__chargePercentRemaining = newPercent.map { NSNumber(value: $0) }
3636
}
3737
}
38+
39+
@nonobjc
40+
@available(iOS 12.0, watchOS 5.0, *)
41+
public final var charging: Bool? {
42+
get {
43+
return __charging?.boolValue
44+
}
45+
set(newCharging) {
46+
__charging = newCharging.map { NSNumber(value: $0) }
47+
}
48+
}
49+
50+
@nonobjc
51+
@available(iOS 12.0, watchOS 5.0, *)
52+
public final var minutesToFull: Int? {
53+
get {
54+
return __minutesToFull?.intValue
55+
}
56+
set(newMinutesToFull) {
57+
__minutesToFull = newMinutesToFull.map { NSNumber(value: $0) }
58+
}
59+
}
3860
}
3961
#endif

‎stdlib/public/SDK/Intents/INIntent.swift

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
//===----------------------------------------------------------------------===//
2+
//
3+
// This source file is part of the Swift.org open source project
4+
//
5+
// Copyright (c) 2014 - 2018 Apple Inc. and the Swift project authors
6+
// Licensed under Apache License v2.0 with Runtime Library Exception
7+
//
8+
// See https://swift.org/LICENSE.txt for license information
9+
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
10+
//
11+
//===----------------------------------------------------------------------===//
12+
13+
@_exported import Intents
14+
import Foundation
15+
16+
#if os(iOS) || os(watchOS) || os(macOS)
17+
18+
public protocol _INIntentSetImageKeyPath { }
19+
20+
public extension _INIntentSetImageKeyPath {
21+
22+
@available(iOS 12.0, watchOS 5.0, macOS 10.14, *)
23+
public func setImage<Value>(_ image: INImage?, forParameterNamed parameterName: KeyPath<Self, Value>) {
24+
if let keyPathString = parameterName._kvcKeyPathString {
25+
(self as! INIntent).__setImage(image, forParameterNamed: keyPathString)
26+
}
27+
}
28+
29+
@available(iOS 12.0, watchOS 5.0, macOS 10.14, *)
30+
public func image<Value>(forParameterNamed parameterName: KeyPath<Self, Value>) -> INImage? {
31+
if let keyPathString = parameterName._kvcKeyPathString {
32+
return (self as! INIntent).__image(forParameterNamed: keyPathString)
33+
} else {
34+
return nil
35+
}
36+
}
37+
}
38+
39+
@available(iOS 10.0, watchOS 3.2, macOS 10.12, *)
40+
extension INIntent : _INIntentSetImageKeyPath { }
41+
42+
#endif

‎stdlib/public/SDK/Intents/INSetClimateSettingsInCarIntent.swift

Lines changed: 86 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -16,60 +16,91 @@ import Foundation
1616
#if os(iOS)
1717
@available(iOS 10.0, *)
1818
extension INSetClimateSettingsInCarIntent {
19-
@nonobjc
20-
public convenience init(
21-
enableFan: Bool? = nil,
22-
enableAirConditioner: Bool? = nil,
23-
enableClimateControl: Bool? = nil,
24-
enableAutoMode: Bool? = nil,
25-
airCirculationMode: INCarAirCirculationMode = .unknown,
26-
fanSpeedIndex: Int? = nil,
27-
fanSpeedPercentage: Double? = nil,
28-
relativeFanSpeedSetting: INRelativeSetting = .unknown,
29-
temperature: Measurement<UnitTemperature>? = nil,
30-
relativeTemperatureSetting: INRelativeSetting = .unknown,
31-
climateZone: INCarSeat = .unknown) {
32-
self.init(__enableFan: enableFan.map { NSNumber(value: $0) },
33-
enableAirConditioner: enableAirConditioner.map { NSNumber(value: $0) },
34-
enableClimateControl: enableClimateControl.map { NSNumber(value: $0) },
35-
enableAutoMode: enableAutoMode.map { NSNumber(value: $0) },
36-
airCirculationMode: airCirculationMode,
37-
fanSpeedIndex: fanSpeedIndex.map { NSNumber(value: $0) },
38-
fanSpeedPercentage: fanSpeedPercentage.map { NSNumber(value: $0) },
39-
relativeFanSpeedSetting: relativeFanSpeedSetting,
40-
temperature: temperature,
41-
relativeTemperatureSetting: relativeTemperatureSetting,
42-
climateZone: climateZone)
43-
}
44-
45-
@nonobjc
46-
public final var enableFan: Bool? {
47-
return __enableFan?.boolValue
48-
}
49-
50-
@nonobjc
51-
public final var enableAirConditioner: Bool? {
52-
return __enableAirConditioner?.boolValue
53-
}
54-
55-
@nonobjc
56-
public final var enableClimateControl: Bool? {
57-
return __enableClimateControl?.boolValue
58-
}
59-
60-
@nonobjc
61-
public final var enableAutoMode: Bool? {
62-
return __enableAutoMode?.boolValue
63-
}
64-
65-
@nonobjc
66-
public final var fanSpeedIndex: Int? {
67-
return __fanSpeedIndex?.intValue
68-
}
69-
70-
@nonobjc
71-
public final var fanSpeedPercentage: Double? {
72-
return __fanSpeedPercentage?.doubleValue
73-
}
19+
20+
@nonobjc
21+
@available(iOS 12.0, *)
22+
public convenience init(
23+
enableFan: Bool? = nil,
24+
enableAirConditioner: Bool? = nil,
25+
enableClimateControl: Bool? = nil,
26+
enableAutoMode: Bool? = nil,
27+
airCirculationMode: INCarAirCirculationMode = .unknown,
28+
fanSpeedIndex: Int? = nil,
29+
fanSpeedPercentage: Double? = nil,
30+
relativeFanSpeedSetting: INRelativeSetting = .unknown,
31+
temperature: Measurement<UnitTemperature>? = nil,
32+
relativeTemperatureSetting: INRelativeSetting = .unknown,
33+
climateZone: INCarSeat = .unknown,
34+
carName: INSpeakableString? = nil) {
35+
self.init(__enableFan: enableFan.map { NSNumber(value: $0) },
36+
enableAirConditioner: enableAirConditioner.map { NSNumber(value: $0) },
37+
enableClimateControl: enableClimateControl.map { NSNumber(value: $0) },
38+
enableAutoMode: enableAutoMode.map { NSNumber(value: $0) },
39+
airCirculationMode: airCirculationMode,
40+
fanSpeedIndex: fanSpeedIndex.map { NSNumber(value: $0) },
41+
fanSpeedPercentage: fanSpeedPercentage.map { NSNumber(value: $0) },
42+
relativeFanSpeedSetting: relativeFanSpeedSetting,
43+
temperature: temperature,
44+
relativeTemperatureSetting: relativeTemperatureSetting,
45+
climateZone: climateZone,
46+
carName: carName)
47+
}
48+
49+
@nonobjc
50+
@available(iOS, obsoleted: 12.0)
51+
public convenience init(
52+
enableFan: Bool? = nil,
53+
enableAirConditioner: Bool? = nil,
54+
enableClimateControl: Bool? = nil,
55+
enableAutoMode: Bool? = nil,
56+
airCirculationMode: INCarAirCirculationMode = .unknown,
57+
fanSpeedIndex: Int? = nil,
58+
fanSpeedPercentage: Double? = nil,
59+
relativeFanSpeedSetting: INRelativeSetting = .unknown,
60+
temperature: Measurement<UnitTemperature>? = nil,
61+
relativeTemperatureSetting: INRelativeSetting = .unknown,
62+
climateZone: INCarSeat = .unknown) {
63+
self.init(__enableFan: enableFan.map { NSNumber(value: $0) },
64+
enableAirConditioner: enableAirConditioner.map { NSNumber(value: $0) },
65+
enableClimateControl: enableClimateControl.map { NSNumber(value: $0) },
66+
enableAutoMode: enableAutoMode.map { NSNumber(value: $0) },
67+
airCirculationMode: airCirculationMode,
68+
fanSpeedIndex: fanSpeedIndex.map { NSNumber(value: $0) },
69+
fanSpeedPercentage: fanSpeedPercentage.map { NSNumber(value: $0) },
70+
relativeFanSpeedSetting: relativeFanSpeedSetting,
71+
temperature: temperature,
72+
relativeTemperatureSetting: relativeTemperatureSetting,
73+
climateZone: climateZone)
74+
}
75+
76+
@nonobjc
77+
public final var enableFan: Bool? {
78+
return __enableFan?.boolValue
79+
}
80+
81+
@nonobjc
82+
public final var enableAirConditioner: Bool? {
83+
return __enableAirConditioner?.boolValue
84+
}
85+
86+
@nonobjc
87+
public final var enableClimateControl: Bool? {
88+
return __enableClimateControl?.boolValue
89+
}
90+
91+
@nonobjc
92+
public final var enableAutoMode: Bool? {
93+
return __enableAutoMode?.boolValue
94+
}
95+
96+
@nonobjc
97+
public final var fanSpeedIndex: Int? {
98+
return __fanSpeedIndex?.intValue
99+
}
100+
101+
@nonobjc
102+
public final var fanSpeedPercentage: Double? {
103+
return __fanSpeedPercentage?.doubleValue
104+
}
74105
}
75106
#endif

‎stdlib/public/SDK/Intents/INSetDefrosterSettingsInCarIntent.swift

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,29 @@ import Foundation
1616
#if os(iOS)
1717
@available(iOS 10.0, *)
1818
extension INSetDefrosterSettingsInCarIntent {
19-
@nonobjc
20-
public convenience init(
21-
enable: Bool? = nil, defroster: INCarDefroster = .unknown
22-
) {
23-
self.init(__enable: enable.map { NSNumber(value: $0) },
24-
defroster: defroster)
25-
}
26-
27-
@nonobjc
28-
public final var enable: Bool? {
29-
return __enable?.boolValue
30-
}
19+
20+
@nonobjc
21+
@available(iOS 12.0, *)
22+
public convenience init(
23+
enable: Bool? = nil, defroster: INCarDefroster = .unknown, carName: INSpeakableString? = nil
24+
) {
25+
self.init(__enable: enable.map { NSNumber(value: $0) },
26+
defroster: defroster,
27+
carName: carName)
28+
}
29+
30+
@nonobjc
31+
@available(iOS, obsoleted: 12.0)
32+
public convenience init(
33+
enable: Bool? = nil, defroster: INCarDefroster = .unknown
34+
) {
35+
self.init(__enable: enable.map { NSNumber(value: $0) },
36+
defroster: defroster)
37+
}
38+
39+
@nonobjc
40+
public final var enable: Bool? {
41+
return __enable?.boolValue
42+
}
3143
}
3244
#endif

‎stdlib/public/SDK/Intents/INSetProfileInCarIntent.swift

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,12 @@ import Foundation
1818
@available(iOS 10.0, *)
1919
extension INSetProfileInCarIntent {
2020

21-
@available(iOS 11.0, *)
21+
@available(iOS 12.0, *)
22+
public convenience init(profileNumber: Int? = nil, profileName: String? = nil, isDefaultProfile: Bool? = nil, carName: INSpeakableString? = nil) {
23+
self.init(__profileNumber: profileNumber.map { NSNumber(value: $0) }, profileName: profileName, defaultProfile: isDefaultProfile.map { NSNumber(value: $0) }, carName: carName)
24+
}
25+
26+
@available(iOS, introduced: 11.0, obsoleted: 12.0)
2227
public convenience init(profileNumber: Int? = nil, profileName: String? = nil, isDefaultProfile: Bool? = nil) {
2328
self.init(__profileNumber: profileNumber.map { NSNumber(value: $0) }, profileName: profileName, defaultProfile: isDefaultProfile.map { NSNumber(value: $0) })
2429
}

‎stdlib/public/SDK/Intents/INSetSeatSettingsInCarIntent.swift

Lines changed: 58 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -16,41 +16,63 @@ import Foundation
1616
#if os(iOS)
1717
@available(iOS 10.0, *)
1818
extension INSetSeatSettingsInCarIntent {
19-
@nonobjc
20-
public convenience init(
21-
enableHeating: Bool? = nil,
22-
enableCooling: Bool? = nil,
23-
enableMassage: Bool? = nil,
24-
seat: INCarSeat = .unknown,
25-
level: Int? = nil,
26-
relativeLevel: INRelativeSetting = .unknown
27-
) {
28-
self.init(__enableHeating: enableHeating.map { NSNumber(value: $0) },
29-
enableCooling: enableCooling.map { NSNumber(value: $0) },
30-
enableMassage: enableMassage.map { NSNumber(value: $0) },
31-
seat: seat,
32-
level: level.map { NSNumber(value: $0) },
33-
relativeLevel: relativeLevel)
34-
}
35-
36-
@nonobjc
37-
public final var enableHeating: Bool? {
38-
return __enableHeating?.boolValue
39-
}
40-
41-
@nonobjc
42-
public final var enableCooling: Bool? {
43-
return __enableCooling?.boolValue
44-
}
45-
46-
@nonobjc
47-
public final var enableMassage: Bool? {
48-
return __enableMassage?.boolValue
49-
}
50-
51-
@nonobjc
52-
public final var level: Int? {
53-
return __level?.intValue
54-
}
19+
20+
@nonobjc
21+
@available(iOS 12.0, *)
22+
public convenience init(
23+
enableHeating: Bool? = nil,
24+
enableCooling: Bool? = nil,
25+
enableMassage: Bool? = nil,
26+
seat: INCarSeat = .unknown,
27+
level: Int? = nil,
28+
relativeLevel: INRelativeSetting = .unknown,
29+
carName: INSpeakableString? = nil
30+
) {
31+
self.init(__enableHeating: enableHeating.map { NSNumber(value: $0) },
32+
enableCooling: enableCooling.map { NSNumber(value: $0) },
33+
enableMassage: enableMassage.map { NSNumber(value: $0) },
34+
seat: seat,
35+
level: level.map { NSNumber(value: $0) },
36+
relativeLevel: relativeLevel,
37+
carName: carName)
38+
}
39+
40+
@nonobjc
41+
@available(iOS, obsoleted: 12.0)
42+
public convenience init(
43+
enableHeating: Bool? = nil,
44+
enableCooling: Bool? = nil,
45+
enableMassage: Bool? = nil,
46+
seat: INCarSeat = .unknown,
47+
level: Int? = nil,
48+
relativeLevel: INRelativeSetting = .unknown
49+
) {
50+
self.init(__enableHeating: enableHeating.map { NSNumber(value: $0) },
51+
enableCooling: enableCooling.map { NSNumber(value: $0) },
52+
enableMassage: enableMassage.map { NSNumber(value: $0) },
53+
seat: seat,
54+
level: level.map { NSNumber(value: $0) },
55+
relativeLevel: relativeLevel)
56+
}
57+
58+
@nonobjc
59+
public final var enableHeating: Bool? {
60+
return __enableHeating?.boolValue
61+
}
62+
63+
@nonobjc
64+
public final var enableCooling: Bool? {
65+
return __enableCooling?.boolValue
66+
}
67+
68+
@nonobjc
69+
public final var enableMassage: Bool? {
70+
return __enableMassage?.boolValue
71+
}
72+
73+
@nonobjc
74+
public final var level: Int? {
75+
return __level?.intValue
76+
}
5577
}
5678
#endif

0 commit comments

Comments
 (0)