(WIP) feature/CPC-12213-update-pod-to-spm

.gitignore

@@ -3,6 +3,7 @@
 
 # Xcode
 build/
+.build/
 *.pbxuser
 !default.pbxuser
 *.mode1v3
@@ -18,6 +19,8 @@ profile
 DerivedData
 *.hmap
 *.ipa
+.swiftpm/
+Package.resolved
 
 # Bundler
 .bundle

Package.swift

@@ -0,0 +1,41 @@
+// swift-tools-version: 5.9
+import PackageDescription
+
+let package = Package(
+    name: "WKWebViewRTC",
+    platforms: [
+        .iOS(.v13) // Bundle.module requires iOS 13+
+    ],
+    products: [
+        .library(
+            name: "WKWebViewRTC",
+            targets: ["WKWebViewRTC"]
+        ),
+    ],
+    dependencies: [
+        .package(
+            url: "https://github.com/stasel/WebRTC.git",
+            .upToNextMajor(from: "125.0.0")
+        ),
+    ],
+    targets: [
+        .target(
+            name: "WKWebViewRTC",
+            dependencies: [
+                .product(name: "WebRTC", package: "WebRTC")
+            ],
+            path: "WKWebViewRTC",
+            exclude: [
+                "Assets",         // empty, .gitkeep only
+                "Js/src",         // 25 JS source files not needed in binary
+                "Js/package.json" // Node.js build config, not needed
+                // Js/.gitignore is a hidden file; SPM ignores it automatically
+                // Classes/.gitkeep is a hidden file; SPM ignores it automatically
+            ],
+            sources: ["Classes"],
+            resources: [
+                .process("Js/jsWKWebViewRTC.js") // 141 KB compiled JS bridge
+            ]
+        ),
+    ]
+)

WKWebViewRTC/Classes/WKWebViewRTC.swift

@@ -50,7 +50,7 @@ public class WKWebViewRTC : NSObject {
 
         setWebView(webview: wkwebview)
 
-        if let path = Bundle(for: type(of: self)).path(forResource: "jsWKWebViewRTC", ofType: "js") {
+        if let path = Bundle.module.path(forResource: "jsWKWebViewRTC", ofType: "js") {
             if let bindingJS = try? String(contentsOfFile: path, encoding: .utf8) {
                 let script = WKUserScript(source: bindingJS, injectionTime: .atDocumentStart, forMainFrameOnly: false)
                 self.userContentController?.addUserScript(script)

WKWebViewRTC/Classes/iMediaStreamRenderer.swift

@@ -21,7 +21,7 @@ class iMediaStreamRenderer : NSObject, RTCVideoViewDelegate {
 	var elementView: UIView
 	var pluginMediaStream: iMediaStream?
 
-	var videoView: RTCEAGLVideoView
+	var videoView: RTCMTLVideoView
 	var rtcAudioTrack: RTCAudioTrack?
 	var rtcVideoTrack: RTCVideoTrack?
     var pluginVideoTrack: iMediaStreamTrack?
@@ -45,7 +45,7 @@ class iMediaStreamRenderer : NSObject, RTCVideoViewDelegate {
 
 		// The effective video view in which the the video stream is shown.
 		// It's placed over the elementView.
-		self.videoView = RTCEAGLVideoView()
+		self.videoView = RTCMTLVideoView()
 		self.videoView.isUserInteractionEnabled = false
 
 		self.elementView.isUserInteractionEnabled = false
@@ -308,7 +308,7 @@ class iMediaStreamRenderer : NSObject, RTCVideoViewDelegate {
 	}
 
 	/**
-	 * Methods inherited from RTCEAGLVideoViewDelegate.
+	 * Methods inherited from RTCVideoViewDelegate (RTCMTLVideoView).
 	 */
 
 	func videoView(_ videoView: RTCVideoRenderer, didChangeVideoSize size: CGSize) {

WKWebViewRTC/Classes/iRTCPeerConnectionConfig.swift

@@ -13,7 +13,6 @@ import WebRTC
 class iRTCPeerConnectionConfig {
 
 	fileprivate let allowedSdpSemantics = [
-		"plan-b": RTCSdpSemantics.planB,
 		"unified-plan": RTCSdpSemantics.unifiedPlan
 	]
 
@@ -50,7 +49,7 @@ class iRTCPeerConnectionConfig {
 
 		let sdpSemanticsConfig = pcConfig?.object(forKey: "sdpSemantics") as? String;
 		let sdpSemantics = (sdpSemanticsConfig != nil && allowedSdpSemantics[sdpSemanticsConfig!] != nil) ?
-			allowedSdpSemantics[sdpSemanticsConfig!] : RTCSdpSemantics.planB
+			allowedSdpSemantics[sdpSemanticsConfig!] : RTCSdpSemantics.unifiedPlan
 
 		rtcConfiguration.sdpSemantics = sdpSemantics!;