Skip to content

Commit 25bd629

Browse files
author
zhaoyongqiang
committed
Merge branch 'dev/4.0.0-GA' of github.com:AgoraIO/API-Examples into dev/4.0.0-GA
2 parents fb99beb + 18adbf9 commit 25bd629

5 files changed

Lines changed: 8 additions & 8 deletions

File tree

Android/APIExample/app/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ android {
3232
jniLibs.srcDirs = ['src/main/jniLibs']
3333
}
3434
}
35+
36+
ndkVersion '21.4.7075529'
3537
}
3638

3739
dependencies {

Android/APIExample/app/src/main/java/io/agora/api/example/MainApplication.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
import android.app.Application;
44

5-
import com.tencent.bugly.crashreport.CrashReport;
6-
75
import java.lang.annotation.Annotation;
86
import java.util.Set;
97

@@ -19,7 +17,6 @@ public class MainApplication extends Application {
1917
@Override
2018
public void onCreate() {
2119
super.onCreate();
22-
CrashReport.initCrashReport(getApplicationContext(), "7cb50ce921", BuildConfig.DEBUG);
2320
initExamples();
2421
}
2522

Android/build-template/build-android.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
- job: ${{ parameters.name }}_Build
1010
displayName: ${{ parameters.name }}
1111
pool:
12-
vmImage: 'macos-latest'
12+
vmImage: 'ubuntu-latest'
1313
variables:
1414
- group: AgoraKeys
1515
steps:
@@ -22,6 +22,7 @@ jobs:
2222
workingDirectory: ${{ parameters.project }}/${{ parameters.module }}
2323
gradleWrapperFile: ${{ parameters.project }}/gradlew
2424
options: '--stacktrace'
25+
jdkVersionOption: '1.11'
2526
gradleOptions: '-Xmx3072m'
2627
publishJUnitResults: false
2728
testResultsFiles: '**/TEST-*.xml'

cicd/build-template/build-ios.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
displayName: ${{ parameters.displayName }}
1010

1111
pool:
12-
vmImage: 'macOS-10.14'
12+
vmImage: 'macOS-10.15'
1313

1414
variables:
1515
- group: AgoraKeys
@@ -22,12 +22,12 @@ jobs:
2222

2323
- task: InstallAppleCertificate@2
2424
inputs:
25-
certSecureFile: 'certificate.p12'
25+
certSecureFile: 'App.p12'
2626
certPwd: $(agora.password)
2727

2828
- task: InstallAppleProvisioningProfile@1
2929
inputs:
30-
provProfileSecureFile: 'AgoraAppsDevProfile.mobileprovision'
30+
provProfileSecureFile: 'App.mobileprovision'
3131

3232
- script: cd 'cicd/scripts' && chmod +x ios_build.sh && ./ios_build.sh ../../${{ parameters.workingDirectory }} ${{ parameters.project }} ${{ parameters.scheme }}
3333

windows/cicd/templates/build-Windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
displayName: ${{ parameters.displayName }}
1818

1919
pool:
20-
vmImage: 'vs2017-win2016'
20+
vmImage: 'windows-2019'
2121

2222
variables:
2323
- group: AgoraKeys

0 commit comments

Comments
 (0)