MESSENGER-3269 Compilability

2026-04-17 23:18:27 +02:00 · 2022-06-19 14:53:02 +02:00
parent 1ab51f37f8
commit 316d2a57bd
11 changed files with 44 additions and 69 deletions
--- a/Config/AppIdentifiers.xcconfig
+++ b/Config/AppIdentifiers.xcconfig
@@ -19,7 +19,7 @@
 BUNDLE_DISPLAY_NAME = Element
 BASE_BUNDLE_IDENTIFIER = im.vector.app
 APPLICATION_GROUP_IDENTIFIER = group.im.vector
-APPLICATION_SCHEME = element
+APPLICATION_SCHEME = element 

 // Team
 DEVELOPMENT_TEAM = 7J4U792NQT
--- a/2
+++ b/2
@@ -44,7 +44,7 @@ $matrixSDKVersionSpec = $matrixSDKVersion
 end


-$matrixSDKVersionSpec = { :git => 'https://dl-gitlab.example.com/bwmessenger/ios-matrix-sdk', :tag => 'v0.23.3_bwi' }
+$matrixSDKVersionSpec = { :git => 'https://dl-gitlab.example.com/bwmessenger/ios-matrix-sdk', :tag => 'v0.33.8_bwi_beta' }

 # Method to import the MatrixSDK
 def import_MatrixSDK
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -39,6 +39,7 @@ PODS:
    - DTFoundation/Core
  - DTFoundation/UIKit (1.7.18):
    - DTFoundation/Core
+  - DTTJailbreakDetection (0.4.0)
  - ffmpeg-kit-ios-audio (4.5.1)
  - FLEX (4.5.0)
  - FlowCommoniOS (1.12.2)
@@ -57,6 +58,9 @@ PODS:
  - LoggerAPI (1.9.200):
    - Logging (~> 1.1)
  - Logging (1.4.0)
+  - MatomoTracker (7.4.1):
+    - MatomoTracker/Core (= 7.4.1)
+  - MatomoTracker/Core (7.4.1)
  - MatrixSDK (0.23.8):
    - MatrixSDK/Core (= 0.23.8)
  - MatrixSDK/Core (0.23.8):
@@ -109,6 +113,7 @@ DEPENDENCIES:
  - DSBottomSheet (~> 0.3)
  - DSWaveformImage (~> 6.1.1)
  - DTCoreText (~> 1.6.25)
+  - DTTJailbreakDetection (~> 0.4.0)
  - ffmpeg-kit-ios-audio (= 4.5.1)
  - FLEX (~> 4.5.0)
  - FlowCommoniOS (~> 1.12.0)
@@ -117,8 +122,9 @@ DEPENDENCIES:
  - KeychainAccess (~> 4.2.2)
  - KTCenterFlowLayout (~> 1.3.1)
  - libPhoneNumber-iOS (~> 0.9.13)
-  - MatrixSDK (= 0.23.8)
-  - MatrixSDK/JingleCallStack (= 0.23.8)
+  - MatomoTracker (~> 7.4.1)
+  - MatrixSDK (from `https://dl-gitlab.example.com/bwmessenger/ios-matrix-sdk`, tag `v0.33.8_bwi_beta`)
+  - MatrixSDK/JingleCallStack (from `https://dl-gitlab.example.com/bwmessenger/ios-matrix-sdk`, tag `v0.33.8_bwi_beta`)
  - OLMKit
  - PostHog (~> 1.4.4)
  - ReadMoreTextView (~> 3.0.1)
@@ -134,8 +140,16 @@ DEPENDENCIES:
  - ZXingObjC (~> 3.6.5)

 SPEC REPOS:
-  trunk:
+  https://github.com/CocoaPods/Specs.git:
    - AFNetworking
+    - DTTJailbreakDetection
+    - GZIP
+    - JitsiMeetSDK
+    - libbase58
+    - MatomoTracker
+    - Realm
+    - SwiftyBeaver
+  trunk:
    - BlueCryptor
    - BlueECC
    - BlueRSA
@@ -149,28 +163,22 @@ SPEC REPOS:
    - FLEX
    - FlowCommoniOS
    - GBDeviceInfo
-    - GZIP
    - Introspect
-    - JitsiMeetSDK
    - KeychainAccess
    - KituraContracts
    - KTCenterFlowLayout
-    - libbase58
    - libPhoneNumber-iOS
    - LoggerAPI
    - Logging
-    - MatrixSDK
    - OLMKit
    - PostHog
    - ReadMoreTextView
-    - Realm
    - Reusable
    - SideMenu
    - SwiftBase32
    - SwiftGen
    - SwiftJWT
    - SwiftLint
-    - SwiftyBeaver
    - UICollectionViewRightAlignedLayout
    - WeakDictionary
    - zxcvbn-ios
@@ -180,11 +188,17 @@ EXTERNAL SOURCES:
  AnalyticsEvents:
    :branch: release/swift
    :git: https://github.com/matrix-org/matrix-analytics-events.git
+  MatrixSDK:
+    :git: https://dl-gitlab.example.com/bwmessenger/ios-matrix-sdk
+    :tag: v0.33.8_bwi_beta

 CHECKOUT OPTIONS:
  AnalyticsEvents:
    :commit: b275ccb194a219a61b3100159d51cadbf7c9020c
    :git: https://github.com/matrix-org/matrix-analytics-events.git
+  MatrixSDK:
+    :git: https://dl-gitlab.example.com/bwmessenger/ios-matrix-sdk
+    :tag: v0.33.8_bwi_beta

 SPEC CHECKSUMS:
  AFNetworking: 7864c38297c79aaca1500c33288e429c3451fdce
@@ -198,6 +212,7 @@ SPEC CHECKSUMS:
  DSWaveformImage: 3c718a0cf99291887ee70d1d0c18d80101d3d9ce
  DTCoreText: ec749e013f2e1f76de5e7c7634642e600a7467ce
  DTFoundation: a53f8cda2489208cbc71c648be177f902ee17536
+  DTTJailbreakDetection: 5e356c5badc17995f65a83ed9483f787a0057b71
  ffmpeg-kit-ios-audio: 662ce2064e56733ca7d8216705efbc38d9e1c3fe
  FLEX: e51461dd6f0bfb00643c262acdfea5d5d12c596b
  FlowCommoniOS: ca92071ab526dc89905495a37844fd7e78d1a7f2
@@ -212,6 +227,7 @@ SPEC CHECKSUMS:
  libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
  LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
  Logging: beeb016c9c80cf77042d62e83495816847ef108b
+  MatomoTracker: 24a846c9d3aa76933183fe9d47fd62c9efa863fb
  MatrixSDK: 6261d356de664b6245bb8697634038ca58f72a04
  OLMKit: 9fb4799c4a044dd2c06bda31ec31a12191ad30b5
  PostHog: 4b6321b521569092d4ef3a02238d9435dbaeb99f
@@ -229,6 +245,6 @@ SPEC CHECKSUMS:
  zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
  ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb

-PODFILE CHECKSUM: e860e1985e566efae3e629401c255070dd5278a7
+PODFILE CHECKSUM: cc4f744a2e7971be226ada6b2fcdb3f2f8873387

-COCOAPODS: 1.11.2
+COCOAPODS: 1.11.3
--- a/Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme
+++ b/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"
--- a/Riot/Generated/Images.swift
+++ b/Riot/Generated/Images.swift
@@ -40,6 +40,9 @@ internal class Asset: NSObject {
    internal static let authenticationSsoIconGoogle = ImageAsset(name: "authentication_sso_icon_google")
    internal static let authenticationSsoIconTwitter = ImageAsset(name: "authentication_sso_icon_twitter")
    internal static let authenticationTermsIcon = ImageAsset(name: "authentication_terms_icon")
+    internal static let birthdayCake = ImageAsset(name: "birthday_cake")
+    internal static let fileAttachmentIcon = ImageAsset(name: "file_attachment_icon")
+    internal static let fileScanInfected = ImageAsset(name: "file_scan_infected")
    internal static let callAudioMuteOffIcon = ImageAsset(name: "call_audio_mute_off_icon")
    internal static let callAudioMuteOnIcon = ImageAsset(name: "call_audio_mute_on_icon")
    internal static let callAudioRouteBuiltin = ImageAsset(name: "call_audio_route_builtin")
--- a/Riot/Modules/Application/AppCoordinator.swift
+++ b/Riot/Modules/Application/AppCoordinator.swift
@@ -88,8 +88,10 @@ final class AppCoordinator: NSObject, AppCoordinatorType {
        // Setup navigation router store
        _ = NavigationRouterStore.shared
        
+    #if LOCATION
        // Setup user location services
        _ = UserLocationServiceProvider.shared
+    #endif
        
        if BuildSettings.enableSideMenu {
            self.addSideMenu()
--- a/Riot/Modules/Onboarding/OnboardingCoordinator.swift
+++ b/Riot/Modules/Onboarding/OnboardingCoordinator.swift
@@ -168,7 +168,7 @@ final class OnboardingCoordinator: NSObject, OnboardingCoordinatorProtocol {
    /// Displays the next view in the flow after the splash screen.
    private func bwiSplashScreenCoordinator(_ coordinator: OnboardingBwiSplashScreenCoordinator, didCompleteWith result: OnboardingBwiSplashScreenViewModelResult) {
        // splashScreenResult = result
-        showAuthenticationScreen()
+        showLegacyAuthenticationScreen()
    }
    
    /// Displays the next view in the flow after the splash screen.
--- a/Riot/Modules/Room/RoomCoordinator.swift
+++ b/Riot/Modules/Room/RoomCoordinator.swift
@@ -260,6 +260,8 @@ final class RoomCoordinator: NSObject, RoomCoordinatorProtocol {
    
    private func showLiveLocationViewer(for roomId: String) {
        
+        #if LOCATION
+        
        guard let mxSession = self.mxSession, let navigationRouter = self.navigationRouter else {
            return
        }
@@ -285,6 +287,8 @@ final class RoomCoordinator: NSObject, RoomCoordinatorProtocol {
        
        navigationRouter.present(coordinator, animated: true)
        coordinator.start()
+        
+        #endif
    }
    
    private func stopLiveLocationSharing(forBeaconInfoEventId beaconInfoEventId: String? = nil, inRoomWithId roomId: String) {
--- a/Riot/target-messenger.yml
+++ b/Riot/target-messenger.yml
@@ -43,6 +43,7 @@ targets:
    - target: RiotNSE
    - target: DesignKit
    - target: CommonKit
+    - package: OrderedCollections

    configFiles:
      Debug: Debug.xcconfig
@@ -67,6 +68,7 @@ targets:
      - "**/Test/**"
      - "Room/LocationSharing/*"
      - "Room/StaticLocationSharingViewer/*"
+      - "Room/LiveLocationSharingViewer/*"
    - path: ../Tools
      excludes:
        - "Logs"
@@ -84,6 +86,7 @@ targets:
        - "Modules/Room/LocationSharing/*"
        - "Modules/Room/Views/BubbleCells/Location/*"
        - "Modules/Room/Views/BubbleCells/Styles/Bubble/Cells/Location/*"
+        - "Modules/LocationSharing/*"
    - path: ../bwi
      excludes:
        - "Tests"
@@ -97,59 +100,7 @@ targets:
    - path: Assets/en.lproj/Localizable.strings
    - path: Assets/en.lproj/Vector.strings
    - path: Assets/en.lproj/Bwi.strings
-    - path: Assets/fr.lproj/InfoPlist.strings
-    - path: Assets/fr.lproj/Localizable.strings
-    - path: Assets/fr.lproj/Vector.strings
    - path: Assets/de.lproj/InfoPlist.strings
    - path: Assets/de.lproj/Localizable.strings
    - path: Assets/de.lproj/Vector.strings
    - path: Assets/de.lproj/Bwi.strings
-    - path: Assets/sq.lproj/InfoPlist.strings
-    - path: Assets/sq.lproj/Localizable.strings
-    - path: Assets/sq.lproj/Vector.strings
-    - path: Assets/vi.lproj/InfoPlist.strings
-    - path: Assets/vi.lproj/Localizable.strings
-    - path: Assets/vi.lproj/Vector.strings
-    - path: Assets/eu.lproj/InfoPlist.strings
-    - path: Assets/eu.lproj/Localizable.strings
-    - path: Assets/eu.lproj/Vector.strings
-    - path: Assets/bg.lproj/InfoPlist.strings
-    - path: Assets/bg.lproj/Localizable.strings
-    - path: Assets/bg.lproj/Vector.strings
-    - path: Assets/nl.lproj/InfoPlist.strings
-    - path: Assets/nl.lproj/Localizable.strings
-    - path: Assets/nl.lproj/Vector.strings
-    - path: Assets/ca.lproj/InfoPlist.strings
-    - path: Assets/ca.lproj/Localizable.strings
-    - path: Assets/ca.lproj/Vector.strings
-    - path: Assets/zh_Hans.lproj/InfoPlist.strings
-    - path: Assets/zh_Hans.lproj/Localizable.strings
-    - path: Assets/zh_Hans.lproj/Vector.strings
-    - path: Assets/ru.lproj/InfoPlist.strings
-    - path: Assets/ru.lproj/Localizable.strings
-    - path: Assets/ru.lproj/Vector.strings
-    - path: Assets/zh_Hant.lproj/InfoPlist.strings
-    - path: Assets/zh_Hant.lproj/Localizable.strings
-    - path: Assets/zh_Hant.lproj/Vector.strings
-    - path: Assets/es.lproj/InfoPlist.strings
-    - path: Assets/es.lproj/Localizable.strings
-    - path: Assets/es.lproj/Vector.strings
-    - path: Assets/ja.lproj/InfoPlist.strings
-    - path: Assets/ja.lproj/Localizable.strings
-    - path: Assets/ja.lproj/Vector.strings
-    - path: Assets/hu.lproj/InfoPlist.strings
-    - path: Assets/hu.lproj/Localizable.strings
-    - path: Assets/hu.lproj/Vector.strings
-    - path: Assets/pl.lproj/InfoPlist.strings
-    - path: Assets/pl.lproj/Localizable.strings
-    - path: Assets/pl.lproj/Vector.strings
-    - path: Assets/cy.lproj/InfoPlist.strings
-    - path: Assets/cy.lproj/Localizable.strings
-    - path: Assets/cy.lproj/Vector.strings
-    - path: Assets/it.lproj/InfoPlist.strings
-    - path: Assets/it.lproj/Localizable.strings
-    - path: Assets/it.lproj/Vector.strings
-    - path: Assets/et.lproj/InfoPlist.strings
-    - path: Assets/et.lproj/Localizable.strings
-    - path: Assets/et.lproj/Vector.strings
-    - path: Assets/is.lproj/Vector.strings
--- a/RiotSwiftUI/Modules/Common/Mock/MockAppScreens.swift
+++ b/RiotSwiftUI/Modules/Common/Mock/MockAppScreens.swift
@@ -20,7 +20,6 @@ import Foundation
@available(iOS 14.0, *)
 enum MockAppScreens {
    static let appScreens: [MockScreenState.Type] = [
-        MockLiveLocationSharingViewerScreenState.self,
        MockAuthenticationLoginScreenState.self,
        MockAuthenticationReCaptchaScreenState.self,
        MockAuthenticationTermsScreenState.self,
--- a/RiotSwiftUI/target.yml
+++ b/RiotSwiftUI/target.yml
@@ -38,6 +38,7 @@ targets:
      - "**/MatrixSDK/**"
      - "**/Coordinator/**"
      - "**/Test/**"
+      - "**/LiveLocationSharingViewer/**"
      - "**/LocationSharing/**"
    - path: ../Riot/Managers/AppInfo/
    - path: ../Riot/Categories/Bundle.swift