Merge branch 'release/1.8.13/master'

Author: gulekismail

Config/AppVersion.xcconfig

@@ -15,5 +15,5 @@
 //
 
 // Version
-MARKETING_VERSION = 1.8.12
-CURRENT_PROJECT_VERSION = 1.8.12
+MARKETING_VERSION = 1.8.13
+CURRENT_PROJECT_VERSION = 1.8.13

Config/BuildSettings.swift

@@ -181,8 +181,8 @@ final class BuildSettings: NSObject {
     #if DEBUG
     /// The configuration to use for analytics during development. Set `isEnabled` to false to disable analytics in debug builds.
     static let analyticsConfiguration = AnalyticsConfiguration(isEnabled: BuildSettings.baseBundleIdentifier.starts(with: "im.vector.app"),
-                                                               host: "https://posthog-poc.lab.element.dev",
-                                                               apiKey: "rs-pJjsYJTuAkXJfhaMmPUNBhWliDyTKLOOxike6ck8",
+                                                               host: "https://posthog.element.dev",
+                                                               apiKey: "phc_VtA1L35nw3aeAtHIx1ayrGdzGkss7k1xINeXcoIQzXN",
                                                                termsURL: URL(string: "https://element.io/cookie-policy")!)
     #else
     /// The configuration to use for analytics. Set `isEnabled` to false to disable analytics.
@@ -294,6 +294,8 @@ final class BuildSettings: NSObject {
     static let settingsSecurityScreenShowCryptographyInfo:Bool = true
     static let settingsSecurityScreenShowCryptographyExport:Bool = true
     static let settingsSecurityScreenShowAdvancedUnverifiedDevices:Bool = true
+    /// A setting to enable the presence configuration settings section.
+    static let settingsScreenPresenceAllowConfiguration: Bool = false
 
     // MARK: - Timeline settings
     static let roomInputToolbarCompressionMode: MediaCompressionMode = .prompt

Config/CommonConfiguration.swift

@@ -39,7 +39,7 @@ class CommonConfiguration: NSObject, Configurable {
         settings.syncWithLazyLoadOfRoomMembers = true
 
         // Customize the default notification content
-        settings.notificationBodyLocalizationKey = "NOTIFICATION"
+        settings.notificationBodyLocalizationKey = "Notification"
 
         settings.messageDetailsAllowSharing = BuildSettings.messageDetailsAllowShare
         settings.messageDetailsAllowSaving = BuildSettings.messageDetailsAllowSave

Config/Project.xcconfig

@@ -37,9 +37,6 @@ DEFINES_MODULE = YES
 ENABLE_STRICT_OBJC_MSGSEND = YES
 GCC_NO_COMMON_BLOCKS = YES
 
-// Make Xcode 12 and fastlane(xcodebuild) happy while some pods are not updated
-EXCLUDED_ARCHS[sdk=iphonesimulator*] = arm64
-
 CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES
 CLANG_ANALYZER_NONNULL = YES
 CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE

Gemfile.lock

@@ -63,7 +63,7 @@ GEM
       public_suffix (~> 4.0)
       typhoeus (~> 1.0)
     cocoapods-deintegrate (1.0.5)
-    cocoapods-downloader (1.5.1)
+    cocoapods-downloader (1.6.3)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.1)

Podfile

@@ -13,7 +13,7 @@ use_frameworks!
 # - `{ :specHash => {sdk spec hash}` to depend on specific pod options (:git => …, :podspec => …) for MatrixSDK repo. Used by Fastfile during CI
 #
 # Warning: our internal tooling depends on the name of this variable name, so be sure not to change it
-$matrixSDKVersion = '= 0.23.2'
+$matrixSDKVersion = '= 0.23.3'
 # $matrixSDKVersion = :local
 # $matrixSDKVersion = { :branch => 'develop'}
 # $matrixSDKVersion = { :specHash => { git: 'https://git.io/fork123', branch: 'fix' } }
@@ -138,9 +138,6 @@ post_install do |installer|
       # Plus the app does not enable it
       config.build_settings['ENABLE_BITCODE'] = 'NO'
 
-      # Make fastlane(xcodebuild) happy by preventing it from building for arm64 simulator
-      config.build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = "arm64"
-
       # Force ReadMoreTextView to use Swift 5.2 version (as there is no code changes to perform)
       if target.name.include? 'ReadMoreTextView'
         config.build_settings['SWIFT_VERSION'] = '5.2'

Podfile.lock

@@ -46,7 +46,7 @@ PODS:
   - GBDeviceInfo/Core (6.6.0)
   - GZIP (1.3.0)
   - Introspect (0.1.4)
-  - JitsiMeetSDK (3.10.2)
+  - JitsiMeetSDK (5.0.2)
   - KeychainAccess (4.2.2)
   - KituraContracts (1.2.1):
     - LoggerAPI (~> 1.7)
@@ -56,17 +56,17 @@ PODS:
   - LoggerAPI (1.9.200):
     - Logging (~> 1.1)
   - Logging (1.4.0)
-  - MatrixSDK (0.23.2):
-    - MatrixSDK/Core (= 0.23.2)
-  - MatrixSDK/Core (0.23.2):
+  - MatrixSDK (0.23.3):
+    - MatrixSDK/Core (= 0.23.3)
+  - MatrixSDK/Core (0.23.3):
     - AFNetworking (~> 4.0.0)
     - GZIP (~> 1.3.0)
     - libbase58 (~> 0.1.4)
     - OLMKit (~> 3.2.5)
     - Realm (= 10.16.0)
     - SwiftyBeaver (= 1.9.5)
-  - MatrixSDK/JingleCallStack (0.23.2):
-    - JitsiMeetSDK (= 3.10.2)
+  - MatrixSDK/JingleCallStack (0.23.3):
+    - JitsiMeetSDK (= 5.0.2)
     - MatrixSDK/Core
   - OLMKit (3.2.5):
     - OLMKit/olmc (= 3.2.5)
@@ -115,8 +115,8 @@ DEPENDENCIES:
   - KeychainAccess (~> 4.2.2)
   - KTCenterFlowLayout (~> 1.3.1)
   - libPhoneNumber-iOS (~> 0.9.13)
-  - MatrixSDK (= 0.23.2)
-  - MatrixSDK/JingleCallStack (= 0.23.2)
+  - MatrixSDK (= 0.23.3)
+  - MatrixSDK/JingleCallStack (= 0.23.3)
   - OLMKit
   - PostHog (~> 1.4.4)
   - ReadMoreTextView (~> 3.0.1)
@@ -200,15 +200,15 @@ SPEC CHECKSUMS:
   GBDeviceInfo: ed0db16230d2fa280e1cbb39a5a7f60f6946aaec
   GZIP: 416858efbe66b41b206895ac6dfd5493200d95b3
   Introspect: b62c4dd2063072327c21d618ef2bedc3c87bc366
-  JitsiMeetSDK: 2f118fa770f23e518f3560fc224fae3ac7062223
+  JitsiMeetSDK: edcac8e2b92ee0c7f3e75bd0aefefbe9faccfc93
   KeychainAccess: c0c4f7f38f6fc7bbe58f5702e25f7bd2f65abf51
   KituraContracts: e845e60dc8627ad0a76fa55ef20a45451d8f830b
   KTCenterFlowLayout: 6e02b50ab2bd865025ae82fe266ed13b6d9eaf97
   libbase58: 7c040313537b8c44b6e2d15586af8e21f7354efd
   libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
   LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
   Logging: beeb016c9c80cf77042d62e83495816847ef108b
-  MatrixSDK: ab6cbb1e8c437eac4f999be516b5e76c2bca9f6a
+  MatrixSDK: 4a2d2ddc1bd58c63f40e14706306e1beaffea02d
   OLMKit: 9fb4799c4a044dd2c06bda31ec31a12191ad30b5
   PostHog: 4b6321b521569092d4ef3a02238d9435dbaeb99f
   ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d
@@ -225,6 +225,6 @@ SPEC CHECKSUMS:
   zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
   ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
 
-PODFILE CHECKSUM: 677ee0df159e298fde825885ea85e4ebfa8e32fd
+PODFILE CHECKSUM: 8055bae15b82bd29b1d12c64ff038fe6f86a8ca0
 
 COCOAPODS: 1.11.2

Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme

@@ -4,8 +4,7 @@
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES"
-      runPostActionsOnFailure = "NO">
+      buildImplicitDependencies = "YES">
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"