Merge branch 'main' into linran

fix(android): allow debug builds without local CA cert
1 changed files with 5 additions and 1 deletions
--- a/android-client/app/build.gradle.kts
+++ b/android-client/app/build.gradle.kts
@ -109,7 +109,11 @@ val debugApkExportName = "onlinemsgclient-debug.apk"
 val prepareLocalDebugTrust by tasks.registering {
    val sourceFile = localDebugCaCertSource

-    inputs.file(sourceFile).optional()
+    if (sourceFile.exists()) {
+        inputs.file(sourceFile)
+    } else {
+        inputs.property("localDebugCaCertMissing", true)
+    }
    outputs.dir(generatedLocalDebugTrustDir)

    doLast {
Author	SHA1	Message	Date
minxiwan	69e7ae4612	Merge branch 'main' into linran	1 week ago
alimu	eef3e29510	fix(android): allow debug builds without local CA cert	1 week ago