Added the WebRTC.framework into KurentoToolbox.podspec

nubomediaTI · Sep 19, 2016 · f159b6e · f159b6e
1 parent 4da72cf
commit f159b6e
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 9 deletions.
diff --git a/Classes/WebRTC/NBMWebRTCPeer.m b/Classes/WebRTC/NBMWebRTCPeer.m
@@ -176,7 +176,7 @@ - (void)processAnswer:(NSString *)sdpAnswer connectionId:(NSString *)connectionI
     //[connection.peerConnection setRemoteDescriptionWithDelegate:self sessionDescription:description];
 }
 
-- (void)addICECandidate:(RTCICECandidate *)candidate connectionId:(NSString *)connectionId {
+- (void)addICECandidate:(RTCIceCandidate *)candidate connectionId:(NSString *)connectionId {
     NSParameterAssert(candidate);
     NSParameterAssert(connectionId);
 

diff --git a/KurentoToolbox.podspec b/KurentoToolbox.podspec
@@ -23,6 +23,7 @@ Pod::Spec.new do |s|
     ss.dependency 'KurentoToolbox/JSON-RPC'
     ss.dependency 'KurentoToolbox/Room'
     ss.dependency 'KurentoToolbox/Tree'
+    ss.ios.vendored_frameworks = 'WebRTC.framework'
   end
 
   s.subspec 'WebRTC' do |ss|

diff --git a/KurentoToolboxDemo/KurentoToolboxDemo.xcodeproj/project.pbxproj b/KurentoToolboxDemo/KurentoToolboxDemo.xcodeproj/project.pbxproj
@@ -25,9 +25,7 @@
 		4AE438E71BF0DDBB001882E5 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4AE438E51BF0DDBB001882E5 /* Main.storyboard */; };
 		4AE438E91BF0DDBB001882E5 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4AE438E81BF0DDBB001882E5 /* Assets.xcassets */; };
 		4AE438EC1BF0DDBC001882E5 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4AE438EA1BF0DDBC001882E5 /* LaunchScreen.storyboard */; };
-		564D8A0D1D18486600676AAC /* WebRTC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 564D8A0C1D18486600676AAC /* WebRTC.framework */; };
-		564D8A201D19488D00676AAC /* WebRTC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 564D8A0C1D18486600676AAC /* WebRTC.framework */; };
-		564D8A211D19488D00676AAC /* WebRTC.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 564D8A0C1D18486600676AAC /* WebRTC.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		566A7E931D80161A00283028 /* WebRTC.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 564D8A0C1D18486600676AAC /* WebRTC.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		D1F711884E167D3F5CDAFF41 /* libPods-KurentoToolboxDemo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C8427577B1A2997AC0147152 /* libPods-KurentoToolboxDemo.a */; };
 /* End PBXBuildFile section */
 
@@ -38,7 +36,7 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				564D8A211D19488D00676AAC /* WebRTC.framework in Embed Frameworks */,
+				566A7E931D80161A00283028 /* WebRTC.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -96,9 +94,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				564D8A0D1D18486600676AAC /* WebRTC.framework in Frameworks */,
 				D1F711884E167D3F5CDAFF41 /* libPods-KurentoToolboxDemo.a in Frameworks */,
-				564D8A201D19488D00676AAC /* WebRTC.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

diff --git a/KurentoToolboxDemo/KurentoToolboxDemo/Base.lproj/Main.storyboard b/KurentoToolboxDemo/KurentoToolboxDemo/Base.lproj/Main.storyboard
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="drA-aB-zfc">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15G1004" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="drA-aB-zfc">
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>

diff --git a/KurentoToolboxDemo/KurentoToolboxDemo/Tree/NBMTreeManager.m b/KurentoToolboxDemo/KurentoToolboxDemo/Tree/NBMTreeManager.m
@@ -272,7 +272,7 @@ - (void)client:(NBMTreeClient *)client didFailWithError:(NSError *)error {
     [self.delegate treeManager:self didFailWithError:error];
 }
 
-- (void)client:(NBMTreeClient *)client iceCandidateReceived:(RTCICECandidate *)candidate ofSink:(NSString *)sinkId tree:(NSString *)treeId {
+- (void)client:(NBMTreeClient *)client iceCandidateReceived:(RTCIceCandidate *)candidate ofSink:(NSString *)sinkId tree:(NSString *)treeId {
     [self.webRTCPeer addICECandidate:candidate connectionId:kConnectionId];
 }