Merge branch 'develop' into feature/nfe/app_layout_tests

Author: NIkita Fedrunov

.gitattributes

@@ -1 +1,2 @@
 **/snapshots/**/*.png filter=lfs diff=lfs merge=lfs -text
+**/src/androidTest/assets/*.realm filter=lfs diff=lfs merge=lfs -text

.github/ISSUE_TEMPLATE/release.yml

@@ -10,7 +10,6 @@ body:
     id: checklist
     attributes:
       label: Release checklist
-      description: For the template example, we are releasing the version 1.2.3. Replace 1.2.3 with the version in the issue body.
       placeholder: |
         If you are reading this, you have deleted the content of the release template: undo the deletion or start again.
       value: |
@@ -20,34 +19,11 @@ body:
         - [ ] Check the update of the store descriptions (using Google Translate if necessary) to ensure that the changes are acceptable to be published to the stores.
         - [ ] While Weblate is locked, and after the PR from Weblate has been merged, handle all the TODOs in the main `strings.xml` file
         - [ ] Run the script `./tools/release/pushPlayStoreMetaData.sh`. You can check in the GooglePlay console the Activity log to check the effect.
-
         - [ ] Ensure all [the required PRs](https://github.com/vector-im/element-android/pulls?q=is%3Aopen+is%3Apr+label%3AZ-NextRelease) have been merged
 
         ### Do the release
 
-        - [ ] Make sure `develop` and `main` are up to date (git pull)
-        - [ ] Checkout develop and create a release with gitflow, branch name `release/1.2.3`
-        - [ ] Check the crashes from the PlayStore
-        - [ ] Check the rageshake with the current dev version: https://github.com/matrix-org/element-android-rageshakes/labels/1.2.3-dev
-        - [ ] Run the integration test, and especially `UiAllScreensSanityTest.allScreensTest()`
-        - [ ] Create an account on matrix.org and do some smoke tests that the sanity test does not cover like: 1-1 call, 1-1 video call, Jitsi call for instance
-        - [ ] Run towncrier: `towncrier build --version v1.2.3 --draft` (remove `--draft` do write the file CHANGES.md)
-        - [ ] Check that the folder `changelog.d` is empty. It can happen that some remaining files stay here
-        - [ ] Check the file CHANGES.md consistency. It's possible to reorder items (most important changes first) or change their section if relevant. Also an opportunity to fix some typo, or rewrite things
-        - [ ] Add file for fastlane under ./fastlane/metadata/android/en-US/changelogs
-        - [ ] (optional) Push the branch and start a draft PR (will not be merged), to check that the CI is happy with all the changes.
-        - [ ] Finish release with gitflow, delete the draft PR (if created)
-        - [ ] Push `main` and the new tag `v1.2.3` to origin
-        - [ ] Checkout `develop`
-        - [ ] Increase version (versionPatch + 2) in `./vector/build.gradle`
-        - [ ] Change the value of SDK_VERSION in the file `./matrix-sdk-android/build.gradle`
-        - [ ] Commit and push `develop`
-        - [ ] Wait for [Buildkite](https://buildkite.com/matrix-dot-org/element-android/builds?branch=main) to build the `main` branch.
-        - [ ] Run the script `~/scripts/releaseElement.sh`. It will download the APKs from Buildkite check them and sign them.
-        - [ ] Install the APK on your phone to check that the upgrade went well (no init sync, etc.)
-        - [ ] Create the release on gitHub [from the tag](https://github.com/vector-im/element-android/tags), copy paste the block from the file CHANGES.md
-        - [ ] Add the 4 signed APKs to the GitHub release
-        - [ ] Ping the Android Internal room
+        - [ ] Run the script ./tools/release/releaseScript.sh and follow the steps.
 
         ### Once tested and validated internally
 
@@ -84,45 +60,16 @@ body:
 
         The SDK2 and the sample app are released only when Element has been pushed to production.
 
-        - [ ] Checkout the `main` branch on Element Android project
-
-        #### On the SDK2 project
-
-        https://github.com/matrix-org/matrix-android-sdk2
-
-        - [ ] Create a release with GitFlow
-        - [ ] Update the value of VERSION_NAME in the file gradle.properties
-        - [ ] Update the files `./build.gradle` and `./gradle/gradle-wrapper.properties` manually, to use the latest version for the dependency. You can get inspired by the same files on Element Android project.
-        - [ ] Run the script `./tools/import_from_element.sh`
-        - [ ] Check the diff in the file `./matrix-sdk-android/build.gradle` and restore what may have been erased (in particular the line `apply plugin: "com.vanniktech.maven.publish"` and the line about the version)
-        - [ ] Let the script finish to build the library
-        - [ ] Update the file `CHANGES.md`
-        - [ ] Finish the release using GitFlow
-        - [ ] Push the branch `main`, the new tag and the branch `develop` to origin
-
-        ##### Release on MavenCentral
+        - [ ] On the [SDK2 project](https://github.com/matrix-org/matrix-android-sdk2), run the script ./tools/releaseScript.sh and follow the instructions.
 
-        - [ ] Checkout the branch `main`
-        - [ ] Run the command `./gradlew publish --no-daemon --no-parallel`. You'll need some non-public element to do so
-        - [ ] Run the command `./gradlew closeAndReleaseRepository`. If it is working well, you can jump directly to the final step of this section.
-
-        If `./gradlew closeAndReleaseRepository` fails (for instance, several repositories are waiting to be handled), you have to close and release the repository manually. Do the following steps:
+        Note: if the step `./gradlew closeAndReleaseRepository` fails (for instance, several repositories are waiting to be handled), you have to close and release the repository manually. Do the following steps:
 
         - [ ] Connect to https://s01.oss.sonatype.org
         - [ ] Click on Staging Repositories and check the the files have been uploaded
         - [ ] Click on close
         - [ ] Wait (check Activity tab until step "Repository closed" is displayed)
         - [ ] Click on release. The staging repository will disappear
 
-        Final step
-
-        - [ ] Check that the release is available in https://repo1.maven.org/maven2/org/matrix/android/matrix-android-sdk2/ (it can take a few minutes)
-
-        ##### Release on GitHub
-
-        - [ ] Create the release on GitHub from [the tag](https://github.com/matrix-org/matrix-android-sdk2/tags)
-        - [ ] Upload the AAR on the GitHub release
-
         ### Android SDK2 sample
 
         https://github.com/matrix-org/matrix-android-sdk2-sample

.github/workflows/danger.yml

@@ -11,9 +11,9 @@ jobs:
       - run: |
           npm install --save-dev @babel/plugin-transform-flow-strip-types
       - name: Danger
-        uses: danger/danger-js@11.1.3
+        uses: danger/danger-js@11.2.0
         with:
-          args: "--dangerfile tools/danger/dangerfile.js"
+          args: "--dangerfile ./tools/danger/dangerfile.js"
         env:
           DANGER_GITHUB_API_TOKEN: ${{ secrets.DANGER_GITHUB_API_TOKEN }}
           # Fallback for forks

.github/workflows/docs.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Build docs
         run: ./gradlew dokkaHtml

.github/workflows/post-pr.yml

@@ -16,7 +16,7 @@ env:
 jobs:
 
   # More info on should-i-run:
-  # If this fails to run (the IF doesn't complete) then the needs will not be satisfied for any of the 
+  # If this fails to run (the IF doesn't complete) then the needs will not be satisfied for any of the
   # other jobs below, so none will run.
   # except for the notification job at the bottom which will run all the time, unless should-i-run isn't
   # successful, or all the other jobs have succeeded
@@ -27,11 +27,12 @@ jobs:
     if: github.event.pull_request.merged # Additionally require PR to have been completely merged.
     steps:
       - run: echo "Run those tests!" # no-op success
-        
+
   ui-tests:
     name: UI Tests (Synapse)
     needs: should-i-run
     runs-on: buildjet-4vcpu-ubuntu-2204
+    timeout-minutes: 90 # We might need to increase it if the time for tests grows
     strategy:
       fail-fast: false
       matrix:
@@ -52,7 +53,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
       - name: Start synapse server
-        uses: michaelkaye/setup-matrix-synapse@v1.0.3
+        uses: michaelkaye/setup-matrix-synapse@v1.0.4
         with:
           uploadLogs: true
           httpPort: 8080
@@ -94,7 +95,7 @@ jobs:
     needs:
       - should-i-run
       - ui-tests
-    if: always() && (needs.should-i-run.result == 'success' ) && ((needs.codecov-units.result != 'success' ) || (needs.ui-tests.result != 'success') || (needs.integration-tests.result != 'success'))
+    if: always() && (needs.should-i-run.result == 'success' ) && (needs.ui-tests.result != 'success')
     # No concurrency required, runs every time on a schedule.
     steps:
       - uses: michaelkaye/matrix-hookshot-action@v1.0.0

.github/workflows/quality.yml

@@ -66,9 +66,9 @@ jobs:
           yarn add danger-plugin-lint-report --dev
       - name: Danger lint
         if: always()
-        uses: danger/danger-js@11.1.3
+        uses: danger/danger-js@11.2.0
         with:
-          args: "--dangerfile tools/danger/dangerfile-lint.js"
+          args: "--dangerfile ./tools/danger/dangerfile-lint.js"
         env:
           DANGER_GITHUB_API_TOKEN: ${{ secrets.DANGER_GITHUB_API_TOKEN }}
           # Fallback for forks

.github/workflows/tests.yml

@@ -14,6 +14,7 @@ jobs:
   tests:
     name: Runs all tests
     runs-on: buildjet-4vcpu-ubuntu-2204
+    timeout-minutes: 90 # We might need to increase it if the time for tests grows
     strategy:
       matrix:
         api-level: [28]
@@ -50,7 +51,7 @@ jobs:
       - uses: actions/setup-python@v4
         with:
           python-version: 3.8
-      - uses: michaelkaye/setup-matrix-synapse@v1.0.3
+      - uses: michaelkaye/setup-matrix-synapse@v1.0.4
         with:
           uploadLogs: true
           httpPort: 8080
@@ -126,26 +127,26 @@ jobs:
 # Unneeded as part of the test suite above, kept around in case we want to re-enable them.
 #
 #  # Build Android Tests
-#  build-android-tests: 
-#    name: Build Android Tests 
-#    runs-on: ubuntu-latest 
+#  build-android-tests:
+#    name: Build Android Tests
+#    runs-on: ubuntu-latest
 #    concurrency:
 #      group: ${{ github.ref == 'refs/heads/main' && format('unit-tests-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('unit-tests-develop-{0}', github.sha) || format('build-android-tests-{0}', github.ref) }}
 #      cancel-in-progress: true
-#    steps: 
-#      - uses: actions/checkout@v3 
-#      - uses: actions/setup-java@v3 
-#        with: 
-#          distribution: 'adopt' 
-#          java-version: 11 
-#      - uses: actions/cache@v3 
-#        with: 
-#          path: | 
-#            ~/.gradle/caches 
-#            ~/.gradle/wrapper 
-#          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} 
-#          restore-keys: | 
-#            ${{ runner.os }}-gradle- 
-#      - name: Build Android Tests  
+#    steps:
+#      - uses: actions/checkout@v3
+#      - uses: actions/setup-java@v3
+#        with:
+#          distribution: 'adopt'
+#          java-version: 11
+#      - uses: actions/cache@v3
+#        with:
+#          path: |
+#            ~/.gradle/caches
+#            ~/.gradle/wrapper
+#          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+#          restore-keys: |
+#            ${{ runner.os }}-gradle-
+#      - name: Build Android Tests
 #        run: ./gradlew clean assembleAndroidTest $CI_GRADLE_ARG_PROPERTIES
 

.github/workflows/triage-incoming.yml

@@ -10,7 +10,7 @@ jobs:
     # Skip in forks
     if: github.repository == 'vector-im/element-android'
     steps:
-      - uses: alex-page/github-project-automation-plus@bb266ff4dde9242060e2d5418e120a133586d488
+      - uses: alex-page/github-project-automation-plus@1f8873e97e3c8f58161a323b7c568c1f623a1c4d
         with:
           project: Issue triage
           column: Incoming