Merge branch 'release/0.4.7' into main

Author: bmarty

.github/workflows/clear-cache.yml

@@ -33,7 +33,7 @@ jobs:
         run: ./gradlew verifyPaparazziDebug $CI_GRADLE_ARG_PROPERTIES
 
       - name: 📈 Generate kover report and verify coverage
-        run: ./gradlew :app:koverHtmlReport :app:koverXmlReport :app:koverVerify $CI_GRADLE_ARG_PROPERTIES -Pci-build=true
+        run: ./gradlew :app:koverXmlReportGplayDebug :app:koverHtmlReportGplayDebug :app:koverVerifyGplayDebug $CI_GRADLE_ARG_PROPERTIES
 
       - name: ✅ Upload kover report
         if: always()

.github/workflows/nightlyReports.yml

@@ -63,7 +63,7 @@ jobs:
         with:
           name: linting-report
           path: |
-            */build/reports/**/*.*
+            **/build/reports/**/*.*
       - name: Prepare Danger
         if: always()
         run: |

.github/workflows/quality.yml

@@ -48,22 +48,22 @@ jobs:
         with:
           cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
 
-      - name: ⚙️ Run unit tests, debug and release
-        run: ./gradlew test $CI_GRADLE_ARG_PROPERTIES
+      - name: ⚙️ Run unit tests for debug variant
+        run: ./gradlew testDebugUnitTest $CI_GRADLE_ARG_PROPERTIES
 
       - name: 📸 Run screenshot tests
         run: ./gradlew verifyPaparazziDebug $CI_GRADLE_ARG_PROPERTIES
 
       - name: 📈Generate kover report and verify coverage
-        run: ./gradlew :app:koverHtmlReport :app:koverXmlReport :app:koverVerify $CI_GRADLE_ARG_PROPERTIES -Pci-build=true
+        run: ./gradlew :app:koverXmlReportGplayDebug :app:koverHtmlReportGplayDebug :app:koverVerifyGplayDebug $CI_GRADLE_ARG_PROPERTIES
 
       - name: 🚫 Upload kover failed coverage reports
         if: failure()
         uses: actions/upload-artifact@v4
         with:
           name: kover-error-report
           path: |
-            app/build/reports/kover/verify.err
+            app/build/reports/kover/verifyGplayDebug.err
 
       - name: ✅ Upload kover report (disabled)
         if: always()
@@ -85,5 +85,5 @@ jobs:
         with:
           fail_ci_if_error: true
           token: ${{ secrets.CODECOV_TOKEN }}
-#        with:
-#          files: build/reports/kover/xml/report.xml
+          files: app/build/reports/kover/reportGplayDebug.xml
+          verbose: true

.github/workflows/tests.yml

@@ -23,8 +23,6 @@ appId: ${MAESTRO_APP_ID}
 - inputText: ${MAESTRO_PASSWORD}
 - pressKey: Enter
 - tapOn: "Continue"
-- runFlow: ../assertions/assertWelcomeScreenDisplayed.yaml
-- tapOn: "Continue"
 - runFlow: ../assertions/assertAnalyticsDisplayed.yaml
 - tapOn: "Not now"
 - runFlow: ../assertions/assertHomeDisplayed.yaml

.maestro/tests/account/login.yaml

@@ -1,3 +1,23 @@
+Changes in Element X v0.4.7 (2024-03-26)
+========================================
+
+Features ✨
+----------
+ - Enable the feature "RoomList filters". ([#2603](https://github.com/element-hq/element-x-android/issues/2603))
+ - Enable the feature "Mark as unread" ([#2261](https://github.com/element-hq/element-x-android/issues/2261))
+ - Implement MSC2530 (Body field as media caption) ([#2521](https://github.com/element-hq/element-x-android/issues/2521))
+
+Bugfixes 🐛
+----------
+ - Use user avatar from cache if available. ([#2488](https://github.com/element-hq/element-x-android/issues/2488))
+ - Update member list after changing member roles and when the room member list is opened. ([#2590](https://github.com/element-hq/element-x-android/issues/2590))
+
+Other changes
+-------------
+ - Compound: add `BigIcon`, `BigCheckmark` and `PageTitle` components. ([#2574](https://github.com/element-hq/element-x-android/issues/2574))
+ - Remove Welcome screen from the FTUE. ([#2584](https://github.com/element-hq/element-x-android/issues/2584))
+
+
 Changes in Element X v0.4.6 (2024-03-15)
 ========================================
 

.maestro/tests/assertions/assertWelcomeScreenDisplayed.yaml

@@ -24,7 +24,6 @@ import extension.gitBranchName
 import extension.gitRevision
 import extension.koverDependencies
 import extension.setupKover
-import org.jetbrains.kotlin.cli.common.toBooleanLenient
 
 plugins {
     id("io.element.android-compose-application")
@@ -189,7 +188,7 @@ androidComponents {
             val abiCode = abiVersionCodes[name] ?: 0
             // Assigns the new version code to output.versionCode, which changes the version code
             // for only the output APK, not for the variant itself.
-            output.versionCode.set((output.versionCode.get() ?: 0) * 10 + abiCode)
+            output.versionCode.set((output.versionCode.orNull ?: 0) * 10 + abiCode)
         }
     }
 }
@@ -215,26 +214,6 @@ knit {
     }
 }
 
-val ciBuildProperty = "ci-build"
-val isCiBuild = if (project.hasProperty(ciBuildProperty)) {
-    val raw = project.property(ciBuildProperty) as? String
-    raw?.toBooleanLenient() == true || raw?.toIntOrNull() == 1
-} else {
-    false
-}
-
-kover {
-    // When running on the CI, run only debug test variants
-    if (isCiBuild) {
-        excludeTests {
-            // Disable instrumentation for debug test tasks
-            tasks(
-                "testDebugUnitTest",
-            )
-        }
-    }
-}
-
 dependencies {
     allLibrariesImpl()
     allServicesImpl()

CHANGES.md

@@ -172,6 +172,7 @@ allprojects {
 
 // Register quality check tasks.
 tasks.register("runQualityChecks") {
+    dependsOn(":tests:konsist:testDebugUnitTest")
     project.subprojects {
         // For some reason `findByName("lint")` doesn't work
         tasks.findByPath("$path:lint")?.let { dependsOn(it) }

app/build.gradle.kts

@@ -0,0 +1,2 @@
+Main changes in this version: Enable the feature "RoomList filters" and "Mark as unread".
+Full changelog: https://github.com/element-hq/element-x-android/releases