From 5cd2ccbbab8069beaa105c029a292ee89085503f Mon Sep 17 00:00:00 2001 From: Mauro Romito Date: Mon, 19 May 2025 15:16:27 +0200 Subject: [PATCH] using stable 1.18.3 snapshot testing --- ElementX.xcodeproj/project.pbxproj | 26 ++++++++++++------- .../xcshareddata/swiftpm/Package.resolved | 7 ++--- PreviewTests/Sources/PreviewTests.swift | 2 +- UITests/Sources/Application.swift | 2 +- UITests/SupportingFiles/target.yml | 11 +++++--- project.yml | 2 +- 6 files changed, 30 insertions(+), 20 deletions(-) diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj index 15a29c44c..06b6c695c 100644 --- a/ElementX.xcodeproj/project.pbxproj +++ b/ElementX.xcodeproj/project.pbxproj @@ -1212,7 +1212,7 @@ F08F7BC07CA9AEF5CD157918 /* Snapshotting.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF17EA323AD0205A6AB621AA /* Snapshotting.swift */; }; F0A26CD502C3A5868353B0FA /* ServerConfirmationScreenViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24DEE0682C95F897B6C7CB0D /* ServerConfirmationScreenViewModel.swift */; }; F0DACC95F24128A54CD537E4 /* GlobalSearchScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24B8177BD2AF45A286F5DA31 /* GlobalSearchScreen.swift */; }; - F0F82C3C848C865C3098AA52 /* SnapshotUITesting in Frameworks */ = {isa = PBXBuildFile; productRef = 4D8A8AC5F38942DAD76E02A3 /* SnapshotUITesting */; }; + F0F82C3C848C865C3098AA52 /* SnapshotTesting in Frameworks */ = {isa = PBXBuildFile; productRef = 21C83087604B154AA30E9A8F /* SnapshotTesting */; }; F103924DED414ADFE398CE99 /* RoomPollsHistoryScreenViewModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = A130A2251A15A7AACC84FD37 /* RoomPollsHistoryScreenViewModelProtocol.swift */; }; F118DD449066E594F63C697D /* RoomMemberProxyProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 32B5E17028C02DFA7DDA3931 /* RoomMemberProxyProtocol.swift */; }; F12F6BED7B6D7EE4BEE55039 /* PlainMentionBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8AE78FA0011E07920AE83135 /* PlainMentionBuilder.swift */; }; @@ -2675,7 +2675,7 @@ 29EE1791E0AFA1ABB7F23D2F /* SwiftState in Frameworks */, 33CAC1226DFB8B5D8447D286 /* GZIP in Frameworks */, 492274DA6691EE985C2FCCAA /* Sentry in Frameworks */, - F0F82C3C848C865C3098AA52 /* SnapshotUITesting in Frameworks */, + F0F82C3C848C865C3098AA52 /* SnapshotTesting in Frameworks */, 3A64A93A651A3CB8774ADE8E /* Collections in Frameworks */, 3F327A62D233933F54F0F33A /* SwiftOGG in Frameworks */, ); @@ -6145,7 +6145,7 @@ 3853B78FB8531B83936C5DA6 /* SwiftState */, 1BCD21310B997A6837B854D6 /* GZIP */, 67E7A6F388D3BF85767609D9 /* Sentry */, - 4D8A8AC5F38942DAD76E02A3 /* SnapshotUITesting */, + 21C83087604B154AA30E9A8F /* SnapshotTesting */, BA93CD75CCE486660C9040BD /* Collections */, 3FE40E79C36E7903121E6E3B /* SwiftOGG */, ); @@ -8387,6 +8387,9 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); + OTHER_SWIFT_FLAGS = ( + "-DDEBUG", + ); PRODUCT_BUNDLE_IDENTIFIER = "${BASE_BUNDLE_IDENTIFIER}.ui.tests"; PRODUCT_NAME = UITests; SDKROOT = iphoneos; @@ -8405,6 +8408,9 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); + OTHER_SWIFT_FLAGS = ( + "-DRELEASE", + ); PRODUCT_BUNDLE_IDENTIFIER = "${BASE_BUNDLE_IDENTIFIER}.ui.tests"; PRODUCT_NAME = UITests; SDKROOT = iphoneos; @@ -8762,8 +8768,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/pointfreeco/swift-snapshot-testing"; requirement = { - kind = revision; - revision = b467f413c83e2ceba59ba798583a1c57db9700cb; + kind = upToNextMinorVersion; + minimumVersion = 1.18.3; }; }; EC6D0C817B1C21D9D096505A /* XCRemoteSwiftPackageReference "Version" */ = { @@ -8836,6 +8842,11 @@ package = 701C7BEF8F70F7A83E852DCC /* XCRemoteSwiftPackageReference "GZIP" */; productName = GZIP; }; + 21C83087604B154AA30E9A8F /* SnapshotTesting */ = { + isa = XCSwiftPackageProductDependency; + package = E9C4F3A12AA1F65C13A8C8EB /* XCRemoteSwiftPackageReference "swift-snapshot-testing" */; + productName = SnapshotTesting; + }; 290FDEDA4D764B9F7EBE55A9 /* Algorithms */ = { isa = XCSwiftPackageProductDependency; package = E025F19D013D9BA6C58B37F4 /* XCRemoteSwiftPackageReference "swift-algorithms" */; @@ -8911,11 +8922,6 @@ package = 96495DD8554E2F39D3954354 /* XCRemoteSwiftPackageReference "posthog-ios" */; productName = PostHog; }; - 4D8A8AC5F38942DAD76E02A3 /* SnapshotUITesting */ = { - isa = XCSwiftPackageProductDependency; - package = E9C4F3A12AA1F65C13A8C8EB /* XCRemoteSwiftPackageReference "swift-snapshot-testing" */; - productName = SnapshotUITesting; - }; 50009897F60FAE7D63EF5E5B /* Kingfisher */ = { isa = XCSwiftPackageProductDependency; package = D283517192CAC3E2E6920765 /* XCRemoteSwiftPackageReference "Kingfisher" */; diff --git a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 739ee8c0a..560c14db9 100644 --- a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -257,7 +257,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/swift-snapshot-testing", "state" : { - "revision" : "b467f413c83e2ceba59ba798583a1c57db9700cb" + "revision" : "1be8144023c367c5de701a6313ed29a3a10bf59b", + "version" : "1.18.3" } }, { @@ -301,8 +302,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/xctest-dynamic-overlay", "state" : { - "branch" : "test-traits", - "revision" : "ccc75ae935e2fee1b2c7d8040c21538def4310d8" + "revision" : "39de59b2d47f7ef3ca88a039dff3084688fe27f4", + "version" : "1.5.2" } } ], diff --git a/PreviewTests/Sources/PreviewTests.swift b/PreviewTests/Sources/PreviewTests.swift index 2b0153499..224868cb8 100644 --- a/PreviewTests/Sources/PreviewTests.swift +++ b/PreviewTests/Sources/PreviewTests.swift @@ -10,7 +10,7 @@ import SwiftUI import XCTest @testable import ElementX -@testable import SnapshotTestingCore +@testable import SnapshotTesting @MainActor class PreviewTests: XCTestCase { diff --git a/UITests/Sources/Application.swift b/UITests/Sources/Application.swift index 56ebb0add..f81422f62 100644 --- a/UITests/Sources/Application.swift +++ b/UITests/Sources/Application.swift @@ -5,7 +5,7 @@ // Please see LICENSE files in the repository root for full details. // -import SnapshotUITesting +import SnapshotTesting import XCTest enum Application { diff --git a/UITests/SupportingFiles/target.yml b/UITests/SupportingFiles/target.yml index e694e64e4..19320386f 100644 --- a/UITests/SupportingFiles/target.yml +++ b/UITests/SupportingFiles/target.yml @@ -39,8 +39,6 @@ targets: - package: GZIP - package: Sentry - package: SnapshotTesting - products: - - SnapshotUITesting - package: Collections - package: SwiftOGG @@ -51,8 +49,13 @@ targets: base: PRODUCT_NAME: UITests PRODUCT_BUNDLE_IDENTIFIER: ${BASE_BUNDLE_IDENTIFIER}.ui.tests - debug: - release: + configs: + # This is required to remove the $(inherited) flags + # which would prevent SnapshotTesting to be imported in UI Tests + debug: + OTHER_SWIFT_FLAGS: ["-DDEBUG"] + release: + OTHER_SWIFT_FLAGS: ["-DRELEASE"] sources: - path: ../Sources diff --git a/project.yml b/project.yml index 05122b1dc..a6cff6bf7 100644 --- a/project.yml +++ b/project.yml @@ -136,7 +136,7 @@ packages: minorVersion: 8.35.1 SnapshotTesting: url: https://github.com/pointfreeco/swift-snapshot-testing - revision: b467f413c83e2ceba59ba798583a1c57db9700cb + minorVersion: 1.18.3 SwiftState: url: https://github.com/ReactKit/SwiftState minorVersion: 6.0.0