Skip to content

Commit b9ed8cd

Browse files
HugoChaanHugoChaan
authored
Merge pull request #429 from AgoraIO/dev/4.5.0
Dev/4.5.0
2 parents 89427d6 + 51099e4 commit b9ed8cd

File tree

491 files changed

+38982
-6796
lines changed

Some content is hidden

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

491 files changed

+38982
-6796
lines changed

‎.github/ci/build/build_android.sh‎

Lines changed: 27 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -49,28 +49,34 @@ echo release_version: $release_version
4949
echo short_version: $short_version
5050
echo pwd: `pwd`
5151
echo sdk_url: $sdk_url
52+
unzip_name=Agora_Native_SDK_for_Android_FULL_DEFAULT
53+
zip_name=Agora_Native_SDK_for_Android_FULL_DEFAULT.zip
54+
if [ -z "$sdk_url" ]; then
55+
echo "sdk_url is empty"
56+
echo unzip_name: $unzip_name
57+
echo zip_name: $zip_name
58+
else
59+
zip_name=${sdk_url##*/}
60+
echo zip_name: $zip_name
5261

53-
zip_name=${sdk_url##*/}
54-
echo zip_name: $zip_name
62+
# env LC_ALL=en_US.UTF-8 python3 $WORKSPACE/artifactory_utils.py --action=download_file --file=$sdk_url || exit 1
63+
curl -o $zip_name $sdk_url || exit 1
64+
7za x ./$zip_name -y > log.txt
5565

56-
# env LC_ALL=en_US.UTF-8 python3 $WORKSPACE/artifactory_utils.py --action=download_file --file=$sdk_url || exit 1
57-
curl -o $zip_name $sdk_url || exit 1
58-
7za x ./$zip_name -y > log.txt
59-
60-
unzip_name=`ls -S -d */ | grep Agora | sed 's/\///g'`
61-
echo unzip_name: $unzip_name
62-
63-
rm -rf ./$unzip_name/rtc/bin
64-
rm -rf ./$unzip_name/rtc/demo
65-
rm ./$unzip_name/rtc/commits
66-
rm ./$unzip_name/rtc/package_size_report.txt
67-
mkdir ./$unzip_name/rtc/samples
66+
unzip_name=`ls -S -d */ | grep Agora | sed 's/\///g'`
67+
echo unzip_name: $unzip_name
6868

69+
rm -rf ./$unzip_name/rtc/bin
70+
rm -rf ./$unzip_name/rtc/demo
71+
rm ./$unzip_name/rtc/commits
72+
rm ./$unzip_name/rtc/package_size_report.txt
73+
rm -rf ./$unzip_name/pom
74+
fi
75+
mkdir -p ./$unzip_name/rtc/samples
6976
cp -rf ./Android/${android_direction} ./$unzip_name/rtc/samples/API-Example || exit 1
7077
7za a -tzip result.zip -r $unzip_name > log.txt
7178
mv result.zip $WORKSPACE/withAPIExample_${BUILD_NUMBER}_$zip_name
7279

73-
7480
if [ $compile_project = true ]; then
7581
# install android sdk
7682
which java
@@ -79,7 +85,12 @@ if [ $compile_project = true ]; then
7985
export ANDROID_HOME=/usr/lib/android_sdk
8086
echo ANDROID_HOME: $ANDROID_HOME
8187
cd ./$unzip_name/rtc/samples/API-Example || exit 1
82-
./cloud_build.sh || exit 1
88+
if [ -z "$sdk_url" ]; then
89+
./cloud_build.sh false || exit 1
90+
else
91+
./cloud_build.sh true || exit 1
92+
fi
93+
8394
fi
8495

8596

‎.github/ci/build/build_ios.sh‎

Lines changed: 39 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@
3838
# pr: output test.zip to workspace dir
3939
# others: Rename the zip package name yourself, But need copy it to workspace dir
4040
##################################
41-
41+
xcode_version=$(xcodebuild -version | grep Xcode | awk '{print $2}')
42+
echo "Xcode Version: $xcode_version"
4243
echo ios_direction: $ios_direction
4344
echo Package_Publish: $Package_Publish
4445
echo is_tag_fetch: $is_tag_fetch
@@ -52,31 +53,49 @@ echo short_version: $short_version
5253
echo pwd: `pwd`
5354
echo sdk_url: $sdk_url
5455

55-
zip_name=${sdk_url##*/}
56-
echo zip_name: $zip_name
57-
58-
curl -o $zip_name $sdk_url || exit 1
59-
7za x ./$zip_name -y > log.txt
60-
61-
unzip_name=`ls -S -d */ | grep Agora | sed 's/\///g'`
62-
echo unzip_name: $unzip_name
56+
unzip_name=Agora_Native_SDK_for_iOS_FULL
57+
zip_name=output.zip
58+
sdk_url_flag=false
59+
if [ -z "$sdk_url" ]; then
60+
sdk_url_flag=false
61+
echo "sdk_url is empty"
62+
echo unzip_name: $unzip_name
63+
mkdir -p ./$unzip_name/samples
64+
cp -rf ./iOS/${ios_direction} ./$unzip_name/samples/${ios_direction} || exit 1
65+
ls -al ./$unzip_name/samples/${ios_direction}/
66+
else
67+
sdk_url_flag=true
68+
zip_name=${sdk_url##*/}
69+
echo zip_name: $zip_name
70+
curl -o $zip_name $sdk_url || exit 1
71+
7za x ./$zip_name -y > log.txt
72+
unzip_name=`ls -S -d */ | grep Agora | sed 's/\///g'`
73+
echo unzip_name: $unzip_name
74+
rm -rf ./$unzip_name/bin
75+
rm -f ./$unzip_name/commits
76+
rm -f ./$unzip_name/package_size_report.txt
6377

64-
rm -rf ./$unzip_name/bin
65-
rm ./$unzip_name/commits
66-
rm ./$unzip_name/package_size_report.txt
67-
mkdir ./$unzip_name/samples
68-
69-
cp -rf ./iOS/${ios_direction} ./$unzip_name/samples/API-Example || exit 1
70-
ls -al ./$unzip_name/samples/API-Example/
71-
mv ./$unzip_name/samples/API-Example/sdk.podspec ./$unzip_name/ || exit 1
72-
python3 ./.github/ci/build/modify_podfile.py ./$unzip_name/samples/API-Example/Podfile || exit 1
78+
rm -f ./$unzip_name/.commits
79+
rm -f ./$unzip_name/AgoraInfra_iOS.swift
80+
rm -f ./$unzip_name/AgoraRtcEngine_iOS.podspec
81+
rm -f ./$unzip_name/AgoraAudio_iOS.podspec
82+
rm -f ./$unzip_name/Package.swift
83+
mkdir -p ./$unzip_name/samples
84+
cp -rf ./iOS/${ios_direction} ./$unzip_name/samples/${ios_direction} || exit 1
85+
ls -al ./$unzip_name/samples/${ios_direction}/
86+
mv ./$unzip_name/samples/${ios_direction}/sdk.podspec ./$unzip_name/ || exit 1
87+
fi
7388

89+
python3 ./.github/ci/build/modify_podfile.py ./$unzip_name/samples/${ios_direction}/Podfile $sdk_url_flag || exit 1
7490

91+
echo "start compress"
7592
7za a -tzip result.zip -r $unzip_name > log.txt
76-
mv result.zip $WORKSPACE/withAPIExample_${BUILD_NUMBER}_$zip_name
93+
echo "start move to"
94+
echo $WORKSPACE/with${ios_direction}_${BUILD_NUMBER}_$zip_name
95+
mv result.zip $WORKSPACE/with${ios_direction}_${BUILD_NUMBER}_$zip_name
7796

7897
if [ $compile_project = true ]; then
79-
cd ./$unzip_name/samples/API-Example
98+
cd ./$unzip_name/samples/${ios_direction}
8099
./cloud_build.sh || exit 1
81100
cd -
82101
fi

‎.github/ci/build/build_mac.sh‎

Lines changed: 33 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -51,26 +51,42 @@ echo short_version: $short_version
5151
echo pwd: `pwd`
5252
echo sdk_url: $sdk_url
5353

54-
zip_name=${sdk_url##*/}
55-
echo zip_name: $zip_name
56-
57-
curl -o $zip_name $sdk_url || exit 1
58-
7za x ./$zip_name -y > log.txt
59-
60-
unzip_name=`ls -S -d */ | grep Agora`
61-
echo unzip_name: $unzip_name
62-
63-
rm -rf ./$unzip_name/bin
64-
rm ./$unzip_name/commits
65-
rm ./$unzip_name/package_size_report.txt
66-
mkdir ./$unzip_name/samples
54+
unzip_name=Agora_Native_SDK_for_iOS_FULL
55+
zip_name=output.zip
56+
sdk_url_flag=false
6757

58+
echo zip_name: $zip_name
59+
if [ -z "$sdk_url" ]; then
60+
sdk_url_flag=false
61+
echo "sdk_url is empty"
62+
echo unzip_name: $unzip_name
63+
mkdir ./$unzip_name/samples
64+
cp -rf ./macOS ./$unzip_name/samples/APIExample || exit 1
65+
ls -al ./$unzip_name/samples/API-Example/
66+
else
67+
sdk_url_flag=true
68+
zip_name=${sdk_url##*/}
69+
echo unzip_name: $unzip_name
70+
curl -o $zip_name $sdk_url || exit 1
71+
7za x ./$zip_name -y > log.txt
72+
unzip_name=`ls -S -d */ | grep Agora`
73+
echo unzip_name: $unzip_name
6874

69-
cp -rf ./macOS ./$unzip_name/samples/APIExample || exit 1
70-
ls -al ./$unzip_name/samples/API-Example/
71-
mv ./$unzip_name/samples/APIExample/sdk.podspec ./$unzip_name/
72-
python3 ./.github/ci/build/modify_podfile.py ./$unzip_name/samples/APIExample/Podfile
75+
rm -rf ./$unzip_name/bin
76+
rm -f ./$unzip_name/commits
77+
rm -f ./$unzip_name/package_size_report.txt
78+
rm -f ./$unzip_name/.commits
79+
rm -f ./$unzip_name/AgoraInfra_macOS.swift
80+
rm -f ./$unzip_name/AgoraRtcEngine_macOS.podspec
81+
rm -f ./$unzip_name/Package.swift
82+
83+
mkdir ./$unzip_name/samples
84+
cp -rf ./macOS ./$unzip_name/samples/APIExample || exit 1
85+
ls -al ./$unzip_name/samples/API-Example/
86+
mv ./$unzip_name/samples/APIExample/sdk.podspec ./$unzip_name/
87+
fi
7388

89+
python3 ./.github/ci/build/modify_podfile.py ./$unzip_name/samples/APIExample/Podfile $sdk_url_flag
7490
7za a -tzip result.zip -r $unzip_name
7591
cp result.zip $WORKSPACE/withAPIExample_${BUILD_NUMBER}_$zip_name
7692

‎.github/ci/build/build_windows.bat‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@ echo short_version: %short_version%
5151
echo pwd: %cd%
5252
echo sdk_url: %sdk_url%
5353

54-
echo off
54+
55+
set zip_name=Agora_Native_SDK_for_Windows_FULL_DEFAULT.zip
56+
if %compile_project% EQU false goto SKIP_DOWNLOAD
5557
set zip_name=%sdk_url%
5658
:LOOP
5759
for /f "tokens=1* delims=</>" %%a in ("%zip_name%") do (
@@ -70,11 +72,13 @@ dir
7072
curl %sdk_url% -o %zip_name%
7173
REM python %WORKSPACE%\\artifactory_utils.py --action=download_file --file=%sdk_url%
7274
7z x ./%zip_name% -y
73-
7475
dir
7576
rmdir /S /Q Agora_Native_SDK_for_Windows_FULL\demo
7677
del /F /Q Agora_Native_SDK_for_Windows_FULL\commits
7778
del /F /Q Agora_Native_SDK_for_Windows_FULL\package_size_report.txt
79+
:SKIP_DOWNLOAD
80+
81+
7882
mkdir Agora_Native_SDK_for_Windows_FULL\samples
7983
mkdir Agora_Native_SDK_for_Windows_FULL\samples\API-example
8084
rmdir /S /Q windows\cicd

‎.github/ci/build/modify_podfile.py‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
import os, sys
22

3-
def modfiy(path):
3+
def modfiy(path, sdk_flag):
44
with open(path, 'r', encoding='utf-8') as file:
55
contents = []
66
for num, line in enumerate(file):
77
if "pod 'Agora" in line:
8-
line = '\t'+"pod 'sdk', :path => '../../sdk.podspec'" + "\n"
8+
if sdk_flag:
9+
line = '\t'+"pod 'sdk', :path => '../../sdk.podspec'" + "\n"
910
elif "pod 'sdk" in line:
10-
line = ""
11+
if sdk_flag:
12+
line = ""
1113
elif 'sh .download_script' in line:
1214
line = line.replace('true', 'false') + "\n"
1315
contents.append(line)
@@ -19,6 +21,8 @@ def modfiy(path):
1921
fw.close()
2022

2123

24+
2225
if __name__ == '__main__':
23-
path = sys.argv[1:][0]
24-
modfiy(path.strip())
26+
path = sys.argv[1]
27+
sdk_url_is_not_empty = sys.argv[2].lower() == 'true'
28+
modfiy(path.strip(), sdk_url_is_not_empty)

‎Android/APIExample-Audio/app/build.gradle‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
11
apply plugin: 'com.android.application'
22

3+
4+
def sdkVersionFile = file("../gradle.properties")
5+
def properties = new Properties()
6+
sdkVersionFile.withInputStream { stream ->
7+
properties.load(stream)
8+
}
9+
def agoraSdkVersion = properties.getProperty("rtc_sdk_version")
10+
println("${rootProject.project.name} agoraSdkVersion: ${agoraSdkVersion}")
311
def localSdkPath= "${rootProject.projectDir.absolutePath}/../../sdk"
4-
def agoraSdkVersion = '4.4.1'
512

613
android {
714
compileSdkVersion 32
@@ -103,7 +110,6 @@ dependencies {
103110
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
104111

105112
implementation 'io.github.luizgrp.sectionedrecyclerviewadapter:sectionedrecyclerviewadapter:1.2.0'
106-
implementation 'com.yanzhenjie:permission:2.0.3'
107113
implementation 'de.javagl:obj:0.2.1'
108114

109115
implementation "com.squareup.okhttp3:okhttp:4.10.0"

0 commit comments

Comments
 (0)