Merge remote-tracking branch 'origin/dev_robotaxi-d_230809_6.0.0' into dev_robotaxi-d_230809_6.0.0

2023-08-18 12:07:35 +08:00
parent 920a8c5ec1 6dd6d8b213
commit d9fb2567a2
2 changed files with 2 additions and 1 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -42,6 +42,7 @@ android {
        exclude 'META-INF/*'
        exclude "/lib/armeabi-v7a/*.so"
        pickFirst 'lib/arm64-v8a/libc++_shared.so'
+        pickFirst "META-INF/com.android.tools/proguard/coroutines.pro"
    }

    signingConfigs {
--- a/gradle/ext.gradle
+++ b/gradle/ext.gradle
@@ -1,5 +1,5 @@
 ext {
-    gradle_version = '4.0.0'
+    gradle_version = '3.5.3'
    kotlin_version = '1.5.30'
    plugin_version = '10.0.0_mogo'
    hook_log_plugin_version = '1.7.2'