From 0212a21d2949d6c35663fb16553e2821bb8e8db8 Mon Sep 17 00:00:00 2001 From: BitriseBot Date: Mon, 11 Nov 2024 11:51:52 +0000 Subject: [PATCH] Update dependencies declared in `Podfile` and `Package.swift` --- GliaWidgets.podspec | 2 +- .../Sources/CoreSDKClient/CoreSDKClient.Mock.swift | 8 ++++++-- GliaWidgets/Sources/Interactor/Interactor.swift | 4 ++++ GliaWidgetsTests/CallVisualizer/CallVisualizerTests.swift | 6 ++---- .../EngagementCoordinator+SurveyTests.swift | 7 ++----- Package.swift | 4 ++-- Podfile.lock | 4 ++-- 7 files changed, 19 insertions(+), 16 deletions(-) diff --git a/GliaWidgets.podspec b/GliaWidgets.podspec index 578128077..20e2f4fff 100644 --- a/GliaWidgets.podspec +++ b/GliaWidgets.podspec @@ -19,5 +19,5 @@ Pod::Spec.new do |s| } s.exclude_files = ['GliaWidgets/Window/**'] - s.dependency 'GliaCoreSDK', '1.5.5' + s.dependency 'GliaCoreSDK', '2.0.0' end diff --git a/GliaWidgets/Sources/CoreSDKClient/CoreSDKClient.Mock.swift b/GliaWidgets/Sources/CoreSDKClient/CoreSDKClient.Mock.swift index f790e4d48..d86376af2 100644 --- a/GliaWidgets/Sources/CoreSDKClient/CoreSDKClient.Mock.swift +++ b/GliaWidgets/Sources/CoreSDKClient/CoreSDKClient.Mock.swift @@ -483,7 +483,9 @@ extension CoreSdkClient.Engagement { source: EngagementSource = .coreEngagement, fetchSurvey: @escaping FetchSurvey = { _, _ in }, restartedFromEngagementId: String? = nil, - media: Engagement.Media = .init(audio: nil, video: nil) + media: Engagement.Media = .init(audio: nil, video: nil), + status: Status = .unknown("mock"), + capabilities: Capabilities = .init(text: false) ) -> CoreSdkClient.Engagement { .init( id: id, @@ -491,7 +493,9 @@ extension CoreSdkClient.Engagement { source: source, fetchSurvey: fetchSurvey, restartedFromEngagementId: restartedFromEngagementId, - mediaStreams: media + mediaStreams: media, + status: status, + capabilities: capabilities ) } } diff --git a/GliaWidgets/Sources/Interactor/Interactor.swift b/GliaWidgets/Sources/Interactor/Interactor.swift index 1d6e4dda3..8fe73aa40 100644 --- a/GliaWidgets/Sources/Interactor/Interactor.swift +++ b/GliaWidgets/Sources/Interactor/Interactor.swift @@ -287,6 +287,10 @@ extension Interactor: CoreSdkClient.Interactable { } } + var onLiveToSecureConversationsEngagementTransferring: CoreSdkClient.EngagementTransferringBlock { + return {} + } + var onOperatorTypingStatusUpdate: CoreSdkClient.OperatorTypingStatusUpdate { return { [weak self] operatorTypingStatus in self?.notify(.typingStatusUpdated(operatorTypingStatus)) diff --git a/GliaWidgetsTests/CallVisualizer/CallVisualizerTests.swift b/GliaWidgetsTests/CallVisualizer/CallVisualizerTests.swift index 8e8838044..6917d31a9 100644 --- a/GliaWidgetsTests/CallVisualizer/CallVisualizerTests.swift +++ b/GliaWidgetsTests/CallVisualizer/CallVisualizerTests.swift @@ -19,7 +19,7 @@ final class CallVisualizerTests: XCTestCase { var environmentMock = CallVisualizer.Environment.mock environmentMock.screenShareHandler = screenShareHandlerMock environmentMock.getCurrentEngagement = { - .init(id: "", engagedOperator: nil, source: .callVisualizer, fetchSurvey: { _, _ in }, mediaStreams: .init(audio: nil, video: nil)) + .mock(source: .callVisualizer) } let interactorMock = Interactor.mock() environmentMock.interactorProviding = { interactorMock } @@ -63,9 +63,7 @@ final class CallVisualizerTests: XCTestCase { } var environmentMock = CallVisualizer.Environment.mock environmentMock.screenShareHandler = screenShareHandlerMock - environmentMock.getCurrentEngagement = { - .init(id: "", engagedOperator: nil, source: .coreEngagement, fetchSurvey: { _, _ in }, mediaStreams: .init(audio: nil, video: nil)) - } + environmentMock.getCurrentEngagement = { .mock() } let callVisualizer = CallVisualizer(environment: environmentMock) callVisualizer.startObservingInteractorEvents() diff --git a/GliaWidgetsTests/Sources/Coordinators/EngagementCoordinator/EngagementCoordinator+SurveyTests.swift b/GliaWidgetsTests/Sources/Coordinators/EngagementCoordinator/EngagementCoordinator+SurveyTests.swift index 2f3af962d..6a39ea88f 100644 --- a/GliaWidgetsTests/Sources/Coordinators/EngagementCoordinator/EngagementCoordinator+SurveyTests.swift +++ b/GliaWidgetsTests/Sources/Coordinators/EngagementCoordinator/EngagementCoordinator+SurveyTests.swift @@ -4,14 +4,11 @@ import XCTest class EngagementCoordinatorSurveyTests: XCTestCase { func test_surveyCompletesWithUnexpectedError() { let coreSdkClient = CoreSdkClient.failing - let engagement = CoreSdkClient.Engagement( - id: "", - engagedOperator: nil, - source: .coreEngagement, + let engagement = CoreSdkClient.Engagement.mock( fetchSurvey: { _, callback in callback(.failure(.mock())) }, - mediaStreams: .init(audio: .none, video: .oneWay) + media: .init(audio: .none, video: .oneWay) ) let interactor = Interactor.mock(environment: .init(coreSdk: coreSdkClient, gcd: .failing, log: .failing)) interactor.currentEngagement = engagement diff --git a/Package.swift b/Package.swift index 1d1c2758c..84d7d6bbd 100644 --- a/Package.swift +++ b/Package.swift @@ -35,8 +35,8 @@ let package = Package( ), .binaryTarget( name: "GliaCoreSDK", - url: "https://github.com/salemove/ios-bundle/releases/download/1.5.5/GliaCoreSDK.xcframework.zip", - checksum: "21132a5eeb2ce1f4a4e75f4d2ea1c8c77ac4aead2c3ed000dadffbe9489ff899" + url: "https://github.com/salemove/ios-bundle/releases/download/2.0.0/GliaCoreSDK.xcframework.zip", + checksum: "7a5c6430c5ad291870208052ec8abf99b4d8706bbc038e635a84bbc19c1a0131" ), .binaryTarget( name: "GliaWidgetsSDKXcf", diff --git a/Podfile.lock b/Podfile.lock index b5bbfad6d..9050ded73 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -7,7 +7,7 @@ PODS: - AccessibilitySnapshot/Core - SnapshotTesting (~> 1.0) - GliaCoreDependency (2.3.0) - - GliaCoreSDK (1.5.5): + - GliaCoreSDK (2.0.0): - GliaCoreDependency (= 2.3.0) - TwilioVoice (= 6.8.0) - WebRTC-lib (= 119.0.0) @@ -35,7 +35,7 @@ SPEC REPOS: SPEC CHECKSUMS: AccessibilitySnapshot: a91e4a69f870188b51f43863d9fc7269d07cdd93 GliaCoreDependency: 37f48a5a32e2646617b87cbe9d4b30eedd123f6f - GliaCoreSDK: b03e775f43b7c4c144bd208e4b4338d7e06a6812 + GliaCoreSDK: ee6b34ec68fe7f7593e4bcbeac0c9ecfb51405d0 SnapshotTesting: 6141c48b6aa76ead61431ca665c14ab9a066c53b SwiftLint: eb47480d47c982481592c195c221d11013a679cc TwilioVoice: 9563c9ad71b9ab7bbad0b59b67cfe4be96c75d23