Skip to content

Commit aa9e077

Browse files
authored
Merge pull request #10451 from moiseev/intents-missing-files-4
[swift-4.0-branch][overlay] Adding missing files to Intents/CMakeLists.txt
2 parents 34d69b0 + 941ddaf commit aa9e077

File tree

3 files changed

+14
-16
lines changed

3 files changed

+14
-16
lines changed

stdlib/public/SDK/Intents/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@ include("../../../../cmake/modules/StandaloneOverlay.cmake")
33

44
add_swift_library(swiftIntents ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
55
INBooleanResolutionResult.swift
6+
INCallRecord.swift
67
INDoubleResolutionResult.swift
78
INGetCarLockStatusIntentResponse.swift
89
INGetCarPowerLevelStatusIntentResponse.swift
910
INIntegerResolutionResult.swift
1011
INRequestRideIntent.swift
1112
INSaveProfileInCarIntent.swift
13+
INSearchCallHistoryIntent.swift
1214
INSearchForPhotosIntentResponse.swift
1315
INSetCarLockStatusIntent.swift
1416
INSetClimateSettingsInCarIntent.swift

stdlib/public/SDK/Intents/INCallRecord.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ import Foundation
1818
extension INCallRecord {
1919
@nonobjc
2020
public convenience init(
21-
identifier: String? = nil,
21+
identifier: String,
2222
dateCreated: Date? = nil,
2323
caller: INPerson? = nil,
24-
callRecordType: INCallRecordType? = nil,
25-
callCapability: INCallCapability? = nil,
24+
callRecordType: INCallRecordType,
25+
callCapability: INCallCapability,
2626
callDuration: Double? = nil,
2727
unseen: Bool? = nil
2828
) {

stdlib/public/SDK/Intents/INSearchCallHistoryIntent.swift

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,27 +16,23 @@ import Foundation
1616
#if os(iOS) || os(watchOS)
1717
@available(iOS 10.0, watchOS 3.2, *)
1818
extension INSearchCallHistoryIntent {
19+
@available(iOS 10.0, watchOS 3.2, *)
1920
@nonobjc
2021
public convenience init(
2122
dateCreated: INDateComponentsRange? = nil,
2223
recipient: INPerson? = nil,
23-
callCapabilities: INCallCapabilityOptions? = nil,
24-
callTypes: INCallRecordTypeOptions? = nil,
24+
callCapabilities: INCallCapabilityOptions,
25+
callTypes: INCallRecordTypeOptions,
2526
unseen: Bool? = nil
2627
) {
27-
if #available(iOS 11.0, *) {
28-
self.init(__dateCreated: dateCreated,
29-
recipient: recipient,
30-
callCapabilities: callCapabilities,
31-
callTypes: callTypes,
32-
unseen: unseen)
33-
} else {
34-
self.init(__dateCreated: dateCreated,
35-
recipient: recipient,
36-
callCapabilities: callCapabilities)
37-
}
28+
self.init(__dateCreated: dateCreated,
29+
recipient: recipient,
30+
callCapabilities: callCapabilities,
31+
callTypes: callTypes,
32+
unseen: unseen.map { NSNumber(value: $0) })
3833
}
3934

35+
@available(iOS 11.0, watchOS 4.0, *)
4036
@nonobjc
4137
public final var unseen: Bool? {
4238
return __unseen?.boolValue

0 commit comments

Comments
 (0)