Merge pull request #92 from AgoraIO-Community/update-420

update package to use sdk 4.2.0
AgoraIO-Community · Jun 8, 2023 · d2d2030 · d2d2030
2 parents d142fdc + fb9261f
commit d2d2030
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 11 deletions.
diff --git a/.github/workflows/swift-build-lint.yml b/.github/workflows/swift-build-lint.yml
@@ -17,7 +17,7 @@ jobs:
     - name: Swift Lint 🧹
       run: swiftlint --strict
     - name: Test Build 🔨
-      run: xcodebuild -scheme $SCHEME -destination $DESTINATION
+      run: xcodebuild -scheme $SCHEME -destination $DESTINATION | xcpretty
       env:
         SCHEME: AgoraUIKit_iOS-Package
         DESTINATION: 'generic/platform=iOS'

diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -6,4 +6,5 @@ excluded:
   - Sources/AgoraRtmControl/AgoraRtmController+RtmDelegateOverflows.swift
   - Sources/Agora-Video-UIKit/AgoraVideoViewer+RtcEngineDelegateOverflow.swift
   - .build
-  - docc
+  - docc
+  - Sources/Agora-Video-UIKit/AgoraUIKit.docc/*
diff --git 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.1.0'
+  s.dependency 'AgoraRtcEngine_iOS', '~> 4.2.0'
   s.dependency 'AgoraAppGroupDataHelper_iOS', "#{s.version.to_s}"
 end
diff --git a/AgoraUIKit_iOS.podspec b/AgoraUIKit_iOS.podspec
@@ -26,7 +26,7 @@ Use this Pod to create a video UIKit view that can be easily added to your iOS a
 
   s.static_framework = true
   s.source_files = 'Sources/Agora-Video-UIKit/*'
-  s.dependency 'AgoraRtcEngine_iOS', '~> 4.1.0'
+  s.dependency 'AgoraRtcEngine_iOS', '~> 4.2.0'
   s.dependency 'AgoraRtmControl_iOS', "#{s.version.to_s}"
 
 end
diff --git a/Package.swift b/Package.swift
@@ -15,7 +15,7 @@ let package = Package(
         .package(
             name: "AgoraRtcKit",
             url: "https://github.com/AgoraIO/AgoraRtcEngine_iOS",
-            .upToNextMinor(from: Version(4, 1, 0))
+            .upToNextMinor(from: Version(4, 2, 0))
         ),
         .package(
             name: "AgoraRtmKit",

diff --git 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.1.0"
+    public static let version = "4.1.1"
     /// Framework type of UIKit. "native", "flutter", "reactnative"
     public static let framework = "native"
     #if os(iOS)

diff --git a/Sources/Agora-Video-UIKit/AgoraVideoViewer+RtcEngineDelegateOverflow.swift b/Sources/Agora-Video-UIKit/AgoraVideoViewer+RtcEngineDelegateOverflow.swift
@@ -39,8 +39,14 @@ extension AgoraVideoViewer {
     open func rtcEngineMediaEngineDidStartCall(_ engine: AgoraRtcEngineKit) {
         self.agoraSettings.rtcDelegate?.rtcEngineMediaEngineDidStartCall?(engine)
     }
-    open func rtcEngine(_ engine: AgoraRtcEngineKit, didOccurWarning warningCode: AgoraWarningCode) {
-        self.agoraSettings.rtcDelegate?.rtcEngine?(engine, didOccurWarning: warningCode)
+    open func rtcEngine(_ engine: AgoraRtcEngineKit, didVideoEnabled enabled: Bool, byUid uid: UInt) {
+        self.agoraSettings.rtcDelegate?.rtcEngine?(engine, didVideoEnabled: enabled, byUid: uid)
+    }
+    open func rtcEngine(_ engine: AgoraRtcEngineKit, didLocalVideoTranscoderErrorWithStream stream: AgoraTranscodingVideoStream, errorCode: AgoraVideoTranscoderError) {
+        self.agoraSettings.rtcDelegate?.rtcEngine?(engine, didLocalVideoTranscoderErrorWithStream: stream, errorCode: errorCode)
+    }
+    open func rtcEngine(_ engine: AgoraRtcEngineKit, videoRenderingTracingResultOfUid uid: UInt, currentEvent: AgoraMediaTraceEvent, tracingInfo: AgoraVideoRenderingTracingInfo) {
+        self.agoraSettings.rtcDelegate?.rtcEngine?(engine, videoRenderingTracingResultOfUid: uid, currentEvent: currentEvent, tracingInfo: tracingInfo)
     }
     open func rtcEngine(_ engine: AgoraRtcEngineKit, didOccurError errorCode: AgoraErrorCode) {
         self.agoraSettings.rtcDelegate?.rtcEngine?(engine, didOccurError: errorCode)
@@ -96,9 +102,6 @@ extension AgoraVideoViewer {
     open func rtcEngineDidAudioEffectFinish(_ engine: AgoraRtcEngineKit, soundId: Int32) {
         self.agoraSettings.rtcDelegate?.rtcEngineDidAudioEffectFinish?(engine, soundId: soundId)
     }
-    open func rtcEngine(_ engine: AgoraRtcEngineKit, didReceive event: AgoraChannelMediaRelayEvent) {
-        self.agoraSettings.rtcDelegate?.rtcEngine?(engine, didReceive: event)
-    }
     open func rtcEngine(_ engine: AgoraRtcEngineKit, streamUnpublishedWithUrl url: String) {
         self.agoraSettings.rtcDelegate?.rtcEngine?(engine, streamUnpublishedWithUrl: url)
     }