Merge remote-tracking branch 'element/main'

# Conflicts:
#	.github/workflows/build.yml
#	.github/workflows/sync-from-external-sources.yml
#	.github/workflows/triage-labelled.yml
#	.github/workflows/triage-move-review-requests.yml
#	.github/workflows/triage-priority-bugs.yml
#	.github/workflows/update-gradle-wrapper.yml
#	README.md

Author: Neboer

.github/ISSUE_TEMPLATE/config.yml

@@ -1,7 +1,7 @@
 blank_issues_enabled: true
 contact_links:
   - name: Enhancement or feature request
-    url: https://github.com/vector-im/element-meta/discussions/categories/ideas
+    url: https://github.com/element-hq/element-meta/discussions/categories/ideas
     about: Do you have a suggestion or feature request?
   - name: Element Android Community Support
     url: https://matrix.to/#/#element-android:matrix.org

.github/ISSUE_TEMPLATE/release.yml

@@ -19,7 +19,7 @@ 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
+        - [ ] Ensure all [the required PRs](https://github.com/element-hq/element-android/pulls?q=is%3Aopen+is%3Apr+label%3AZ-NextRelease) have been merged
 
         ### Do the release
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,4 +1,4 @@
-<!-- Please read [CONTRIBUTING.md](https://github.com/vector-im/element-android/blob/develop/CONTRIBUTING.md) before submitting your pull request -->
+<!-- Please read [CONTRIBUTING.md](https://github.com/element-hq/element-android/blob/develop/CONTRIBUTING.md) before submitting your pull request -->
 
 ## Type of change
 
@@ -49,10 +49,10 @@ Uncomment this markdown table below and edit the last line `|||`:
 
 - [ ] Changes has been tested on an Android device or Android emulator with API 21
 - [ ] UI change has been tested on both light and dark themes
-- [ ] Accessibility has been taken into account. See https://github.com/vector-im/element-android/blob/develop/CONTRIBUTING.md#accessibility
+- [ ] Accessibility has been taken into account. See https://github.com/element-hq/element-android/blob/develop/CONTRIBUTING.md#accessibility
 - [ ] Pull request is based on the develop branch
-- [ ] Pull request includes a new file under ./changelog.d. See https://github.com/vector-im/element-android/blob/develop/CONTRIBUTING.md#changelog
+- [ ] Pull request includes a new file under ./changelog.d. See https://github.com/element-hq/element-android/blob/develop/CONTRIBUTING.md#changelog
 - [ ] Pull request includes screenshots or videos if containing UI changes
 - [ ] Pull request includes a [sign off](https://matrix-org.github.io/synapse/latest/development/contributing_guide.html#sign-off)
 - [ ] You've made a self review of your PR
-- [ ] If you have modified the screen flow, or added new screens to the application, you have updated the test [UiAllScreensSanityTest.allScreensTest()](https://github.com/vector-im/element-android/blob/main/vector/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt#L73)
+- [ ] If you have modified the screen flow, or added new screens to the application, you have updated the test [UiAllScreensSanityTest.allScreensTest()](https://github.com/element-hq/element-android/blob/main/vector/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt#L73)

.github/dependabot.yml

@@ -11,7 +11,7 @@ updates:
     schedule:
       interval: "weekly"
     reviewers:
-      - "vector-im/element-android-reviewers"
+      - "element-hq/element-android-reviewers"
     ignore:
       - dependency-name: "*"
   # Updates for Gradle dependencies used in the app
@@ -21,7 +21,7 @@ updates:
       interval: "daily"
     open-pull-requests-limit: 200
     reviewers:
-      - "vector-im/element-android-reviewers"
+      - "element-hq/element-android-reviewers"
     allow:
       - dependency-name: "io.element.android:wysiwyg"
       - dependency-name: "org.matrix.rustcomponents:crypto-android"

.github/workflows/build.yml

@@ -3,27 +3,20 @@ name: APK Build
 on:
   pull_request: { }
   push:
-    branches: [ main ]
+    branches: [ main, develop ]
 
 # Enrich gradle.properties for CI/CD
 env:
   GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx3072m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError -XX:MaxMetaspaceSize=1g" -Dkotlin.daemon.jvm.options="-Xmx2560m" -Dkotlin.incremental=false
   CI_GRADLE_ARG_PROPERTIES: --stacktrace -PpreDexEnable=false --max-workers 2 --no-daemon
 
+
 jobs:
-  release:
+  release-fdroid:
     name: Build release APKs (Fdroid)
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - 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: Assemble Fdroid release apk
         run: ./gradlew assembleFdroidRelease $CI_GRADLE_ARG_PROPERTIES
       - name: Upload Fdroid release APKs
@@ -32,3 +25,17 @@ jobs:
           name: vector-Fdroid-release
           path: |
             vector-app/build/outputs/apk/*/release/*.apk
+
+  release-gplay:
+    name: Build unsigned GPlay APKs
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Assemble GPlay unsigned apk
+        run: ./gradlew clean assembleGplayRelease $CI_GRADLE_ARG_PROPERTIES
+      - name: Upload Gplay unsigned APKs
+        uses: actions/upload-artifact@v3
+        with:
+          name: vector-gplay-release-unsigned
+          path: |
+            vector-app/build/outputs/apk/*/release/*.apk

AUTHORS.md

@@ -1,4 +1,4 @@
-A full developer contributors list can be found [here](https://github.com/vector-im/element-android/graphs/contributors).
+A full developer contributors list can be found [here](https://github.com/element-hq/element-android/graphs/contributors).
 
 # Core team: