Skip to content

PR for 69 - Resolve 'WebSocket' Name Collision Introduced in iOS 26 #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mekya merged 6 commits into from
Nov 14, 2025
Merged

PR for 69 - Resolve 'WebSocket' Name Collision Introduced in iOS 26 #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
195d4a4
Fix iOS 26 name collision with WebSocket
gabriel-wong-tbc Nov 12, 2025
522a895
Update xcode version
mekya Nov 14, 2025
bb18e6b
Update xcode version to 26.1.0
mekya Nov 14, 2025
2212c69
Download iOS platform
mekya Nov 14, 2025
dbaa2a0
Remove iOS download and update xcode to 16.4
mekya Nov 14, 2025
3787a21
Update iphone version to 16
mekya Nov 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ios-build-and-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ jobs:
- name: Set up Xcode
uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: '15.3'
xcode-version: '16.4'

- name: Build WebRTCiOSSDK
run: xcodebuild -scheme WebRTCiOSSDK -configuration Release -destination "generic/platform=iOS" ARCHS=arm64 CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO build

- name: Test WebRTCiOSSDK
run: xcodebuild clean -scheme WebRTCiOSSDK -destination "platform=iOS Simulator,name=iPhone 15" test
run: xcodebuild clean -scheme WebRTCiOSSDK -destination "platform=iOS Simulator,name=iPhone 16" test

- name: Build WebRTCSampleApp
run: xcodebuild -scheme WebRTC-Sample-App -configuration Release -destination "generic/platform=iOS" ARCHS=arm64 CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO build
2 changes: 1 addition & 1 deletion WebRTCiOSSDK/api/AntMediaClient.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ open class AntMediaClient: NSObject, AntMediaClientProtocol {
private var p2pStreamId: String?
private var publishToken: String?
private var playToken: String?
private var webSocket: WebSocket?
private var webSocket: Starscream.WebSocket?
// keep it for backward compatibility
private var mode: AntMediaClientMode!
var streamsInTheRoom: [String] = []
Expand Down