Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: convert Wire Images, Transport, Protos, MockTransport, Link Preview and Wire Canvas projects to use folders - WPB-15572 #2425

Merged
merged 32 commits into from
Feb 21, 2025
Merged

chore: convert Wire Images, Transport, Protos, MockTransport, Link Preview and Wire Canvas projects to use folders - WPB-15572 #2425

Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
be0c3b1
chore: convert Wire Images project to use folders - WPB-15572
caldrian Jan 24, 2025
924bdae
convert WireLinkPreview
caldrian Jan 24, 2025
9046165
delete unused .gitignore files
caldrian Jan 24, 2025
7fd17f9
convert Wire Transport
caldrian Jan 24, 2025
b95e6ae
delete info plist
caldrian Jan 24, 2025
121d7ef
convert Wire Cryptobox
caldrian Jan 24, 2025
bcb8d40
convert some references in Wire Protos
caldrian Jan 24, 2025
704f759
delete info plist
caldrian Jan 24, 2025
00e4d88
remove unused file
caldrian Jan 24, 2025
ddb97f5
rix reference orders
caldrian Jan 24, 2025
42f60de
delete unused files
caldrian Jan 24, 2025
818c4b6
symlinks
caldrian Jan 24, 2025
9c4c024
convert Mock Transport
caldrian Jan 24, 2025
6a39f12
delete unused file
caldrian Jan 24, 2025
3369bfb
Merge branch 'develop' of github.com:wireapp/wire-ios into chore/clea…
caldrian Feb 6, 2025
e6cad4d
Merge branch 'develop' of github.com:wireapp/wire-ios into chore/clea…
caldrian Feb 11, 2025
7ec1a75
set marketing versions in frameworks
caldrian Feb 11, 2025
6495bb9
Merge branch 'develop' of github.com:wireapp/wire-ios into chore/clea…
caldrian Feb 17, 2025
0c064e0
Merge branch 'develop' of github.com:wireapp/wire-ios into chore/clea…
caldrian Feb 19, 2025
7adabfd
undo changes
caldrian Feb 19, 2025
da6fc4f
Merge branch 'develop' of github.com:wireapp/wire-ios into chore/clea…
caldrian Feb 19, 2025
34857b2
undo project file changes
caldrian Feb 19, 2025
379d8cc
convert WireImages groups to folders
caldrian Feb 19, 2025
e13af3a
convert WireLinkPreview groups to folders
caldrian Feb 19, 2025
86f01e9
convert WireTransport groups to folders
caldrian Feb 19, 2025
39609ac
convert WireCryptobox groups to folders
caldrian Feb 19, 2025
efe1c51
convert WireProtos groups to folders
caldrian Feb 19, 2025
de2e132
convert WireMockTransport groups to folders
caldrian Feb 19, 2025
888957f
convert Ziphy groups to folders
caldrian Feb 19, 2025
109f03f
Merge branch 'develop' of github.com:wireapp/wire-ios into chore/clea…
caldrian Feb 19, 2025
3ff03c8
fix build error
caldrian Feb 19, 2025
df23f68
Merge branch 'develop' into chore/cleanup-wire-images-WPB-15572
caldrian Feb 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 0 additions & 23 deletions wire-ios-canvas/Resources/Configurations/zmc-config/.gitignore
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions wire-ios-canvas/Sources/Info.plist
View file
Open in desktop

This file was deleted.

97 changes: 20 additions & 77 deletions wire-ios-canvas/WireCanvas.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,11 @@
archiveVersion = 1;
classes = {
};
objectVersion = 70;
objectVersion = 71;
objects = {

/* Begin PBXBuildFile section */
01E944642D01805B006921E4 /* WireCanvas.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 165EA0C31DB67C3B008ECC60 /* WireCanvas.framework */; };
165EA0DE1DB67C6C008ECC60 /* Canvas.swift in Sources */ = {isa = PBXBuildFile; fileRef = 165EA0DD1DB67C6C008ECC60 /* Canvas.swift */; };
1660DC661DBF8516009E360D /* UIImage+Trimmed.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1660DC651DBF8516009E360D /* UIImage+Trimmed.swift */; };
16CB8A311DBA5B7300B5BC47 /* Stroke.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16CB8A301DBA5B7300B5BC47 /* Stroke.swift */; };
16CB8A331DBA5BB800B5BC47 /* Image.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16CB8A321DBA5BB800B5BC47 /* Image.swift */; };
EE9AEC9C2BD15A0C00F7853F /* WireCanvas.docc in Sources */ = {isa = PBXBuildFile; fileRef = EE9AEC9B2BD15A0C00F7853F /* WireCanvas.docc */; };
/* End PBXBuildFile section */

Expand All @@ -28,26 +24,13 @@
/* Begin PBXFileReference section */
01E944602D01805B006921E4 /* WireCanvasTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = WireCanvasTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
165EA0C31DB67C3B008ECC60 /* WireCanvas.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = WireCanvas.framework; sourceTree = BUILT_PRODUCTS_DIR; };
165EA0C71DB67C3B008ECC60 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
165EA0DD1DB67C6C008ECC60 /* Canvas.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Canvas.swift; sourceTree = "<group>"; };
1660DC651DBF8516009E360D /* UIImage+Trimmed.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIImage+Trimmed.swift"; sourceTree = "<group>"; };
16CB8A301DBA5B7300B5BC47 /* Stroke.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Stroke.swift; sourceTree = "<group>"; };
16CB8A321DBA5BB800B5BC47 /* Image.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Image.swift; sourceTree = "<group>"; };
16CB8A371DBA73B900B5BC47 /* WireCanvas.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = WireCanvas.xcconfig; sourceTree = "<group>"; };
16CB8A381DBA73B900B5BC47 /* version.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = version.xcconfig; sourceTree = "<group>"; };
16CB8A3A1DBA73B900B5BC47 /* ios-test-host.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "ios-test-host.xcconfig"; sourceTree = "<group>"; };
16CB8A3B1DBA73B900B5BC47 /* ios-test-target.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "ios-test-target.xcconfig"; sourceTree = "<group>"; };
16CB8A3C1DBA73B900B5BC47 /* ios.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = ios.xcconfig; sourceTree = "<group>"; };
16CB8A3F1DBA73B900B5BC47 /* project-common.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "project-common.xcconfig"; sourceTree = "<group>"; };
16CB8A401DBA73B900B5BC47 /* project-debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "project-debug.xcconfig"; sourceTree = "<group>"; };
16CB8A411DBA73B900B5BC47 /* project.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = project.xcconfig; sourceTree = "<group>"; };
16CB8A441DBA73B900B5BC47 /* tests.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = tests.xcconfig; sourceTree = "<group>"; };
16CB8A461DBA73B900B5BC47 /* warnings.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = warnings.xcconfig; sourceTree = "<group>"; };
EE9AEC9B2BD15A0C00F7853F /* WireCanvas.docc */ = {isa = PBXFileReference; lastKnownFileType = folder.documentationcatalog; path = WireCanvas.docc; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFileSystemSynchronizedRootGroup section */
01E944612D01805B006921E4 /* WireCanvasTests */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = WireCanvasTests; sourceTree = "<group>"; };
59AB7F952D43D893005D2D17 /* Resources */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = Resources; sourceTree = "<group>"; };
59AB7F9B2D43D897005D2D17 /* Sources */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = Sources; sourceTree = "<group>"; };
/* End PBXFileSystemSynchronizedRootGroup section */

/* Begin PBXFrameworksBuildPhase section */
Expand All @@ -73,8 +56,8 @@
isa = PBXGroup;
children = (
EE9AEC9B2BD15A0C00F7853F /* WireCanvas.docc */,
16CB8A341DBA73B900B5BC47 /* Resources */,
165EA0C51DB67C3B008ECC60 /* Sources */,
59AB7F952D43D893005D2D17 /* Resources */,
59AB7F9B2D43D897005D2D17 /* Sources */,
01E944612D01805B006921E4 /* WireCanvasTests */,
165EA0C41DB67C3B008ECC60 /* Products */,
166390D71DC8E5EF00D7BF1C /* Frameworks */,
Expand All @@ -94,58 +77,13 @@
name = Products;
sourceTree = "<group>";
};
165EA0C51DB67C3B008ECC60 /* Sources */ = {
isa = PBXGroup;
children = (
165EA0DD1DB67C6C008ECC60 /* Canvas.swift */,
16CB8A301DBA5B7300B5BC47 /* Stroke.swift */,
16CB8A321DBA5BB800B5BC47 /* Image.swift */,
1660DC651DBF8516009E360D /* UIImage+Trimmed.swift */,
165EA0C71DB67C3B008ECC60 /* Info.plist */,
);
path = Sources;
sourceTree = "<group>";
};
166390D71DC8E5EF00D7BF1C /* Frameworks */ = {
isa = PBXGroup;
children = (
);
name = Frameworks;
sourceTree = "<group>";
};
16CB8A341DBA73B900B5BC47 /* Resources */ = {
isa = PBXGroup;
children = (
16CB8A351DBA73B900B5BC47 /* Configurations */,
);
path = Resources;
sourceTree = "<group>";
};
16CB8A351DBA73B900B5BC47 /* Configurations */ = {
isa = PBXGroup;
children = (
16CB8A371DBA73B900B5BC47 /* WireCanvas.xcconfig */,
16CB8A381DBA73B900B5BC47 /* version.xcconfig */,
16CB8A391DBA73B900B5BC47 /* zmc-config */,
);
path = Configurations;
sourceTree = "<group>";
};
16CB8A391DBA73B900B5BC47 /* zmc-config */ = {
isa = PBXGroup;
children = (
16CB8A3A1DBA73B900B5BC47 /* ios-test-host.xcconfig */,
16CB8A3B1DBA73B900B5BC47 /* ios-test-target.xcconfig */,
16CB8A3C1DBA73B900B5BC47 /* ios.xcconfig */,
16CB8A3F1DBA73B900B5BC47 /* project-common.xcconfig */,
16CB8A401DBA73B900B5BC47 /* project-debug.xcconfig */,
16CB8A411DBA73B900B5BC47 /* project.xcconfig */,
16CB8A441DBA73B900B5BC47 /* tests.xcconfig */,
16CB8A461DBA73B900B5BC47 /* warnings.xcconfig */,
);
path = "zmc-config";
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
Expand Down Expand Up @@ -184,6 +122,9 @@
);
dependencies = (
);
fileSystemSynchronizedGroups = (
59AB7F9B2D43D897005D2D17 /* Sources */,
);
name = WireCanvas;
productName = Canvas;
productReference = 165EA0C31DB67C3B008ECC60 /* WireCanvas.framework */;
Expand Down Expand Up @@ -257,11 +198,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
165EA0DE1DB67C6C008ECC60 /* Canvas.swift in Sources */,
16CB8A331DBA5BB800B5BC47 /* Image.swift in Sources */,
EE9AEC9C2BD15A0C00F7853F /* WireCanvas.docc in Sources */,
1660DC661DBF8516009E360D /* UIImage+Trimmed.swift in Sources */,
16CB8A311DBA5B7300B5BC47 /* Stroke.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -417,7 +354,8 @@
};
165EA0D51DB67C3B008ECC60 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 16CB8A401DBA73B900B5BC47 /* project-debug.xcconfig */;
baseConfigurationReferenceAnchor = 59AB7F952D43D893005D2D17 /* Resources */;
baseConfigurationReferenceRelativePath = "Configurations/zmc-config/project-debug.xcconfig";
buildSettings = {
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand All @@ -426,27 +364,32 @@
};
165EA0D61DB67C3B008ECC60 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 16CB8A411DBA73B900B5BC47 /* project.xcconfig */;
baseConfigurationReferenceAnchor = 59AB7F952D43D893005D2D17 /* Resources */;
baseConfigurationReferenceRelativePath = "Configurations/zmc-config/project.xcconfig";
buildSettings = {
SDKROOT = iphoneos;
};
name = Release;
};
165EA0D81DB67C3B008ECC60 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 16CB8A371DBA73B900B5BC47 /* WireCanvas.xcconfig */;
baseConfigurationReferenceAnchor = 59AB7F952D43D893005D2D17 /* Resources */;
baseConfigurationReferenceRelativePath = Configurations/WireCanvas.xcconfig;
buildSettings = {
INFOPLIST_FILE = Sources/Info.plist;
GENERATE_INFOPLIST_FILE = YES;
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.wire.Canvas;
SKIP_INSTALL = YES;
};
name = Debug;
};
165EA0D91DB67C3B008ECC60 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 16CB8A371DBA73B900B5BC47 /* WireCanvas.xcconfig */;
baseConfigurationReferenceAnchor = 59AB7F952D43D893005D2D17 /* Resources */;
baseConfigurationReferenceRelativePath = Configurations/WireCanvas.xcconfig;
buildSettings = {
INFOPLIST_FILE = Sources/Info.plist;
GENERATE_INFOPLIST_FILE = YES;
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.wire.Canvas;
SKIP_INSTALL = YES;
};
Expand Down
Empty file removed wire-ios-cryptobox/Gemfile.lock
View file
Open in desktop
Empty file.
23 changes: 0 additions & 23 deletions wire-ios-cryptobox/Resources/Configurations/zmc-config/.gitignore
View file
Open in desktop

This file was deleted.

Loading
Loading