From d0b8da33c4ef0b64943f2b3071abe2d8a844bfd4 Mon Sep 17 00:00:00 2001 From: Stefan Ceriu Date: Thu, 16 Apr 2026 18:15:34 +0300 Subject: [PATCH] Manually update project and resolved packages following Renovate XcodeGen update --- ElementX.xcodeproj/project.pbxproj | 32 ++++----- .../xcshareddata/swiftpm/Package.resolved | 72 +++++++++---------- .../Analytics/PostHogAnalyticsClient.swift | 3 +- .../Analytics/UserPropertiesExt.swift | 8 ++- UnitTests/Sources/AnalyticsTests.swift | 15 ++-- 5 files changed, 72 insertions(+), 58 deletions(-) diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj index 2d9fdda26..777942408 100644 --- a/ElementX.xcodeproj/project.pbxproj +++ b/ElementX.xcodeproj/project.pbxproj @@ -2034,7 +2034,7 @@ 4A5B4CD611DE7E94F5BA87B2 /* AppLockTimerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppLockTimerTests.swift; sourceTree = ""; }; 4AB29A2D95D3469B5F016655 /* SecureBackupControllerMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecureBackupControllerMock.swift; sourceTree = ""; }; 4AC3F28DECDF8665E8EBC76E /* ClassicAppMediaLoaderTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClassicAppMediaLoaderTests.swift; sourceTree = ""; }; - 4B1F71AC585827E6C416C15A /* AppIcon.icon */ = {isa = PBXFileReference; lastKnownFileType = wrapper.icon; path = AppIcon.icon; sourceTree = ""; }; + 4B1F71AC585827E6C416C15A /* AppIcon.icon */ = {isa = PBXFileReference; path = AppIcon.icon; sourceTree = ""; }; 4B2B564CA6570E1487A7C7CC /* SpaceRoomListProxy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpaceRoomListProxy.swift; sourceTree = ""; }; 4B2D4EEBE8C098BBADD10939 /* SecureBackupKeyBackupScreenCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecureBackupKeyBackupScreenCoordinator.swift; sourceTree = ""; }; 4B41FABA2B0AEF4389986495 /* LoginMode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginMode.swift; sourceTree = ""; }; @@ -7346,6 +7346,7 @@ }; }; buildConfigurationList = 7AE41FCCF9D1352E2770D1F9 /* Build configuration list for PBXProject "ElementX" */; + compatibilityVersion = "Xcode 14.0"; developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( @@ -7423,7 +7424,6 @@ C89CF7729E028671C5DC461E /* XCLocalSwiftPackageReference "compound-ios" */, ); preferredProjectObjectVersion = 77; - productRefGroup = 681566846AF307E9BA4C72C6 /* Products */; projectDirPath = ""; projectRoot = ""; targets = ( @@ -10023,7 +10023,7 @@ repositoryURL = "https://github.com/maplibre/maplibre-gl-native-distribution"; requirement = { kind = upToNextMinorVersion; - minimumVersion = 6.22.1; + minimumVersion = 6.25.0; }; }; 395DE6AE429B7ACC7C7FE31D /* XCRemoteSwiftPackageReference "KZFileWatchers" */ = { @@ -10039,7 +10039,7 @@ repositoryURL = "https://github.com/apple/swift-async-algorithms"; requirement = { kind = upToNextMinorVersion; - minimumVersion = 1.1.1; + minimumVersion = 1.1.3; }; }; 4BDA7F6042968E8422470F3F /* XCRemoteSwiftPackageReference "LoremSwiftum" */ = { @@ -10055,7 +10055,7 @@ repositoryURL = "https://github.com/dmrschmidt/DSWaveformImage"; requirement = { kind = exactVersion; - version = 14.2.2; + version = 14.3.0; }; }; 61916C63E3F5BD900F08DA0C /* XCRemoteSwiftPackageReference "KeychainAccess" */ = { @@ -10071,7 +10071,7 @@ repositoryURL = "https://github.com/ReactKit/SwiftState"; requirement = { kind = upToNextMinorVersion; - minimumVersion = 6.0.0; + minimumVersion = 6.0.1; }; }; 6FC4820D8D4559CEECA064D7 /* XCRemoteSwiftPackageReference "matrix-rust-components-swift" */ = { @@ -10103,7 +10103,7 @@ repositoryURL = "https://github.com/element-hq/element-call-swift"; requirement = { kind = exactVersion; - version = 0.17.0; + version = 0.19.1; }; }; 821C67C9A7F8CC3FD41B28B4 /* XCRemoteSwiftPackageReference "emojibase-bindings" */ = { @@ -10127,7 +10127,7 @@ repositoryURL = "https://github.com/PostHog/posthog-ios"; requirement = { kind = upToNextMinorVersion; - minimumVersion = 3.37.1; + minimumVersion = 3.53.1; }; }; A08925A9D5E3770DEB9D8509 /* XCRemoteSwiftPackageReference "sentry-cocoa" */ = { @@ -10135,7 +10135,7 @@ repositoryURL = "https://github.com/getsentry/sentry-cocoa"; requirement = { kind = upToNextMinorVersion; - minimumVersion = 9.2.0; + minimumVersion = 9.10.0; }; }; AB8E808A59756170682BEC20 /* XCRemoteSwiftPackageReference "SwiftSoup" */ = { @@ -10143,7 +10143,7 @@ repositoryURL = "https://github.com/scinfu/SwiftSoup.git"; requirement = { kind = upToNextMinorVersion; - minimumVersion = 2.11.2; + minimumVersion = 2.13.4; }; }; AC3475112CA40C2C6E78D1EB /* XCRemoteSwiftPackageReference "matrix-analytics-events" */ = { @@ -10151,7 +10151,7 @@ repositoryURL = "https://github.com/matrix-org/matrix-analytics-events"; requirement = { kind = upToNextMinorVersion; - minimumVersion = 0.30.0; + minimumVersion = 0.33.2; }; }; CCD235515AFCEE6D2005B705 /* XCRemoteSwiftPackageReference "LRUCache" */ = { @@ -10159,7 +10159,7 @@ repositoryURL = "https://github.com/nicklockwood/LRUCache"; requirement = { kind = upToNextMinorVersion; - minimumVersion = 1.2.0; + minimumVersion = 1.2.1; }; }; D283517192CAC3E2E6920765 /* XCRemoteSwiftPackageReference "Kingfisher" */ = { @@ -10167,7 +10167,7 @@ repositoryURL = "https://github.com/onevcat/Kingfisher"; requirement = { kind = upToNextMinorVersion; - minimumVersion = 8.6.2; + minimumVersion = 8.8.1; }; }; D5F7D47BBAAE0CF1DDEB3034 /* XCRemoteSwiftPackageReference "DeviceKit" */ = { @@ -10175,7 +10175,7 @@ repositoryURL = "https://github.com/devicekit/DeviceKit"; requirement = { kind = upToNextMinorVersion; - minimumVersion = 5.7.0; + minimumVersion = 5.8.0; }; }; E025F19D013D9BA6C58B37F4 /* XCRemoteSwiftPackageReference "swift-algorithms" */ = { @@ -10223,7 +10223,7 @@ repositoryURL = "https://github.com/element-hq/matrix-rich-text-editor-swift"; requirement = { kind = exactVersion; - version = 2.41.0; + version = 2.41.3; }; }; F76A08D0EA29A07A54F4EB4D /* XCRemoteSwiftPackageReference "swift-collections" */ = { @@ -10231,7 +10231,7 @@ repositoryURL = "https://github.com/apple/swift-collections"; requirement = { kind = upToNextMinorVersion; - minimumVersion = 1.3.0; + minimumVersion = 1.4.1; }; }; /* End XCRemoteSwiftPackageReference section */ diff --git a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 017b6cdcf..6777c3115 100644 --- a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "dad0d8e022a803126d1d3bd96acac1bf5e468fc5255c545f72595f09ad676aa5", + "originHash" : "1e03c1b854373ce381867992f96bc01053c751e626cb7adc9335d3bb805c3bae", "pins" : [ { "identity" : "compound-design-tokens", @@ -15,8 +15,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/devicekit/DeviceKit", "state" : { - "revision" : "581df61650bc457ec00373a592a84be3e7468eb1", - "version" : "5.7.0" + "revision" : "56b997e8a61707218f9af09f32b2a1d1806fd792", + "version" : "5.8.0" } }, { @@ -24,8 +24,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/dmrschmidt/DSWaveformImage", "state" : { - "revision" : "4c56578ee10128ee2b2c04c9c5aa73812de722db", - "version" : "14.2.2" + "revision" : "a7a96cf4478c6fa084e76c175bcf7f4c9a38f80a", + "version" : "14.3.0" } }, { @@ -60,8 +60,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/element-hq/element-call-swift", "state" : { - "revision" : "cb17195afeaa0f848b19307e0cb2a99afa9648ca", - "version" : "0.17.0" + "revision" : "a3d224d8c0983c7227bf8a8f1661b9984a0a9e35", + "version" : "0.19.1" } }, { @@ -95,8 +95,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/onevcat/Kingfisher", "state" : { - "revision" : "d30a5fad881137e2267f96a8e3fc35c58999bb94", - "version" : "8.6.2" + "revision" : "c152c1915f60c51e4afa0752656993ee5b3c63db", + "version" : "8.8.1" } }, { @@ -122,8 +122,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/nicklockwood/LRUCache", "state" : { - "revision" : "0d91406ecd4d6c1c56275866f00508d9aeacc92a", - "version" : "1.2.0" + "revision" : "cb5b2bd0da83ad29c0bec762d39f41c8ad0eaf3e", + "version" : "1.2.1" } }, { @@ -131,8 +131,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/maplibre/maplibre-gl-native-distribution", "state" : { - "revision" : "fa12216f30833c2b4d897714f7c1ca2f5608f685", - "version" : "6.22.1" + "revision" : "e0ee2c11a2859e22d3f0dd29705c18169bdafa7b", + "version" : "6.25.0" } }, { @@ -140,8 +140,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/matrix-org/matrix-analytics-events", "state" : { - "revision" : "cb37ee194ba298695abf10e982ef603eee06add9", - "version" : "0.30.0" + "revision" : "03a16cc5a365b7a1390fb953017205653f81d647", + "version" : "0.33.2" } }, { @@ -149,8 +149,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/element-hq/matrix-rich-text-editor-swift", "state" : { - "revision" : "5f703d05bbf39f3026cc3c0697aab753a71fd83b", - "version" : "2.41.0" + "revision" : "e63cbc50e46d5ae94f1b4013bbb3cb6e898aabb9", + "version" : "2.41.3" } }, { @@ -180,13 +180,22 @@ "version" : "0.8.4" } }, + { + "identity" : "plcrashreporter", + "kind" : "remoteSourceControl", + "location" : "https://github.com/microsoft/plcrashreporter.git", + "state" : { + "revision" : "0254f941c646b1ed17b243654723d0f071e990d0", + "version" : "1.12.2" + } + }, { "identity" : "posthog-ios", "kind" : "remoteSourceControl", "location" : "https://github.com/PostHog/posthog-ios", "state" : { - "revision" : "3f80c969c17c7fa32518feb66f3eed63613639d0", - "version" : "3.37.1" + "revision" : "07c35c23435160ae20e17201be35772eaf49f6cb", + "version" : "3.53.1" } }, { @@ -194,8 +203,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/getsentry/sentry-cocoa", "state" : { - "revision" : "de66bd4fa0661c81455e8ad2509ed6f0e39025dc", - "version" : "9.2.0" + "revision" : "3a22ecd00ad1398747bfd587e44df82716908dd3", + "version" : "9.10.0" } }, { @@ -221,17 +230,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-async-algorithms", "state" : { - "revision" : "6c050d5ef8e1aa6342528460db614e9770d7f804", - "version" : "1.1.1" - } - }, - { - "identity" : "swift-atomics", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-atomics.git", - "state" : { - "revision" : "b601256eab081c0f92f059e12818ac1d4f178ff7", - "version" : "1.3.0" + "revision" : "9d349bcc328ac3c31ce40e746b5882742a0d1272", + "version" : "1.1.3" } }, { @@ -248,8 +248,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-collections", "state" : { - "revision" : "7b847a3b7008b2dc2f47ca3110d8c782fb2e5c7e", - "version" : "1.3.0" + "revision" : "6675bc0ff86e61436e615df6fc5174e043e57924", + "version" : "1.4.1" } }, { @@ -311,8 +311,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/scinfu/SwiftSoup.git", "state" : { - "revision" : "d86f244ed497d48012782e2f59c985a55e77b3f5", - "version" : "2.11.3" + "revision" : "6c7915e16f729857aec3e99068c361e58a00ed68", + "version" : "2.13.4" } }, { diff --git a/ElementX/Sources/Services/Analytics/PostHogAnalyticsClient.swift b/ElementX/Sources/Services/Analytics/PostHogAnalyticsClient.swift index 1d13d409a..123118496 100644 --- a/ElementX/Sources/Services/Analytics/PostHogAnalyticsClient.swift +++ b/ElementX/Sources/Services/Analytics/PostHogAnalyticsClient.swift @@ -79,7 +79,8 @@ class PostHogAnalyticsClient: AnalyticsClientProtocol { } // Merge the updated user properties with the existing ones - self.pendingUserProperties = AnalyticsEvent.UserProperties(allChatsActiveFilter: userProperties.allChatsActiveFilter ?? pendingUserProperties.allChatsActiveFilter, + self.pendingUserProperties = AnalyticsEvent.UserProperties(URLPreviewsEnabled: nil, + allChatsActiveFilter: userProperties.allChatsActiveFilter ?? pendingUserProperties.allChatsActiveFilter, ftueUseCaseSelection: userProperties.ftueUseCaseSelection ?? pendingUserProperties.ftueUseCaseSelection, numFavouriteRooms: userProperties.numFavouriteRooms ?? pendingUserProperties.numFavouriteRooms, numSpaces: userProperties.numSpaces ?? pendingUserProperties.numSpaces, diff --git a/ElementX/Sources/Services/Analytics/UserPropertiesExt.swift b/ElementX/Sources/Services/Analytics/UserPropertiesExt.swift index 6e8b6a109..b372bf18a 100644 --- a/ElementX/Sources/Services/Analytics/UserPropertiesExt.swift +++ b/ElementX/Sources/Services/Analytics/UserPropertiesExt.swift @@ -33,6 +33,12 @@ extension AnalyticsEvent { nil } - return UserProperties(allChatsActiveFilter: nil, ftueUseCaseSelection: nil, numFavouriteRooms: nil, numSpaces: nil, recoveryState: analyticsRecoveryState, verificationState: analyticsVerificationState) + return UserProperties(URLPreviewsEnabled: nil, + allChatsActiveFilter: nil, + ftueUseCaseSelection: nil, + numFavouriteRooms: nil, + numSpaces: nil, + recoveryState: analyticsRecoveryState, + verificationState: analyticsVerificationState) } } diff --git a/UnitTests/Sources/AnalyticsTests.swift b/UnitTests/Sources/AnalyticsTests.swift index b6f820abc..f740d7106 100644 --- a/UnitTests/Sources/AnalyticsTests.swift +++ b/UnitTests/Sources/AnalyticsTests.swift @@ -127,7 +127,8 @@ final class AnalyticsTests { #expect(client.pendingUserProperties == nil, "No user properties should have been set yet.") // When updating the user properties - client.updateUserProperties(AnalyticsEvent.UserProperties(allChatsActiveFilter: nil, + client.updateUserProperties(AnalyticsEvent.UserProperties(URLPreviewsEnabled: nil, + allChatsActiveFilter: nil, ftueUseCaseSelection: .PersonalMessaging, numFavouriteRooms: 4, numSpaces: 5, recoveryState: .Disabled, verificationState: .Verified)) @@ -145,7 +146,9 @@ final class AnalyticsTests { func mergingUserProperties() { // Given a client with a cached use case user properties let client = PostHogAnalyticsClient() - client.updateUserProperties(AnalyticsEvent.UserProperties(allChatsActiveFilter: nil, ftueUseCaseSelection: .PersonalMessaging, + client.updateUserProperties(AnalyticsEvent.UserProperties(URLPreviewsEnabled: nil, + allChatsActiveFilter: nil, + ftueUseCaseSelection: .PersonalMessaging, numFavouriteRooms: nil, numSpaces: nil, recoveryState: nil, verificationState: nil)) @@ -155,7 +158,9 @@ final class AnalyticsTests { #expect(client.pendingUserProperties?.numSpaces == nil, "The number of spaces should not be set.") // When updating the number of spaced - client.updateUserProperties(AnalyticsEvent.UserProperties(allChatsActiveFilter: nil, ftueUseCaseSelection: nil, + client.updateUserProperties(AnalyticsEvent.UserProperties(URLPreviewsEnabled: nil, + allChatsActiveFilter: nil, + ftueUseCaseSelection: nil, numFavouriteRooms: 4, numSpaces: 5, recoveryState: nil, verificationState: nil)) @@ -173,7 +178,9 @@ final class AnalyticsTests { let client = PostHogAnalyticsClient(posthogFactory: MockPostHogFactory(mock: posthogMock)) try client.start(analyticsConfiguration: #require(appSettings.analyticsConfiguration)) - client.updateUserProperties(AnalyticsEvent.UserProperties(allChatsActiveFilter: nil, ftueUseCaseSelection: .PersonalMessaging, + client.updateUserProperties(AnalyticsEvent.UserProperties(URLPreviewsEnabled: nil, + allChatsActiveFilter: nil, + ftueUseCaseSelection: .PersonalMessaging, numFavouriteRooms: nil, numSpaces: nil, recoveryState: nil, verificationState: nil))