chore: upgrade mattermost

Infomaniak · Jan 12, 2024 · 07e68e9 · 07e68e9
1 parent c7d0091
commit 07e68e9
Show file tree

Hide file tree

Showing 422 changed files with 11,632 additions and 27,536 deletions.
diff --git a/.github/workflows/build-android-beta.yml b/.github/workflows/build-android-beta.yml
@@ -5,8 +5,7 @@ on:
   push:
     branches:
       - build-beta-[0-9]+
-      - build-android-[0-9]+
-      - build-android-beta-[0-9]+
+      - build-beta-android-[0-9]+
 
 env:
   NODE_VERSION: 18.7.0

diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
@@ -1,11 +1,9 @@
 ---
 name: build-pr
 on:
-  push:
-    branches:
-      - build-pr-*
-      - build-pr-android-*
-      - build-pr-ios-*
+  pull_request:
+    types:
+      - labeled
 
 env:
   NODE_VERSION: 18.7.0
@@ -14,20 +12,25 @@ env:
 jobs:
   test:
     runs-on: ubuntu-22.04
+    if: ${{ github.event.label.name == 'Build Apps for PR' || github.event.label.name == 'Build App for iOS' || github.event.label.name == 'Build App for Android' }}
     steps:
       - name: ci/checkout-repo
         uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
       - name: ci/test
         uses: ./.github/actions/test
 
   build-ios-pr:
     runs-on: macos-12
-    if: ${{ !contains(github.ref_name, 'android') }}
+    if: ${{ github.event.label.name == 'Build Apps for PR' || github.event.label.name == 'Build App for iOS' }}
     needs:
       - test
     steps:
       - name: ci/checkout-repo
         uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
 
       - name: ci/prepare-ios-build
         uses: ./.github/actions/prepare-ios-build
@@ -43,7 +46,7 @@ jobs:
 
       - name: ci/build-ios-pr
         env:
-          BRANCH_TO_BUILD: "${{ github.ref_name }}"
+          BRANCH_TO_BUILD: "${{ github.event.pull_request.head.ref }}"
           AWS_ACCESS_KEY_ID: "${{ secrets.MM_MOBILE_PR_AWS_ACCESS_KEY_ID }}"
           AWS_SECRET_ACCESS_KEY: "${{ secrets.MM_MOBILE_PR_AWS_SECRET_ACCESS_KEY }}"
           FASTLANE_TEAM_ID: "${{ secrets.MM_MOBILE_FASTLANE_TEAM_ID }}"
@@ -64,12 +67,14 @@ jobs:
 
   build-android-pr:
     runs-on: ubuntu-22.04
-    if: ${{ !contains(github.ref_name, 'ios') }}
+    if: ${{ github.event.label.name == 'Build Apps for PR' || github.event.label.name == 'Build App for Android' }}
     needs:
       - test
     steps:
       - name: ci/checkout-repo
         uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
 
       - name: ci/prepare-android-build
         uses: ./.github/actions/prepare-android-build
@@ -81,7 +86,7 @@ jobs:
 
       - name: ci/build-android-pr
         env:
-          BRANCH_TO_BUILD: "${{ github.ref_name }}"
+          BRANCH_TO_BUILD: "${{ github.event.pull_request.head.ref }}"
           AWS_ACCESS_KEY_ID: "${{ secrets.MM_MOBILE_PR_AWS_ACCESS_KEY_ID }}"
           AWS_SECRET_ACCESS_KEY: "${{ secrets.MM_MOBILE_PR_AWS_SECRET_ACCESS_KEY }}"
           MATTERMOST_WEBHOOK_URL: "${{ secrets.MM_MOBILE_PR_MATTERMOST_WEBHOOK_URL }}"

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,6 +1,10 @@
 ---
 name: ci
 on:
+  push:
+    branches:
+      - main
+      - 'release*'
   pull_request:
 
 env:

diff --git a/.solidarity b/.solidarity
@@ -39,7 +39,7 @@
       {
         "rule": "cli",
         "binary": "pod",
-        "semver": "1.12.1",
+        "semver": "1.14.3",
         "platform": "darwin"
       }
     ],

diff --git a/NOTICE.txt b/NOTICE.txt
@@ -34,6 +34,18 @@ A spec-compliant polyfill/ponyfill for Intl.getCanonicalLocales tested by the of
 * LICENSE: MIT
 
 
+---
+
+## @formatjs/intl-listformat
+
+This product contains '@formatjs/intl-listformat' by FormatJS.
+
+This repository is the home of FormatJS and related libraries.
+
+* HOMEPAGE: https://github.com/formatjs/formatjs
+
+* LICENSE MIT
+
 ---
 
 ## @formatjs/intl-locale
@@ -302,41 +314,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
----
-
-## @nozbe/with-observables
-
-This product contains '@nozbe/with-observables' by Nozbe.
-
-A higher-order component for connecting RxJS Observables to React components.
-
-* HOMEPAGE:
-  * https://github.com/Nozbe/withObservables
-
-* LICENSE: MIT
-
-MIT License
-
-Copyright (c) Nozbe
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
 ---
 
 ## @react-native-camera-roll/camera-roll
@@ -484,48 +461,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
----
-
-## @react-native/eslint-config
-
-This product contains '@react-native/eslint-config' by Meta.	
-
-ESLint config for React Native
-
-* HOMEPAGE:	
-  * https://github.com/facebook/react-native/tree/HEAD/packages/eslint-config-react-native-community#readme
-
-* LICENSE: MIT
-
-
----
-
-## @react-native/metro-config
-
-This product contains '@react-native/metro-config' by Meta.	
-
-Config resolver and transformer for Metro.
-
-* HOMEPAGE:	
-  * https://github.com/facebook/react-native#readme
-
-* LICENSE: MIT
-
-
----
-
-## @tsconfig/react-native
-
-This product contains '@tsconfig/react-native' by TSC Base.	
-
-Hosts TSConfigs for you to extend in your apps, tuned to a particular runtime environment. Owned and improved by the community. Basically Definitely Typed for TSConfigs.
-
-* HOMEPAGE:	
-  * https://github.com/tsconfig/bases#readme
-
-* LICENSE: MIT
-
-
 ---
 
 ## @react-navigation/bottom-tabs
@@ -669,6 +604,19 @@ SOFTWARE.
 
 ---
 
+## @tsconfig/react-native
+
+This product contains a modified version of '@tsconfig/react-native' by TSC Base.
+
+Hosts TSConfigs for you to extend in your apps, tuned to a particular runtime environment.
+
+* HOMEPAGE:
+  * https://github.com/tsconfig/bases
+
+* LICENSE: MIT
+
+---
+
 ## @voximplant/react-native-foreground-service
 
 This product contains a modified version of '@voximplant/react-native-foreground-service' by Voximplant.
@@ -1385,6 +1333,41 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
 
+---
+
+## path-to-regexp
+
+This product contains 'path-to-regexp' by lastuniverse.
+
+Turn a path string such as /user/:id or /user/:id(\d+) into a regular expression
+
+* HOMEPAGE:
+  * https://github.com/lastuniverse/path-to-regex
+
+* LICENSE: MIT
+
+The MIT License (MIT)
+
+Copyright (c) 2018 Roman Surmanidze (kapa6a3er@gmail.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
 ---
 
 ## react

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -13,8 +13,8 @@ apply plugin: 'kotlin-android'
     // root = file("../")
     //   The folder where the react-native NPM package is. Default is ../node_modules/react-native
     // reactNativeDir = file("../node_modules/react-native")
-    //   The folder where the react-native Codegen package is. Default is ../node_modules/react-native-codegen
-    // codegenDir = file("../node_modules/react-native-codegen")
+    //   The folder where the react-native Codegen package is. Default is ../node_modules/@react-native/codegen
+    // codegenDir = file("../node_modules/@react-native/codegen")
     //   The cli.js file which is the React Native CLI entrypoint. Default is ../node_modules/react-native/cli.js
     // cliFile = file("../node_modules/react-native/cli.js")
     /* Variants */
@@ -98,6 +98,7 @@ def reactNativeArchitectures() {
 
 android {
     ndkVersion rootProject.ext.ndkVersion
+    buildToolsVersion rootProject.ext.buildToolsVersion
     compileSdkVersion rootProject.ext.compileSdkVersion
     namespace "com.mattermost.rnbeta"
 
@@ -184,8 +185,6 @@ android {
 }
 
 repositories {
-    jcenter()
-
     maven {
         url 'https://maven.google.com'
     }
@@ -195,8 +194,6 @@ dependencies {
     // The version of react-native is set by the React Native Gradle Plugin
     implementation("com.facebook.react:react-android")
 
-    implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
-
     debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}")
     debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
         exclude group:'com.squareup.okhttp3', module:'okhttp'
@@ -212,6 +209,7 @@ dependencies {
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4'
     implementation 'io.reactivex.rxjava3:rxjava:3.1.6'
     implementation 'io.reactivex.rxjava3:rxandroid:3.0.2'
+    implementation 'androidx.window:window-core:1.1.0'
     implementation 'androidx.window:window-rxjava3:1.0.0'
     implementation 'androidx.window:window:1.0.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
@@ -221,34 +219,29 @@ dependencies {
 
     androidTestImplementation('com.wix:detox:+')
     implementation project(':reactnativenotifications')
-    implementation project(':watermelondb')
     implementation project(':watermelondb-jsi')
-    implementation 'io.noties.markwon:core:4.6.2'
 }
 
 configurations.all {
     resolutionStrategy {
         eachDependency { DependencyResolveDetails details ->
             if (details.requested.name == 'play-services-base') {
-                details.useTarget group: details.requested.group, name: details.requested.name, version: '18.1.0'
+                details.useTarget group: details.requested.group, name: details.requested.name, version: '18.2.0'
             }
             if (details.requested.name == 'play-services-tasks') {
                 details.useTarget group: details.requested.group, name: details.requested.name, version: '18.0.2'
             }
-            if (details.requested.name == 'play-services-stats') {
-                details.useTarget group: details.requested.group, name: details.requested.name, version: '17.0.3'
-            }
             if (details.requested.name == 'play-services-basement') {
-                details.useTarget group: details.requested.group, name: details.requested.name, version: '18.1.0'
+                details.useTarget group: details.requested.group, name: details.requested.name, version: '18.2.0'
             }
             if (details.requested.name == 'okhttp') {
-                details.useTarget group: details.requested.group, name: details.requested.name, version: '4.10.0'
+                details.useTarget group: details.requested.group, name: details.requested.name, version: '4.12.0'
             }
             if (details.requested.name == 'okhttp-tls') {
-                details.useTarget group: details.requested.group, name: details.requested.name, version: '4.10.0'
+                details.useTarget group: details.requested.group, name: details.requested.name, version: '4.12.0'
             }
             if (details.requested.name == 'okhttp-urlconnection') {
-                details.useTarget group: details.requested.group, name: details.requested.name, version: '4.10.0'
+                details.useTarget group: details.requested.group, name: details.requested.name, version: '4.12.0'
             }
         }
     }

diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
@@ -7,10 +7,5 @@
     <application
         android:usesCleartextTraffic="true"
         tools:targetApi="28"
-        tools:ignore="GoogleAppIndexingWarning">
-        <activity
-            android:name="com.facebook.react.devsupport.DevSettingsActivity"
-            android:exported="false"
-        />
-    </application>
+        tools:ignore="GoogleAppIndexingWarning"/>
 </manifest>