Merge branch 'release/candidate' into tmp/slow-messages-debug-build-2

wireapp · Nov 27, 2024 · 26fa38a · 26fa38a
2 parents 2afa88c + a0c500a
commit 26fa38a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/.github/workflows/gradle-run-ui-tests.yml b/.github/workflows/gradle-run-ui-tests.yml
@@ -56,6 +56,7 @@ jobs:
         with:
           api-level: ${{ matrix.api-level }}
           target: google_apis
+          arch: x86_64
           script: ./gradlew runAcceptanceTests
         env:
           GITHUB_USER: ${{ github.actor }}

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -61,6 +61,14 @@ private fun getFlavorsSettings(): NormalizedFlavorSettings =
 
 android {
     defaultConfig {
+        ndk {
+            abiFilters.apply {
+                add("armeabi-v7a")
+                add("arm64-v8a")
+                add("x86_64")
+            }
+        }
+
         val datadogApiKeyKey = "DATADOG_CLIENT_TOKEN"
         val datadogApiKey: String? = System.getenv(datadogApiKeyKey) ?: project.getLocalProperty(datadogApiKeyKey, null)
         buildConfigField("String", datadogApiKeyKey, datadogApiKey?.let { "\"$it\"" } ?: "null")

diff --git a/buildSrc/src/main/kotlin/scripts/variants.gradle.kts b/buildSrc/src/main/kotlin/scripts/variants.gradle.kts
@@ -108,6 +108,7 @@ android {
     }
 
     buildTypes {
+
         getByName(BuildTypes.DEBUG) {
             isMinifyEnabled = false
             applicationIdSuffix = ".${BuildTypes.DEBUG}"

diff --git a/default.json b/default.json
@@ -29,7 +29,7 @@
             "default_backend_url_blacklist": "https://clientblacklist.wire.com/staging",
             "default_backend_url_website": "https://wire.com",
             "default_backend_title": "wire-staging",
-            "encrypt_proteus_storage": true,
+            "encrypt_proteus_storage": false,
             "analytics_enabled": false,
             "picture_in_picture_enabled": true,
             "analytics_app_key": "8ffae535f1836ed5f58fd5c8a11c00eca07c5438",