diff --git a/.github/workflows/deploy_to_cocoapods.yml b/.github/workflows/deploy_to_cocoapods.yml index e3e60a8..86b616a 100644 --- a/.github/workflows/deploy_to_cocoapods.yml +++ b/.github/workflows/deploy_to_cocoapods.yml @@ -25,6 +25,11 @@ jobs: if [ "$LIB_VERSION" != "$VRSN" ]; then exit 1 fi + export POD_RTCVRSN=$(grep 'AgoraRtcEngine_iOS' AgoraUIKit_iOS.podspec | sed -e "s,.*~\> \(.*\)\',\1,") + export POD_BRDVRSN=$(grep 'AgoraRtcEngine_iOS' AgoraBroadcastExtensionHelper_iOS.podspec | sed -e "s,.*~\> \(.*\)\',\1,") + if [ "$POD_RTCVRSN" != "$POD_BRDVRSN" ]; then + exit 1 + fi pod trunk push AgoraRtmControl_iOS.podspec --allow-warnings --skip-import-validation; pod trunk push AgoraAppGroupDataHelper_iOS.podspec --allow-warnings --skip-import-validation; pod trunk push AgoraBroadcastExtensionHelper_iOS.podspec --allow-warnings --skip-import-validation --synchronous; diff --git a/.github/workflows/swift-build-lint.yml b/.github/workflows/swift-build-lint.yml index 442b661..baff8b3 100644 --- a/.github/workflows/swift-build-lint.yml +++ b/.github/workflows/swift-build-lint.yml @@ -24,6 +24,11 @@ jobs: - name: Pod Lint 🔎 run: | export LIB_VERSION=$(grep 'static let version' Sources/Agora-Video-UIKit/AgoraUIKit.swift | sed -e 's,.*\"\(.*\)\",\1,') + export POD_RTCVRSN=$(grep 'AgoraRtcEngine_iOS' AgoraUIKit_iOS.podspec | sed -e "s,.*~\> \(.*\)\',\1,") + export POD_BRDVRSN=$(grep 'AgoraRtcEngine_iOS' AgoraBroadcastExtensionHelper_iOS.podspec | sed -e "s,.*~\> \(.*\)\',\1,") + if [ "$POD_RTCVRSN" != "$POD_BRDVRSN" ]; then + exit 1 + fi pod lib lint AgoraUIKit_iOS.podspec --allow-warnings --skip-import-validation --include-podspecs='AgoraRtmControl_iOS.podspec'; pod lib lint AgoraBroadcastExtensionHelper_iOS.podspec --allow-warnings --skip-import-validation --include-podspecs='AgoraAppGroupDataHelper_iOS.podspec'; - name: Print Version 🔤 diff --git a/AgoraBroadcastExtensionHelper_iOS.podspec b/AgoraBroadcastExtensionHelper_iOS.podspec index 3bc8c76..217a774 100644 --- a/AgoraBroadcastExtensionHelper_iOS.podspec +++ b/AgoraBroadcastExtensionHelper_iOS.podspec @@ -26,6 +26,6 @@ Add this Pod to your app extension to easily share your screen using Agora's RTC s.static_framework = true s.source_files = 'Sources/AgoraBroadcastExtensionHelper/*' - s.dependency 'AgoraRtcEngine_iOS', '~> 4.0.1' + s.dependency 'AgoraRtcEngine_iOS', '~> 4.1.0' s.dependency 'AgoraAppGroupDataHelper_iOS', "#{s.version.to_s}" end diff --git a/Sources/Agora-Video-UIKit/AgoraUIKit.swift b/Sources/Agora-Video-UIKit/AgoraUIKit.swift index c4d5643..bf009f5 100644 --- a/Sources/Agora-Video-UIKit/AgoraUIKit.swift +++ b/Sources/Agora-Video-UIKit/AgoraUIKit.swift @@ -25,7 +25,7 @@ public struct AgoraUIKit: Codable { /// Framework type of UIKit. "native", "flutter", "reactnative" public fileprivate(set) var framework: String /// Version of UIKit being used - public static let version = "4.0.6" + public static let version = "4.0.7" /// Framework type of UIKit. "native", "flutter", "reactnative" public static let framework = "native" #if os(iOS) diff --git a/Sources/Agora-Video-UIKit/AgoraVideoViewer.swift b/Sources/Agora-Video-UIKit/AgoraVideoViewer.swift index 6de442e..8a6c4db 100644 --- a/Sources/Agora-Video-UIKit/AgoraVideoViewer.swift +++ b/Sources/Agora-Video-UIKit/AgoraVideoViewer.swift @@ -273,7 +273,7 @@ open class AgoraVideoViewer: MPView, SingleVideoViewDelegate { let engine = AgoraRtcEngineKit.sharedEngine(withAppId: connectionData.appId, delegate: self) // This helps us know how many people are using the Video UI Kit. - engine.setParameters("{\"rtc.using_ui_kit\": 1}") + engine.setParameters(#"{"rtc.using_ui_kit": 1}"#) engine.enableAudioVolumeIndication(1000, smooth: 3, reportVad: self.agoraSettings.reportLocalVolume) engine.setChannelProfile(.liveBroadcasting) if self.agoraSettings.usingDualStream { diff --git a/Tests/Agora-UIKit-Tests/RtmMessagingTests.swift b/Tests/Agora-UIKit-Tests/RtmMessagingTests.swift index ea273bd..1aa5f9b 100644 --- a/Tests/Agora-UIKit-Tests/RtmMessagingTests.swift +++ b/Tests/Agora-UIKit-Tests/RtmMessagingTests.swift @@ -30,8 +30,7 @@ final class RtmMessagesTests: XCTestCase { XCTAssertEqual((unencodedJSON["mute"] as? Bool), muteReq.mute, "mute invalid!") XCTAssertEqual((unencodedJSON["device"] as? Int), muteReq.device, "device invalid!") XCTAssertEqual((unencodedJSON["isForceful"] as? Bool), muteReq.isForceful, "mute invalid!") - let msgTextValid = "{\"rtcId\":999,\"mute\":true,\"messageType\":" - + "\"MuteRequest\",\"device\":0,\"isForceful\":true}" + let msgTextValid = #"{"rtcId":999,"mute":true,"messageType":"MuteRequest","device":0,"isForceful":true}"# XCTAssertEqual(rtmMessage.text, msgTextValid, "Message text not matching mstTextValid")