letro/letro-ios
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases 2 Wiki Activity

Add a dedicated target for SDK mocks to avoid type name conflicts on the generated code.

Browse Source
This commit is contained in:
Doug
2026-01-05 17:06:49 +00:00
committed by Doug
parent 9304c3cc65
commit a78a923b0d
34 changed files with 1241 additions and 979 deletions
Download Patch File Download Diff File Expand all files Collapse all files

150
ElementX.xcodeproj/project.pbxproj
View File

@@ -336,6 +336,7 @@
3A68752BB9D51B8713C0FC2C /* AuthenticationStartScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = A768CA51A59B8A5D8C8FD599 /* AuthenticationStartScreen.swift */; };
3A7DD0D13B0FB8876D69D829 /* TextBasedRoomTimelineTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2AB2C848BB9A7A9B618B7B89 /* TextBasedRoomTimelineTests.swift */; };
3AA9E878FDCFF85664AC071F /* ComposerDraftService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D70253004A5AEC9C73D6A4F /* ComposerDraftService.swift */; };
3B0718607B0665D163142DAE /* SDKGeneratedMocks.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C5BFCB7257F7A3CF70F5DA9 /* SDKGeneratedMocks.swift */; };
3B0F9B57D25B07E66F15762A /* MediaUploadPreviewScreenModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2E7C987AE5DC9087BB19F7D /* MediaUploadPreviewScreenModels.swift */; };
3B277D9538090766DA6C4566 /* StateRoomTimelineView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2AF1828A5B76B7C371240FE /* StateRoomTimelineView.swift */; };
3B5AB5CF8D8163599C5BF19B /* PillViewOnBubblePreviews.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2005B4AD70A792340E2694F1 /* PillViewOnBubblePreviews.swift */; };
@@ -1203,7 +1204,6 @@
D34E328E9E65904358248FDD /* GlobalSearchScreenModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 436A0D98D372B17EAE9AA999 /* GlobalSearchScreenModels.swift */; };
D38E59C48BE5499A48D12031 /* CreateRoomScreenCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64AC8FCE224D4185F28636FF /* CreateRoomScreenCoordinator.swift */; };
D3FD96913D2B1AAA3149DAC7 /* CreateRoomViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 69D42EE0102D2857933625DD /* CreateRoomViewModelTests.swift */; };
D43F0503EF2CBC55272538FE /* SDKGeneratedMocks.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2F079B5DBD0D85FEA687AAE /* SDKGeneratedMocks.swift */; };
D46C33F8B61B55F0C8C2D15F /* LocationRoomTimelineItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1B2AC540DE619B36832A5DB5 /* LocationRoomTimelineItem.swift */; };
D4CB979EB4FE26AAD9F9A72B /* UserProfileScreenModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 604A69C081B935D6A38DE6D8 /* UserProfileScreenModels.swift */; };
D4D7CCECC6C0AAFC42E165BB /* NotificationPermissionsScreenViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE9BBB18FB27F09032AD8769 /* NotificationPermissionsScreenViewModel.swift */; };
@@ -1430,6 +1430,7 @@
FC31493979ED1FDF7D5EA3F9 /* KeychainController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E36CB905A2B9EC2C92A2DA7C /* KeychainController.swift */; };
FCD3F2B82CAB29A07887A127 /* Kingfisher in Frameworks */ = {isa = PBXBuildFile; productRef = DE8DC9B3FBA402117DC4C49F /* Kingfisher */; };
FCF95603F1D056B1B106A415 /* AdvancedSettingsScreenViewModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 83E2B20431F890ED64255CA1 /* AdvancedSettingsScreenViewModelProtocol.swift */; };
FD19654C18E7C6D8AC79408D /* libMatrixRustSDKMocks.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 73F3153AB9D628110878E24F /* libMatrixRustSDKMocks.a */; };
FD29471C72872F8B7580E3E1 /* KeychainControllerMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39C0D861FC397AC34BCF089E /* KeychainControllerMock.swift */; };
FD439E183A48BE871AEEFAEA /* TimelineScrollToBottomButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = E10765FBC83B34A3BC4ADB23 /* TimelineScrollToBottomButton.swift */; };
FD573B5D665824EB79EABF06 /* Observable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5327E3B3C58BEB0E65F4CF98 /* Observable.swift */; };
@@ -1457,6 +1458,13 @@
remoteGlobalIDString = C0FAEB81CFD9776CD78CE489;
remoteInfo = ElementX;
};
2324965D972BC4812FE0F380 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = AC22997D58D612146053154D /* Project object */;
proxyType = 1;
remoteGlobalIDString = 676A87694F0F247B2AF1A142;
remoteInfo = MatrixRustSDKMocks;
};
4448BD77D7203616C4FAD26A /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = AC22997D58D612146053154D /* Project object */;
@@ -2103,6 +2111,7 @@
6B2A421198FD20AAAED20004 /* RoomChangeRolesScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomChangeRolesScreen.swift; sourceTree = "<group>"; };
6B5E29E9A22F45534FBD5B58 /* EmojiPickerScreenHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmojiPickerScreenHeaderView.swift; sourceTree = "<group>"; };
6C113E0CB7E15E9765B1817A /* EmojiProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmojiProvider.swift; sourceTree = "<group>"; };
6C5BFCB7257F7A3CF70F5DA9 /* SDKGeneratedMocks.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SDKGeneratedMocks.swift; sourceTree = "<group>"; };
6C8EC6EA7EDFCE46710DA306 /* AnalyticsPromptScreenViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnalyticsPromptScreenViewModel.swift; sourceTree = "<group>"; };
6C9651CD1066F239C7739240 /* NSEUserSession.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSEUserSession.swift; sourceTree = "<group>"; };
6CD4823EAB4B4E8BAB4F6B8C /* TimelineStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineStyle.swift; sourceTree = "<group>"; };
@@ -2141,6 +2150,7 @@
7367B3B9A8CAF902220F31D1 /* BugReportFlowCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BugReportFlowCoordinator.swift; sourceTree = "<group>"; };
739077686814E4EA339B1C83 /* RoomPreviewProxyProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomPreviewProxyProtocol.swift; sourceTree = "<group>"; };
73A5C3F7C9C1DA10CAEC6A98 /* VoiceMessageRecordingComposer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VoiceMessageRecordingComposer.swift; sourceTree = "<group>"; };
73F3153AB9D628110878E24F /* libMatrixRustSDKMocks.a */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = archive.ar; path = libMatrixRustSDKMocks.a; sourceTree = BUILT_PRODUCTS_DIR; };
73FEE625AB52042049DB9268 /* ThreadTimelineScreenCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThreadTimelineScreenCoordinator.swift; sourceTree = "<group>"; };
7447C0AD7EF302CD027D6230 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/SAS.strings; sourceTree = "<group>"; };
7463464054DDF194C54F0B04 /* LogViewerScreenViewModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LogViewerScreenViewModelProtocol.swift; sourceTree = "<group>"; };
@@ -2580,7 +2590,6 @@
C258C9C815272911A5B132C3 /* FormattedBodyText.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FormattedBodyText.swift; sourceTree = "<group>"; };
C2886615BEBAE33A0AA4D5F8 /* RoomScreenModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomScreenModels.swift; sourceTree = "<group>"; };
C2E9B841EE4878283ECDB554 /* InviteUsersScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InviteUsersScreen.swift; sourceTree = "<group>"; };
C2F079B5DBD0D85FEA687AAE /* SDKGeneratedMocks.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SDKGeneratedMocks.swift; sourceTree = "<group>"; };
C30F45308428A4D9FFDB2FB8 /* BannedRoomProxy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BannedRoomProxy.swift; sourceTree = "<group>"; };
C3285BD95B564CA2A948E511 /* OnboardingFlowCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingFlowCoordinator.swift; sourceTree = "<group>"; };
C33B3F17996DFDF5F0181512 /* Data.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Data.swift; sourceTree = "<group>"; };
@@ -2987,6 +2996,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
FD19654C18E7C6D8AC79408D /* libMatrixRustSDKMocks.a in Frameworks */,
1A70A2199394B5EC660934A5 /* MatrixRustSDK in Frameworks */,
1F3232BD368DF430AB433907 /* Compound in Frameworks */,
F656F92A63D3DC1978D79427 /* Algorithms in Frameworks */,
@@ -3941,6 +3951,7 @@
D7117C32909844BCF5AF30BA /* AccessibilityTests */,
8A9C09B6A392465E03B8D1B1 /* IntegrationTests */,
A8002CB4F20B6282850A614C /* DevelopmentAssets */,
C4212E8FD72132802765FBBB /* SDKMocks */,
2197234282B4BC0CE79AAC74 /* Secrets */,
823ED0EC3F1B6CF47D284011 /* Tools */,
9413F680ECDFB2B0DDB0DEF2 /* Packages */,
@@ -4565,6 +4576,7 @@
2363DB6162BBCC511B67B527 /* AccessibilityTests.xctest */,
4CD6AC7546E8D7E5C73CEA48 /* ElementX.app */,
9C7F7DE62D33C6A26CBFCD72 /* IntegrationTests.xctest */,
73F3153AB9D628110878E24F /* libMatrixRustSDKMocks.a */,
0D8F620C8B314840D8602E3F /* NSE.appex */,
D95E8C0EFEC0C6F96EDAA71A /* PreviewTests.xctest */,
3D8BEEFCA07BEA43F4F4BF77 /* ShareExtension.appex */,
@@ -5313,6 +5325,14 @@
path = UserProfileScreen;
sourceTree = "<group>";
};
93F8FFD5651EFD1CA6B14EE7 /* Generated */ = {
isa = PBXGroup;
children = (
6C5BFCB7257F7A3CF70F5DA9 /* SDKGeneratedMocks.swift */,
);
path = Generated;
sourceTree = "<group>";
};
9413F680ECDFB2B0DDB0DEF2 /* Packages */ = {
isa = PBXGroup;
children = (
@@ -5759,11 +5779,18 @@
isa = PBXGroup;
children = (
57916A1578D8043BB0795441 /* GeneratedMocks.swift */,
C2F079B5DBD0D85FEA687AAE /* SDKGeneratedMocks.swift */,
);
path = Generated;
sourceTree = "<group>";
};
B2D6763B5D6F9A24A468B45E /* Sources */ = {
isa = PBXGroup;
children = (
93F8FFD5651EFD1CA6B14EE7 /* Generated */,
);
path = Sources;
sourceTree = "<group>";
};
B364E08924AD15820350CDD9 /* SettingsScreen */ = {
isa = PBXGroup;
children = (
@@ -5980,6 +6007,14 @@
path = SpaceScreen;
sourceTree = "<group>";
};
C4212E8FD72132802765FBBB /* SDKMocks */ = {
isa = PBXGroup;
children = (
B2D6763B5D6F9A24A468B45E /* Sources */,
);
path = SDKMocks;
sourceTree = "<group>";
};
C45CF12DD74BF5B6C970C5E1 /* RoomDirectorySearchScreen */ = {
isa = PBXGroup;
children = (
@@ -6825,6 +6860,26 @@
productReference = AAC9344689121887B74877AF /* UnitTests.xctest */;
productType = "com.apple.product-type.bundle.unit-test";
};
676A87694F0F247B2AF1A142 /* MatrixRustSDKMocks */ = {
isa = PBXNativeTarget;
buildConfigurationList = 4272AFBE93EEF7B03D9B9ECD /* Build configuration list for PBXNativeTarget "MatrixRustSDKMocks" */;
buildPhases = (
D20011C9306392A289C64906 /* Sources */,
EEBD406C220723F202A4F31D /* Copy Swift Objective-C Interface Header */,
);
buildRules = (
);
dependencies = (
BE5BE6377A4171172FBD4D9A /* PBXTargetDependency */,
);
name = MatrixRustSDKMocks;
packageProductDependencies = (
DB9D6197EEDBA2CC860208E2 /* MatrixRustSDK */,
);
productName = MatrixRustSDKMocks;
productReference = 73F3153AB9D628110878E24F /* libMatrixRustSDKMocks.a */;
productType = "com.apple.product-type.library.static";
};
7A17BE29BAC81ADBAC6349D9 /* PreviewTests */ = {
isa = PBXNativeTarget;
buildConfigurationList = DA320DCEE4CFFAF3A564D280 /* Build configuration list for PBXNativeTarget "PreviewTests" */;
@@ -6889,6 +6944,7 @@
dependencies = (
2C29670603B37E38705D5FF1 /* PBXTargetDependency */,
58C473A5DEA945AACFEA8E9F /* PBXTargetDependency */,
2E32BC489F482046B8B1460F /* PBXTargetDependency */,
);
name = ElementX;
packageProductDependencies = (
@@ -6998,6 +7054,9 @@
32C23C8D224D46EFE62AFAD0 = {
DevelopmentTeam = 7J4U792NQT;
};
676A87694F0F247B2AF1A142 = {
DevelopmentTeam = 7J4U792NQT;
};
7A17BE29BAC81ADBAC6349D9 = {
DevelopmentTeam = 7J4U792NQT;
};
@@ -7102,6 +7161,7 @@
C0C687DE1D270F9895FEE186 /* AccessibilityTests */,
C0FAEB81CFD9776CD78CE489 /* ElementX */,
D3DB351B7FBE0F49649171FC /* IntegrationTests */,
676A87694F0F247B2AF1A142 /* MatrixRustSDKMocks */,
FEB53A5BC378C913769656D8 /* NSE */,
F8E276FD6DC43EADB85241BC /* Periphery */,
7A17BE29BAC81ADBAC6349D9 /* PreviewTests */,
@@ -7356,6 +7416,22 @@
shellPath = /bin/sh;
shellScript = "export PATH=\"$PATH:/opt/homebrew/bin\"\nif which sourcery >/dev/null; then\n sourcery --config Tools/Sourcery/TestablePreviewsDictionary.yml\n sourcery --config Tools/Sourcery/AccessibilityTests.yml\nelse\n echo \"warning: Sourcery not installed, run swift run tools setup-project\"\nfi\n";
};
EEBD406C220723F202A4F31D /* Copy Swift Objective-C Interface Header */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"$(DERIVED_SOURCES_DIR)/$(SWIFT_OBJC_INTERFACE_HEADER_NAME)",
);
name = "Copy Swift Objective-C Interface Header";
outputPaths = (
"$(BUILT_PRODUCTS_DIR)/include/$(PRODUCT_MODULE_NAME)/$(SWIFT_OBJC_INTERFACE_HEADER_NAME)",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "ditto \"${SCRIPT_INPUT_FILE_0}\" \"${SCRIPT_OUTPUT_FILE_0}\"\n";
};
/* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
@@ -8381,7 +8457,6 @@
AD55E245FE686D7DB4C86406 /* RoomTimelineItemView.swift in Sources */,
41CE5E1289C8768FC5B6490C /* RoomTimelineItemViewState.swift in Sources */,
B2F8E01ABA1BA30265B4ECBE /* RoundedCornerShape.swift in Sources */,
D43F0503EF2CBC55272538FE /* SDKGeneratedMocks.swift in Sources */,
3F55721B5C08E8D9F1295592 /* SDKListener.swift in Sources */,
88CBF1595E39CE697928DE48 /* SFNumberedListView.swift in Sources */,
FB595EC9C00AB32F39034055 /* SceneDelegate.swift in Sources */,
@@ -8705,6 +8780,14 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
D20011C9306392A289C64906 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
3B0718607B0665D163142DAE /* SDKGeneratedMocks.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
D831C59C840FB7B2C1C028A0 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
@@ -8732,6 +8815,11 @@
target = FEB53A5BC378C913769656D8 /* NSE */;
targetProxy = AE0C21E7E01A23610E54DF9D /* PBXContainerItemProxy */;
};
2E32BC489F482046B8B1460F /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 676A87694F0F247B2AF1A142 /* MatrixRustSDKMocks */;
targetProxy = 2324965D972BC4812FE0F380 /* PBXContainerItemProxy */;
};
421359F1BC0A1816DD34A2BB /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = C0FAEB81CFD9776CD78CE489 /* ElementX */;
@@ -8757,6 +8845,10 @@
target = C0FAEB81CFD9776CD78CE489 /* ElementX */;
targetProxy = 889C131F86E6415074D382B9 /* PBXContainerItemProxy */;
};
BE5BE6377A4171172FBD4D9A /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
productRef = DB9D6197EEDBA2CC860208E2 /* MatrixRustSDK */;
};
/* End PBXTargetDependency section */
/* Begin PBXVariantGroup section */
@@ -8935,6 +9027,20 @@
/* End PBXVariantGroup section */
/* Begin XCBuildConfiguration section */
2DFF6BC8513E455947420CEA /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_NAME = MatrixRustSDKMocks;
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Release;
};
2F9917BC52CB6F9FFACE9D64 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
@@ -9020,6 +9126,20 @@
};
name = Debug;
};
53B6D5892165E771A8489F9D /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_NAME = MatrixRustSDKMocks;
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
};
584E20C1DA5831E0694FE350 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
@@ -9041,6 +9161,10 @@
"@executable_path/Frameworks",
);
MARKETING_VERSION = "$(MARKETING_VERSION)";
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
);
OTHER_SWIFT_FLAGS = (
"-DIS_MAIN_APP",
);
@@ -9069,6 +9193,10 @@
"@executable_path/Frameworks",
);
MARKETING_VERSION = "$(MARKETING_VERSION)";
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
);
OTHER_SWIFT_FLAGS = (
"-DIS_MAIN_APP",
);
@@ -9437,6 +9565,15 @@
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
4272AFBE93EEF7B03D9B9ECD /* Build configuration list for PBXNativeTarget "MatrixRustSDKMocks" */ = {
isa = XCConfigurationList;
buildConfigurations = (
53B6D5892165E771A8489F9D /* Debug */,
2DFF6BC8513E455947420CEA /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Debug;
};
79663128986C62EFAC289176 /* Build configuration list for PBXNativeTarget "UnitTests" */ = {
isa = XCConfigurationList;
buildConfigurations = (
@@ -10056,6 +10193,11 @@
package = AC3475112CA40C2C6E78D1EB /* XCRemoteSwiftPackageReference "matrix-analytics-events" */;
productName = AnalyticsEvents;
};
DB9D6197EEDBA2CC860208E2 /* MatrixRustSDK */ = {
isa = XCSwiftPackageProductDependency;
package = 6FC4820D8D4559CEECA064D7 /* XCRemoteSwiftPackageReference "matrix-rust-components-swift" */;
productName = MatrixRustSDK;
};
DCA3C4A997AD28E6918D4CE5 /* Compound */ = {
isa = XCSwiftPackageProductDependency;
productName = Compound;

1
ElementX/Sources/Mocks/AuthenticationClientBuilderFactoryMock.swift
View File

@@ -8,6 +8,7 @@
import Foundation
import MatrixRustSDK
import MatrixRustSDKMocks
extension AuthenticationClientFactoryMock {
struct Configuration {

1
ElementX/Sources/Mocks/ClientProxyMock.swift
View File

@@ -8,6 +8,7 @@
import Combine
import Foundation
import MatrixRustSDKMocks
struct ClientProxyMockConfiguration {
var homeserver = ""

1
ElementX/Sources/Mocks/NotificationItemProxyMock.swift
View File

@@ -7,6 +7,7 @@
import Foundation
import MatrixRustSDK
import MatrixRustSDKMocks
struct NotificationItemProxyMockConfiguration {
var event: NotificationEvent? = {

1
ElementX/Sources/Mocks/RoomSummaryProviderMock.swift
View File

@@ -8,6 +8,7 @@
import Combine
import Foundation
import MatrixRustSDKMocks
enum RoomSummaryProviderMockConfigurationState {
case loading

1
ElementX/Sources/Mocks/SDK/ClientSDKMock.swift
View File

@@ -8,6 +8,7 @@
import Foundation
import MatrixRustSDK
import MatrixRustSDKMocks
extension ClientSDKMock {
struct Configuration {

1
ElementX/Sources/Mocks/SDK/EventTimelineItem.swift
View File

@@ -9,6 +9,7 @@
import Foundation
import LoremSwiftum
import MatrixRustSDK
import MatrixRustSDKMocks
struct EventTimelineItemSDKMockConfiguration {
var eventID: String = UUID().uuidString

1
ElementX/Sources/Mocks/SDK/GrantLoginWithQrCodeHandlerSDKMock.swift
View File

@@ -7,6 +7,7 @@
import Foundation
import MatrixRustSDK
import MatrixRustSDKMocks
extension GrantLoginWithQrCodeHandlerSDKMock {
struct Configuration {

1
ElementX/Sources/Mocks/SDK/IdentityResetHandleSDKMock.swift
View File

@@ -8,6 +8,7 @@
import Foundation
import MatrixRustSDK
import MatrixRustSDKMocks
extension IdentityResetHandleSDKMock {
struct Configuration { }

1
ElementX/Sources/Mocks/SDK/LeaveSpaceHandleSDKMock.swift
View File

@@ -8,6 +8,7 @@
import Foundation
import MatrixRustSDK
import MatrixRustSDKMocks
extension LeaveSpaceHandleSDKMock {
struct Configuration {

1
ElementX/Sources/Mocks/SpaceServiceProxyMock.swift
View File

@@ -9,6 +9,7 @@
import Combine
import Foundation
import MatrixRustSDK
import MatrixRustSDKMocks
extension SpaceServiceProxyMock {
struct Configuration {

1
ElementX/Sources/Mocks/TimelineProviderMock.swift
View File

@@ -9,6 +9,7 @@
import Combine
import Foundation
import MatrixRustSDK
import MatrixRustSDKMocks
@MainActor
class AutoUpdatingTimelineItemProviderMock: TimelineItemProvider {

4
ElementX/Sources/Screens/HomeScreen/View/HomeScreenInviteCell.swift
View File

@@ -153,6 +153,10 @@ struct HomeScreenInviteCell: View {
}
}
// MARK: - Previews
import MatrixRustSDKMocks
struct HomeScreenInviteCell_Previews: PreviewProvider, TestablePreview {
static var previews: some View {
VStack(spacing: 0) {

4
ElementX/Sources/Screens/HomeScreen/View/HomeScreenKnockedCell.swift
View File

@@ -97,6 +97,10 @@ struct HomeScreenKnockedCell: View {
}
}
// MARK: - Previews
import MatrixRustSDKMocks
struct HomeScreenKnockedCell_Previews: PreviewProvider, TestablePreview {
static var previews: some View {
ScrollView {

4
ElementX/Sources/Screens/HomeScreen/View/HomeScreenRoomCell.swift
View File

@@ -184,6 +184,10 @@ private extension View {
}
}
// MARK: - Previews
import MatrixRustSDKMocks
struct HomeScreenRoomCell_Previews: PreviewProvider, TestablePreview {
static let summaryProviderGeneric = RoomSummaryProviderMock(.init(state: .loaded(.mockRooms)))
static let genericRooms = summaryProviderGeneric.roomListPublisher.value.compactMap(mockRoom)

2
ElementX/Sources/Screens/LinkNewDeviceScreen/View/LinkNewDeviceScreen.swift
View File

@@ -97,6 +97,8 @@ struct LinkNewDeviceScreen: View {
// MARK: - Previews
import MatrixRustSDKMocks
struct LinkNewDeviceScreen_Previews: PreviewProvider, TestablePreview {
static let viewModel = makeViewModel(mode: .readyToLink(isGeneratingCode: false))
static let generatingViewModel = makeViewModel(mode: .readyToLink(isGeneratingCode: true))

1
ElementX/Sources/Screens/Spaces/LeaveSpace/View/LeaveSpaceView.swift
View File

@@ -117,6 +117,7 @@ struct LeaveSpaceView: View {
// MARK: - Previews
import MatrixRustSDK
import MatrixRustSDKMocks
struct LeaveSpaceView_Previews: PreviewProvider, TestablePreview {
static let manyViewModel = makeViewModel(mode: .manyRooms)

1
ElementX/SupportingFiles/target.yml
View File

@@ -221,6 +221,7 @@ targets:
dependencies:
- target: NSE
- target: ShareExtension
- target: MatrixRustSDKMocks
- package: MatrixRustSDK
embed: true
- package: Compound

2
Enterprise

Submodule Enterprise updated: a6439b534c...b86237ec96

1999
ElementX/Sources/Mocks/Generated/SDKGeneratedMocks.swift → SDKMocks/Sources/Generated/SDKGeneratedMocks.swift
View File

File diff suppressed because it is too large Load Diff

16
SDKMocks/SupportingFiles/target.yml Normal file
View File

@@ -0,0 +1,16 @@
name: SDKMocks
targets:
MatrixRustSDKMocks:
type: library.static
platform: iOS
dependencies:
- package: MatrixRustSDK
settings:
base:
PRODUCT_NAME: MatrixRustSDKMocks
sources:
- ../Sources

6
Tools/Sourcery/SDKAutoMockable.stencil
View File

@@ -54,7 +54,7 @@ import {{ import }}
{% call methodThrowableErrorDeclaration method %}
{% endif %}
{% if not method.isInitializer %}
var {% call swiftifyMethodName method.selectorName %}UnderlyingCallsCount = 0
{% call accessLevel method.accessLevel %}var {% call swiftifyMethodName method.selectorName %}UnderlyingCallsCount = 0
{% call accessLevel method.accessLevel %}{% call staticSpecifier method %}var {% call swiftifyMethodName method.selectorName %}CallsCount: Int {
get {
if Thread.isMainThread {
@@ -96,7 +96,7 @@ import {{ import }}
{% endif %}
{% if not method.returnTypeName.isVoid and not method.isInitializer %}
var {% call swiftifyMethodName method.selectorName %}UnderlyingReturnValue: {{ '(' if method.returnTypeName.isClosure and not method.isOptionalReturnType }}{{ method.returnTypeName }}{{ ')' if method.returnTypeName.isClosure and not method.isOptionalReturnType }}{{ '!' if not method.isOptionalReturnType }}
{% call accessLevel method.accessLevel %}var {% call swiftifyMethodName method.selectorName %}UnderlyingReturnValue: {{ '(' if method.returnTypeName.isClosure and not method.isOptionalReturnType }}{{ method.returnTypeName }}{{ ')' if method.returnTypeName.isClosure and not method.isOptionalReturnType }}{{ '!' if not method.isOptionalReturnType }}
{% call accessLevel method.accessLevel %}{% call staticSpecifier method %}var {% call swiftifyMethodName method.selectorName %}ReturnValue: {{ '(' if method.returnTypeName.isClosure and not method.isOptionalReturnType }}{{ method.returnTypeName }}{{ ')' if method.returnTypeName.isClosure and not method.isOptionalReturnType }}{{ '!' if not method.isOptionalReturnType }} {
get {
if Thread.isMainThread {
@@ -224,7 +224,7 @@ import {{ import }}
{% for type in types.classes %}{% if type.name != "AutoMockable" %}{% if type.accessLevel == "open" %}
{% call accessLevel type.accessLevel %}class {{ type.name | replace:"Protocol","" }}SDKMock: MatrixRustSDK.{{ type.name }}, @unchecked Sendable {
{% if type.accessLevel == "open" %}
init() {
public init() {
super.init(noHandle: .init())
}

2
Tools/Sources/Commands/GenerateSDKMocks.swift
View File

@@ -26,7 +26,7 @@ struct GenerateSDKMocks: AsyncParsableCommand {
/// Generates the SDK mocks using Sourcery.
func generateSDKMocks(ffiPath: String) throws {
try Zsh.run(command: "sourcery --sources \(ffiPath) --templates Tools/Sourcery/SDKAutoMockable.stencil --output ElementX/Sources/Mocks/Generated/SDKGeneratedMocks.swift")
try Zsh.run(command: "sourcery --sources \(ffiPath) --templates Tools/Sourcery/SDKAutoMockable.stencil --output SDKMocks/Sources/Generated/SDKGeneratedMocks.swift")
}
/// Downloads the specified version of the `matrix_sdk_ffi.swift` file and returns the path to the downloaded file.

1
UnitTests/Sources/AuthenticationServiceTests.swift
View File

@@ -9,6 +9,7 @@
import XCTest
@testable import ElementX
import MatrixRustSDKMocks
class AuthenticationServiceTests: XCTestCase {
var client: ClientSDKMock!

1
UnitTests/Sources/AuthenticationStartScreenViewModelTests.swift
View File

@@ -9,6 +9,7 @@
import XCTest
@testable import ElementX
import MatrixRustSDKMocks
@MainActor
class AuthenticationStartScreenViewModelTests: XCTestCase {

1
UnitTests/Sources/MediaProvider/MediaLoaderTests.swift
View File

@@ -8,6 +8,7 @@
@testable import ElementX
import MatrixRustSDK
import MatrixRustSDKMocks
import XCTest
final class MediaLoaderTests: XCTestCase {

1
UnitTests/Sources/RoomFlowCoordinatorTests.swift
View File

@@ -10,6 +10,7 @@ import XCTest
import Combine
@testable import ElementX
import MatrixRustSDKMocks
@MainActor
class RoomFlowCoordinatorTests: XCTestCase {

1
UnitTests/Sources/RoomScreenViewModelTests.swift
View File

@@ -8,6 +8,7 @@
@testable import ElementX
import MatrixRustSDK
import MatrixRustSDKMocks
import Combine
import XCTest

1
UnitTests/Sources/RoomSummaryProviderTests.swift
View File

@@ -7,6 +7,7 @@
//
import MatrixRustSDK
import MatrixRustSDKMocks
import XCTest
@testable import ElementX

1
UnitTests/Sources/RoomTests.swift
View File

@@ -7,6 +7,7 @@
//
import MatrixRustSDK
import MatrixRustSDKMocks
import XCTest
@testable import ElementX

1
UnitTests/Sources/ServerConfirmationScreenViewModelTests.swift
View File

@@ -6,6 +6,7 @@
// Please see LICENSE files in the repository root for full details.
//
import MatrixRustSDKMocks
import XCTest
@testable import ElementX

1
UnitTests/Sources/SpaceScreenViewModelTests.swift
View File

@@ -11,6 +11,7 @@ import XCTest
@testable import ElementX
import MatrixRustSDK
import MatrixRustSDKMocks
@MainActor
class SpaceScreenViewModelTests: XCTestCase {

1
codecov.yml
View File

@@ -15,6 +15,7 @@ ignore:
- "ElementX/Sources/UITests"
- "ElementX/Sources/UnitTests"
- "ElementX/Sources/Settings/DeveloperOptionsScreen"
- "SDKMocks/Sources/Generated"
- "Tools"
- "**/Mock*.swift"
- "**/*Mock.swift"

6
project.yml
View File

@@ -24,6 +24,7 @@ options:
- AccessibilityTests
- IntegrationTests
- DevelopmentAssets
- SDKMocks
- Secrets
- Tools
- pattern: ElementX
@@ -58,12 +59,13 @@ settings:
include:
- path: app.yml
- path: ElementX/SupportingFiles/target.yml
- path: NSE/SupportingFiles/target.yml
- path: ShareExtension/SupportingFiles/target.yml
- path: SDKMocks/SupportingFiles/target.yml
- path: UnitTests/SupportingFiles/target.yml
- path: PreviewTests/SupportingFiles/target.yml
- path: UITests/SupportingFiles/target.yml
- path: IntegrationTests/SupportingFiles/target.yml
- path: NSE/SupportingFiles/target.yml
- path: ShareExtension/SupportingFiles/target.yml
- path: AccessibilityTests/SupportingFiles/target.yml
# - path: MyAppVariant/override.yml