Merge pull request AgoraIO#185 from AgoraIO/dev/3.0.1

Dev/3.0.1
toshish · Jun 3, 2020 · faa04ff · faa04ff
2 parents fc38f51 + eeabc9e
commit faa04ff
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 61 deletions.
diff --git a/Group-Video/OpenVideoCall-Android/ci.env.py b/Group-Video/OpenVideoCall-Android/ci.env.py
@@ -5,13 +5,16 @@
 
 
 def main():
-#    f = open("./app/build.gradle", 'r+')
-#    content = f.read()
-#    x = re.sub(
-#        r'(dependencies {$)(.*)', r"\1\n    implementation 'io.agora.rtc:full-sdk:2.4.1'\2", content, flags=re.M)
-#    f.seek(0)
-#    f.write(x)
-#    f.truncate()
+    f = open("./app/build.gradle", 'r+')
+    content = f.read()
+    sdkver = ""
+    if "AGORA_RTC_SDK_VER" in os.environ:
+      sdkver = os.environ["AGORA_RTC_SDK_VER"]
+    x = re.sub(
+        r'(dependencies {$)(.*)', r"\1\n    implementation 'io.agora.rtc:full-sdk:"+sdkver+r"'\2", content, flags=re.M)
+    f.seek(0)
+    f.write(x)
+    f.truncate()
 
     appId = ""
     if "AGORA_APP_ID" in os.environ:
@@ -28,4 +31,4 @@ def main():
 
 
 if __name__ == "__main__":
-    main()
+    main()
diff --git a/Group-Video/OpenVideoCall-iOS-Objective-C/README.md b/Group-Video/OpenVideoCall-iOS-Objective-C/README.md
@@ -52,7 +52,6 @@ To build and run the sample application, get an App Id:
 
     - `AograRtcKit.framework`
     - `AgoraRtcCryptoLoader.framework`
-    - `libcrypto.a`
   
 2. Connect your iPhone or iPad device and run the project. Ensure a valid provisioning profile is applied or your project will not run.
 

diff --git a/Group-Video/OpenVideoCall-iOS-Objective-C/README.zh.md b/Group-Video/OpenVideoCall-iOS-Objective-C/README.zh.md
@@ -52,7 +52,6 @@
 
   - AgoraRtcKit.framework
   - AgoraRtcCryptoLoader.framework
-  - libcrypto.a
   
 2. 打开 Xcode 后，运行本项目。
 

diff --git a/Group-Video/OpenVideoCall-iOS/README.md b/Group-Video/OpenVideoCall-iOS/README.md
@@ -47,7 +47,6 @@ To build and run the sample application, get an App Id:
 
     - `AograRtcKit.framework`
     - `AgoraRtcCryptoLoader.framework`
-    - `libcrypto.a`
 
 2. Connect your iPhone or iPad device and run the project. Ensure a valid provisioning profile is applied or your project will not run.
 

diff --git a/Group-Video/OpenVideoCall-iOS/README.zh.md b/Group-Video/OpenVideoCall-iOS/README.zh.md
@@ -48,7 +48,6 @@ static var Token: String? = <#Temp Access Token#>
 
   - AgoraRtcKit.framework
   - AgoraRtcCryptoLoader.framework
-  - libcrypto.a
 
 2. 最后使用 Xcode 打开 OpenVideoCall.xcodeproj，连接 iPhone／iPad 测试设备，设置有效的开发者签名后即可运行。
 

diff --git a/One-to-One-Video/Agora-Android-Tutorial-1to1/ci.env.py b/One-to-One-Video/Agora-Android-Tutorial-1to1/ci.env.py
@@ -7,8 +7,11 @@
 def main():
     f = open("./app/build.gradle", 'r+')
     content = f.read()
+    sdkver = ""
+    if "AGORA_RTC_SDK_VER" in os.environ:
+      sdkver = os.environ["AGORA_RTC_SDK_VER"]
     x = re.sub(
-        r'(dependencies {$)(.*)', r"\1\n    implementation 'io.agora.rtc:full-sdk:2.8.2'\2", content, flags=re.M)
+        r'(dependencies {$)(.*)', r"\1\n    implementation 'io.agora.rtc:full-sdk:"+sdkver+r"'\2", content, flags=re.M)
     f.seek(0)
     f.write(x)
     f.truncate()
@@ -28,4 +31,4 @@ def main():
 
 
 if __name__ == "__main__":
-    main()
+    main()
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -1,19 +1,23 @@
 variables:
-  iOSRTCSDK: 'https://download.agora.io/sdk/release/Agora_Native_SDK_for_iOS_v3_0_0_FULL.zip?_ga=2.79185814.368877217.1583320605-5559409.1503304822'
-  MacRTCSDK: 'https://download.agora.io/sdk/release/Agora_Native_SDK_for_Mac_v3_0_0_FULL.zip?_ga=2.78400662.368877217.1583320605-5559409.1503304822'
+  iOSRTCSDK: 'https://download.agora.io/sdk/release/Agora_Native_SDK_for_iOS_v3_0_1_FULL.zip?_ga=2.217080854.1429354637.1591107319-5559409.1503304822'
+  MacRTCSDK: 'https://download.agora.io/sdk/release/Agora_Native_SDK_for_Mac_v3_0_1_FULL.zip?_ga=2.45223076.1429354637.1591107319-5559409.1503304822'
   WindowsRTCSDK: 'https://download.agora.io/sdk/release/Agora_Native_SDK_for_Windows(x86)_v3_0_0_2_FULL.zip'
   WindowsRTCSDKX64: 'https://download.agora.io/sdk/release/Agora_Native_SDK_for_Windows(x64)_v3_0_0_2_FULL.zip'
+  AndroidRTCSDKVer: '3.0.1'
+
 jobs:
 
   - template: cicd/templates/build-android.yml
     parameters:
       displayName: 'AndroidOpenVideoCall'
       workingDirectory: 'Group-Video/OpenVideoCall-Android'
+      sdkver: $(AndroidRTCSDKVer)
 
   - template: cicd/templates/build-android.yml
     parameters:
       displayName: 'AndroidTutorial'
       workingDirectory: 'One-to-One-Video/Agora-Android-Tutorial-1to1'
+      sdkver: $(AndroidRTCSDKVer)
 
   - template: cicd/templates/build-ios.yml
     parameters:
@@ -117,4 +121,4 @@ jobs:
       sdkunzipPath: 'AgoraSDK/Agora_Native_SDK_for_Windows_v3.0.0.2_FULL'
       Machine: 'x64'
       architecture: 'x64'
-      ReleasePath: 'x64/Release'
+      ReleasePath: 'x64/Release'
diff --git a/cicd/scripts/sdkdownload.sh b/cicd/scripts/sdkdownload.sh
@@ -1,15 +1,12 @@
 TARGET_LIBS_ZIP="agora_sdk.zip"
 TARGET_INTERNAL_FOLDER="agora_sdk"
-TARGET_INTERNAL_STATIC_FOLDER="agora_static_sdk"
-TARGET_INTERNAL_DYNAMIC_FOLDER="agora_dynamic_sdk"
 
 FILE_PATH=`pwd`
 
 echo ${FILE_PATH}
 
 SDK_URL=$1
 COPY_TO=$2
-SDK_TYPE=$3
 
 echo "url" ${SDK_URL}
 
@@ -21,57 +18,19 @@ unzip -q ${TARGET_LIBS_ZIP} -d ${TARGET_INTERNAL_FOLDER}
 
 cd ${TARGET_INTERNAL_FOLDER}
 
-FIRST_UNZIP_FOLDER=""
+FIRST_FOLDER=""
 
 for i in `ls`
 do
-    FIRST_UNZIP_FOLDER=$i
+    FIRST_FOLDER=$i
     echo $i
 done
 
-cd ${FIRST_UNZIP_FOLDER}
-
-DYNAMIC_SDK_TAG="Dynamic"
-DYNAMIC_SDK=""
-STATIC_SDK=""
-
-for i in `ls`
-do
-    if [[ $i =~ ${DYNAMIC_SDK_TAG} ]]
-    then
-    DYNAMIC_SDK=$i
-    echo "Dynamic" $i
-    else
-    STATIC_SDK=$i
-    echo "Static" ${STATIC_SDK}
-    fi
-done
-
-if [[ $SDK_TYPE =~ ${DYNAMIC_SDK_TAG} ]] 
-then
-unzip -q ${STATIC_SDK} -d ${TARGET_INTERNAL_STATIC_FOLDER}
-cd ${TARGET_INTERNAL_STATIC_FOLDER}
-else 
-unzip -q ${DYNAMIC_SDK} -d ${TARGET_INTERNAL_DYNAMIC_FOLDER}
-cd ${TARGET_INTERNAL_DYNAMIC_FOLDER}
-fi
-
-SECOND_UNZIP_FOLDER=""
-
-for i in `ls`
-do
-    SECOND_UNZIP_FOLDER=$i
-    echo ${SECOND_UNZIP_FOLDER}
-done
-
-echo `pwd`
-echo SECOND_UNZIP_FOLDER ${SECOND_UNZIP_FOLDER}
-
 #copy
 DESTINATION=${FILE_PATH}/../../${COPY_TO}
 
 echo DESTINATION ${DESTINATION}
 
-cp -af ${SECOND_UNZIP_FOLDER}/libs/* ${DESTINATION}
+cp -af ${FIRST_FOLDER}/libs/* ${DESTINATION}
 
 echo pwd `pwd`
diff --git a/cicd/templates/build-android.yml b/cicd/templates/build-android.yml
@@ -1,6 +1,7 @@
 parameters:
   displayName: ''
   workingDirectory: ''
+  sdkver: ''
 
 jobs:
   - job: ${{ parameters.displayName }}_Build
@@ -16,6 +17,7 @@ jobs:
       - script: cd ${{ parameters.workingDirectory }} && ls && python ci.env.py
         env:
           AGORA_APP_ID: $(agora.appId)
+          AGORA_RTC_SDK_VER: ${{ parameters.sdkver }}
 
       - task: Gradle@2
         inputs: