Skip to content

Commit 62e2466

Browse files
committed
add macOS support
1 parent dc20470 commit 62e2466

File tree

125 files changed

+794
-206
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

125 files changed

+794
-206
lines changed

.github/workflows/ci.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@ jobs:
2323
os: macos-latest
2424
- cmd: "./gradlew :example:androidApp:assembleDebug"
2525
os: macos-latest
26-
- cmd: "./gradlew :kmp-webrtc:podspec :kmp-webrtc:generateDummyFramework && cd example/iosApp && xcodegen && pod install && xcodebuild -workspace iosApp.xcworkspace -scheme iosApp -sdk iphonesimulator -configuration Debug"
26+
- cmd: "./scripts/build_ios_demo.sh"
27+
os: macos-latest
28+
dep: "brew update && brew install cocoapods xcodegen"
29+
- cmd: "./scripts/build_mac_demo.sh"
2730
os: macos-latest
2831
dep: "brew update && brew install cocoapods xcodegen"
2932
runs-on: ${{ matrix.os }}

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ local.properties
1212
xcuserdata
1313
**.podspec
1414
**.xcodeproj
15+
**.xcworkspace
1516
Podfile.lock
1617
Pods
1718

README.md

Lines changed: 11 additions & 6 deletions

example/iosApp/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ target 'iosApp' do
55
platform :ios, '14.0'
66
pod 'kmp_webrtc', :path => '../../kmp-webrtc/kmp_webrtc.podspec'
77
pod 'WebRTC', :path => '../../libs/apple/WebRTC.podspec'
8-
pod 'kmp_xlog', '~> 1.3.1'
8+
pod 'kmp_xlog', '~> 1.3.4'
99
end

example/iosApp/iosApp.xcworkspace/contents.xcworkspacedata

Lines changed: 0 additions & 10 deletions
This file was deleted.

example/iosApp/iosApp/CallViewController.m

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ @implementation CallViewController {
4040
ARDSettingsModel* _settingsModel;
4141
bool _isLandscape;
4242

43-
Kmp_webrtcObjCPeerConnectionClientFactory* _pcClientFactory;
43+
Kmp_webrtcIOSPeerConnectionClientFactory* _pcClientFactory;
4444
id<Kmp_webrtcPeerConnectionClient> _pcClient;
4545
NSTimer* _statsTimer;
4646
CFAudioMixer* _mixer;
@@ -354,9 +354,9 @@ - (void)startLoopback {
354354
videoCaptureFps:30
355355
initCameraFace:0
356356
privateConfig:privateConfig];
357-
_pcClientFactory = (Kmp_webrtcObjCPeerConnectionClientFactory*)
358-
[Kmp_webrtcObjCPeerConnectionClientFactoryKt createPeerConnectionClientFactoryConfig:pcClientFactoryConfig
359-
errorHandler:^(Kmp_webrtcInt * _Nonnull code, NSString * _Nonnull msg) {
357+
_pcClientFactory = (Kmp_webrtcIOSPeerConnectionClientFactory*)
358+
[Kmp_webrtcIOSPeerConnectionClientFactoryKt createPeerConnectionClientFactoryConfig:pcClientFactoryConfig
359+
errorHandler:^(Kmp_webrtcInt * _Nonnull code, NSString * _Nonnull msg) {
360360
NSLog(@"XXPXX PCFactory errorHandler %@ %@", code, msg);
361361
}];
362362

6.68 KB
6.84 KB
100 KB
7.25 KB

0 commit comments

Comments
 (0)