Skip to content

Commit ec9d9bc

Browse files
weileifrankweileifrank
committed
feat: modify ci for no compile condition
1 parent 7e6ddab commit ec9d9bc

File tree

11 files changed

+93
-14
lines changed

11 files changed

+93
-14
lines changed

‎.github/ci/build/build_android.sh

+3-1
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,12 @@ 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
52+
unzip_name=Agora_Native_SDK_for_Android_FULL_DEFAULT
53+
zip_name=Agora_Native_SDK_for_Android_FULL_DEFAULT.zip
5354
if [ -z "$sdk_url" ]; then
5455
echo "sdk_url is empty"
5556
echo unzip_name: $unzip_name
57+
echo zip_name: $zip_name
5658
else
5759
zip_name=${sdk_url##*/}
5860
echo zip_name: $zip_name

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

+8-1
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.5.0'
512

613
android {
714
compileSdkVersion 32

‎Android/APIExample-Audio/cloud_build.sh

+18-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,24 @@ rm -f app/src/main/res/values/string_configs.xml-e
1515

1616
./gradlew clean || exit 1
1717
./gradlew :app:assembleRelease || exit 1
18+
19+
SDK_VERSION=""
20+
if [ "$1" = "false" ]; then
21+
sdk_version_file="./gradle.properties"
22+
if [[ -f "$sdk_version_file" ]]; then
23+
rtc_sdk_version=$(grep "rtc_sdk_version" "$sdk_version_file" | cut -d'=' -f2)
24+
if [[ -n "$rtc_sdk_version" ]]; then
25+
SDK_VERSION=$(echo "$rtc_sdk_version" | sed 's/^[ \t]*//;s/[ \t]*$//')
26+
else
27+
echo "rtc_sdk_version value not found"
28+
fi
29+
else
30+
echo "file not found: $sdk_version_file"
31+
fi
32+
else
33+
SDK_VERSION=$(echo $sdk_url | cut -d "/" -f 5)
34+
fi
35+
1836
if [ "$WORKSPACE" != "" ]; then
19-
SDK_VERSION=$(echo $sdk_url | cut -d "/" -f 5)
2037
cp app/build/outputs/apk/release/*.apk $WORKSPACE/APIExample-Audio_${BUILD_NUMBER}_${SDK_VERSION}_$(date "+%Y%m%d%H%M%S").apk
2138
fi

‎Android/APIExample-Audio/gradle.properties

+3-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,6 @@ android.useAndroidX=true
1919
android.enableJetifier=true
2020

2121
# read enable simple filter section on README first before set this flag to TRUE
22-
simpleFilter = false
22+
simpleFilter = false
23+
24+
rtc_sdk_version = 4.5.0

‎Android/APIExample-Compose/app/build.gradle.kts

+10-3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ plugins {
88
alias(libs.plugins.jetbrainsKotlinAndroid)
99
}
1010

11+
val sdkVersionFile = file("../gradle.properties")
12+
val properties = Properties()
13+
properties.load(sdkVersionFile.inputStream())
14+
val agoraSdkVersion = properties.getProperty("rtc_sdk_version")
15+
println("${rootProject.project.name} agoraSdkVersion: ${agoraSdkVersion}")
1116
val localSdkPath = "${rootProject.projectDir.absolutePath}/../../sdk"
1217

1318
android {
@@ -85,7 +90,7 @@ android {
8590
outputs.all {
8691
if (this is ApkVariantOutputImpl) {
8792
this.outputFileName =
88-
"${rootProject.name}_${libs.versions.agoraSdk.get()}_${
93+
"${rootProject.name}_${agoraSdkVersion}_${
8994
SimpleDateFormat("yyyyMMddHHmm").format(
9095
Date()
9196
)
@@ -129,8 +134,10 @@ dependencies {
129134
if (File(localSdkPath).exists()) {
130135
implementation(fileTree(localSdkPath).include("*.jar", "*.aar"))
131136
} else {
132-
implementation(libs.agora.full.sdk)
133-
implementation(libs.agora.full.screen.sharing)
137+
implementation("io.agora.rtc:full-sdk:${agoraSdkVersion}")
138+
implementation("io.agora.rtc:full-screen-sharing:${agoraSdkVersion}")
139+
// implementation(libs.agora.full.sdk)
140+
// implementation(libs.agora.full.screen.sharing)
134141
}
135142

136143
}

‎Android/APIExample-Compose/cloud_build.sh

+18-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,24 @@ fi
2424

2525
./gradlew clean || exit 1
2626
./gradlew :app:assembleRelease || exit 1
27+
28+
SDK_VERSION=""
29+
if [ "$1" = "false" ]; then
30+
sdk_version_file="./gradle.properties"
31+
if [[ -f "$sdk_version_file" ]]; then
32+
rtc_sdk_version=$(grep "rtc_sdk_version" "$sdk_version_file" | cut -d'=' -f2)
33+
if [[ -n "$rtc_sdk_version" ]]; then
34+
SDK_VERSION=$(echo "$rtc_sdk_version" | sed 's/^[ \t]*//;s/[ \t]*$//')
35+
else
36+
echo "rtc_sdk_version value not found"
37+
fi
38+
else
39+
echo "file not found: $sdk_version_file"
40+
fi
41+
else
42+
SDK_VERSION=$(echo $sdk_url | cut -d "/" -f 5)
43+
fi
44+
2745
if [ "$WORKSPACE" != "" ]; then
28-
SDK_VERSION=$(echo $sdk_url | cut -d "/" -f 5)
2946
cp app/build/outputs/apk/release/*.apk $WORKSPACE/APIExample-Compose_${BUILD_NUMBER}_${SDK_VERSION}_$(date "+%Y%m%d%H%M%S").apk
3047
fi

‎Android/APIExample-Compose/gradle.properties

+3-1
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,6 @@ kotlin.code.style=official
2020
# Enables namespacing of each library's R class so that its R class includes only the
2121
# resources declared in the library itself and none from the library's dependencies,
2222
# thereby reducing the size of the R class for that library
23-
android.nonTransitiveRClass=true
23+
android.nonTransitiveRClass=true
24+
25+
rtc_sdk_version = 4.5.0

‎Android/APIExample-Compose/gradle/libs.versions.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ composeBom = "2023.08.00"
1212
loggingInterceptor = "4.10.0"
1313
materialIconsExtended = "1.6.0"
1414
navigationCompose = "2.7.7"
15-
agoraSdk = "4.5.0"
15+
#agoraSdk = "4.5.0"
1616
okhttp = "4.10.0"
1717

1818
[libraries]
1919
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
2020
androidx-datastore = { module = "androidx.datastore:datastore", version.ref = "datastore" }
2121
androidx-datastore-preferences = { module = "androidx.datastore:datastore-preferences", version.ref = "datastore" }
2222
androidx-material-icons-extended = { module = "androidx.compose.material:material-icons-extended", version.ref = "materialIconsExtended" }
23-
agora-full-sdk = { module = "io.agora.rtc:full-sdk", version.ref = "agoraSdk" }
24-
agora-full-screen-sharing = { module = "io.agora.rtc:full-screen-sharing", version.ref = "agoraSdk" }
23+
#agora-full-sdk = { module = "io.agora.rtc:full-sdk", version.ref = "agoraSdk" }
24+
#agora-full-screen-sharing = { module = "io.agora.rtc:full-screen-sharing", version.ref = "agoraSdk" }
2525
junit = { group = "junit", name = "junit", version.ref = "junit" }
2626
androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
2727
androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }

‎Android/APIExample/app/build.gradle

+8-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,14 @@ apply plugin: 'kotlin-android'
33
apply from: "${rootDir.absolutePath}/git-hooks.gradle"
44
apply from: 'vendors.gradle'
55

6-
def agoraSdkVersion = "4.5.0"
6+
7+
def sdkVersionFile = file("../gradle.properties")
8+
def properties = new Properties()
9+
sdkVersionFile.withInputStream { stream ->
10+
properties.load(stream)
11+
}
12+
def agoraSdkVersion = properties.getProperty("rtc_sdk_version")
13+
println("${rootProject.project.name} agoraSdkVersion: ${agoraSdkVersion}")
714
def localSdkPath= "${rootProject.projectDir.absolutePath}/../../sdk"
815

916

‎Android/APIExample/cloud_build.sh

+17-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,23 @@ cd - || exit 1
5959
./gradlew clean || exit 1
6060
./gradlew :app:assembleRelease || exit 1
6161

62+
SDK_VERSION=""
63+
if [ "$1" = "false" ]; then
64+
sdk_version_file="./gradle.properties"
65+
if [[ -f "$sdk_version_file" ]]; then
66+
rtc_sdk_version=$(grep "rtc_sdk_version" "$sdk_version_file" | cut -d'=' -f2)
67+
if [[ -n "$rtc_sdk_version" ]]; then
68+
SDK_VERSION=$(echo "$rtc_sdk_version" | sed 's/^[ \t]*//;s/[ \t]*$//')
69+
else
70+
echo "rtc_sdk_version value not found"
71+
fi
72+
else
73+
echo "file not found: $sdk_version_file"
74+
fi
75+
else
76+
SDK_VERSION=$(echo $sdk_url | cut -d "/" -f 5)
77+
fi
78+
6279
if [ "$WORKSPACE" != "" ]; then
63-
SDK_VERSION=$(echo $sdk_url | cut -d "/" -f 5)
6480
cp app/build/outputs/apk/release/*.apk $WORKSPACE/APIExample_${BUILD_NUMBER}_${SDK_VERSION}_$(date "+%Y%m%d%H%M%S").apk
6581
fi

‎Android/APIExample/gradle.properties

+2
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,5 @@ android.enableJetifier=true
2222
simpleFilter = false
2323
# read enable stream encrypt section on README first before set this flag to TRUE
2424
streamEncrypt = false
25+
26+
rtc_sdk_version = 4.5.0

0 commit comments

Comments
 (0)