Skip to content
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.

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

Rc/3.5.+ #523

Merged
merged 11 commits into from
Dec 13, 2021
Merged

Rc/3.5.+ #523

merged 11 commits into from
Dec 13, 2021

Conversation

LichKing-2234
Copy link
Contributor

No description provided.

LichKing-2234 and others added 11 commits December 13, 2021 11:19
d4e2686 fix: mapToEncryptionConfig crash
f4be532 fix: compiler error
4eb127f chore: support 3.5.0.2
3c32dc5 chore: add API which is missing
3bb9210 fix: API call error
732df69 feat: support 3.4.6
782ec46 chore: prepare to migrate to iris
ba7fba7 chore: support 3.4.5
f25a603 fix: startAudioRecording bug
02b6cc3 chore: optimize startAudioRecording
88b3d59 style: format code
b60a451 Merge pull request #6 from AgoraLibrary/main/3.4.+
d1561f7 feat(upgrade): 3.4.1
bb84006 Merge pull request #5 from AgoraLibrary/main/3.3.+
4623dc3 fix: getErrorDescription key error
ee40ba1 Merge pull request #4 from AgoraLibrary/dev/3.3.0
f8bde68 Merge branch 'master' into dev/3.3.0
0db518f Merge pull request #3 from AgoraLibrary/dev/3.2.0
5f69768 Merge branch 'master' into dev/3.2.0
d355c51 Merge pull request #2 from AgoraLibrary/dev/3.1.0
a81db07 fix: merge some bug fix
2d1ac8f fix: iOS selector error
98c4331 fix: type cast error
836f3b4 feat: support 3.3.1 for iOS
b422ce8 feat: support 3.3.0 for iOS
c8a08e5 Merge branch 'master' into dev/3.2.0
561b3fd Merge branch 'master' into dev/3.2.0
da3222a Merge branch 'master' into dev/3.2.0
3a55997 feat: add `setClientRole(role: ClientRole, options?: ClientRoleOptions): Promise<void>`
4ee51a9 feat: upgrade to 3.2.0
REVERT: b664522 fix: merge error
REVERT: ed3b61b feat: support 3.0.+

git-subtree-dir: ios/Classes/Base
git-subtree-split: d4e2686fb9a0919fc474bc0e9f5cd87cacdfcce6
..4ebf77c

4ebf77c feat: support 3.5.1 & plugin
27c788c chore: mapToColor
0278629 feat: support 3.5.0.2
45dcd16 chore: add API which is missing
58ca4b0 fix: AudioRecordingConfiguration bug
4a32e12 chore: prepare to migrate to iris
276c9fe chore: support 3.4.5
783aecf chore: add ERR_ALREADY_IN_RECORDING
3aed6ce fix: startAudioRecording bug
510b405 chore: optimize
4f801b9 chore: optimize
ab71f52 chore: optimize startAudioRecording
07f81c7 chore: optimize
5a20e13 style: optimize
858b58f fix(uid compatible): int to uint
8d14d2d feat(upgrade): 3.4.1
be5efea Merge pull request #4 from AgoraLibrary/dev/3.3.0
382f858 Merge branch 'master' into dev/3.3.0
8671535 Merge pull request #3 from AgoraLibrary/dev/3.2.0
feabda3 Merge branch 'master' into dev/3.2.0
9e57891 Merge pull request #2 from AgoraLibrary/dev/3.1.0
df303ee fix: merge some bug fix
cd7a2cd feat: support 3.3.1 for Android
551ebfe fix: annotation build warning
9c48594 feat: support 3.3.0 for Android
de52ca6 Merge branch 'master' into dev/3.2.0
ddeaefb Merge branch 'master' into dev/3.2.0
2fef3ae feat: add `setClientRole(role: ClientRole, options?: ClientRoleOptions): Promise<void>`
fcb57cc feat: upgrade to 3.2.0
REVERT: 21c7655 feat: support 3.0.+

git-subtree-dir: android/src/main/java/io/agora/rtc/base
git-subtree-split: 4ebf77cf1a688f5f4eccd6d04d754b3a62fd084c
325c233 feat: support 3.5.1 & plugin

git-subtree-dir: ios/Classes/Base
git-subtree-split: 325c233e45b1d6d84501e3321261129579f32351
@LichKing-2234 LichKing-2234 enabled auto-merge (squash) December 13, 2021 07:03
@LichKing-2234 LichKing-2234 merged commit 6b89421 into master Dec 13, 2021
@LichKing-2234 LichKing-2234 deleted the dev/3.5.+ branch December 13, 2021 07:08
maxxfrazer pushed a commit to maxxfrazer/Agora-Flutter-SDK that referenced this pull request Mar 14, 2022
* Squashed 'ios/Classes/Base/' changes from b664522..d4e2686

d4e2686 fix: mapToEncryptionConfig crash
f4be532 fix: compiler error
4eb127f chore: support 3.5.0.2
3c32dc5 chore: add API which is missing
3bb9210 fix: API call error
732df69 feat: support 3.4.6
782ec46 chore: prepare to migrate to iris
ba7fba7 chore: support 3.4.5
f25a603 fix: startAudioRecording bug
02b6cc3 chore: optimize startAudioRecording
88b3d59 style: format code
b60a451 Merge pull request AgoraIO-Extensions#6 from AgoraLibrary/main/3.4.+
d1561f7 feat(upgrade): 3.4.1
bb84006 Merge pull request AgoraIO-Extensions#5 from AgoraLibrary/main/3.3.+
4623dc3 fix: getErrorDescription key error
ee40ba1 Merge pull request AgoraIO-Extensions#4 from AgoraLibrary/dev/3.3.0
f8bde68 Merge branch 'master' into dev/3.3.0
0db518f Merge pull request AgoraIO-Extensions#3 from AgoraLibrary/dev/3.2.0
5f69768 Merge branch 'master' into dev/3.2.0
d355c51 Merge pull request AgoraIO-Extensions#2 from AgoraLibrary/dev/3.1.0
a81db07 fix: merge some bug fix
2d1ac8f fix: iOS selector error
98c4331 fix: type cast error
836f3b4 feat: support 3.3.1 for iOS
b422ce8 feat: support 3.3.0 for iOS
c8a08e5 Merge branch 'master' into dev/3.2.0
561b3fd Merge branch 'master' into dev/3.2.0
da3222a Merge branch 'master' into dev/3.2.0
3a55997 feat: add `setClientRole(role: ClientRole, options?: ClientRoleOptions): Promise<void>`
4ee51a9 feat: upgrade to 3.2.0
REVERT: b664522 fix: merge error
REVERT: ed3b61b feat: support 3.0.+

git-subtree-dir: ios/Classes/Base
git-subtree-split: d4e2686fb9a0919fc474bc0e9f5cd87cacdfcce6

* feat: support 3.5.0.4

* feat: support 3.5.1

* Squashed 'android/src/main/java/io/agora/rtc/base/' changes from 21c7655..4ebf77c

4ebf77c feat: support 3.5.1 & plugin
27c788c chore: mapToColor
0278629 feat: support 3.5.0.2
45dcd16 chore: add API which is missing
58ca4b0 fix: AudioRecordingConfiguration bug
4a32e12 chore: prepare to migrate to iris
276c9fe chore: support 3.4.5
783aecf chore: add ERR_ALREADY_IN_RECORDING
3aed6ce fix: startAudioRecording bug
510b405 chore: optimize
4f801b9 chore: optimize
ab71f52 chore: optimize startAudioRecording
07f81c7 chore: optimize
5a20e13 style: optimize
858b58f fix(uid compatible): int to uint
8d14d2d feat(upgrade): 3.4.1
be5efea Merge pull request AgoraIO-Extensions#4 from AgoraLibrary/dev/3.3.0
382f858 Merge branch 'master' into dev/3.3.0
8671535 Merge pull request AgoraIO-Extensions#3 from AgoraLibrary/dev/3.2.0
feabda3 Merge branch 'master' into dev/3.2.0
9e57891 Merge pull request AgoraIO-Extensions#2 from AgoraLibrary/dev/3.1.0
df303ee fix: merge some bug fix
cd7a2cd feat: support 3.3.1 for Android
551ebfe fix: annotation build warning
9c48594 feat: support 3.3.0 for Android
de52ca6 Merge branch 'master' into dev/3.2.0
ddeaefb Merge branch 'master' into dev/3.2.0
2fef3ae feat: add `setClientRole(role: ClientRole, options?: ClientRoleOptions): Promise<void>`
fcb57cc feat: upgrade to 3.2.0
REVERT: 21c7655 feat: support 3.0.+

git-subtree-dir: android/src/main/java/io/agora/rtc/base
git-subtree-split: 4ebf77cf1a688f5f4eccd6d04d754b3a62fd084c

* Squashed 'ios/Classes/Base/' changes from d4e2686..325c233

325c233 feat: support 3.5.1 & plugin

git-subtree-dir: ios/Classes/Base
git-subtree-split: 325c233e45b1d6d84501e3321261129579f32351

* Update RtcEngine.swift

* Update RtcEngineEvent.swift
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants