Merge branch 'refs/heads/release/candidate' into fix/add_missing_stag…

…ing_backend_verification_for_analytics
wireapp · Aug 23, 2024 · 94d121a · 94d121a
2 parents c5a59fc + 29f877e
commit 94d121a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/default.json b/default.json
@@ -9,8 +9,7 @@
             "mls_support_enabled": false,
             "analytics_enabled": false,
             "analytics_app_key": "4483f7a58ae3e70b3780319c4ccb5c88a037be49",
-            "analytics_server_url": "https://countly.wire.com/",
-            "is_password_protected_guest_link_enabled": false
+            "analytics_server_url": "https://countly.wire.com/"
         },
         "dev": {
             "application_id": "com.waz.zclient.dev",

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -46,8 +46,8 @@ androidx-compose-runtime = "1.6.7"
 
 # Compose
 composeBom = "2024.06.00"
-compose-foundation = "1.7.0-beta06" # remove when composeBom contains new stable version of BasicTextField2
-compose-material-android = "1.7.0-beta06" # remove when composeBom contains new stable version of BasicTextField2
+compose-foundation = "1.7.0-rc01" # remove when composeBom contains new stable version of BasicTextField2
+compose-material-android = "1.7.0-rc01" # remove when composeBom contains new stable version of BasicTextField2
 compose-activity = "1.9.0"
 compose-compiler = "1.5.11"
 compose-constraint = "1.0.1"