Skip to content

Commit 421bd19

Browse files
authored
chore: replace WireProtos and use SPM to integrate generic-message-proto - WPB-10203 (#3363)
1 parent 1f1fea7 commit 421bd19

File tree

268 files changed

+790
-9028
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

268 files changed

+790
-9028
lines changed

.github/workflows/test_pr_changes.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,6 @@ jobs:
7171
- 'wire-ios-cryptobox/**'
7272
wire-ios-mocktransport:
7373
- 'wire-ios-mocktransport/**'
74-
wire-ios-protos:
75-
- 'wire-ios-protos/**'
7674
wire-ios-images:
7775
- 'wire-ios-images/**'
7876
wire-ios-link-preview:

.swiftformat

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
**.generated.swift, \
88
**+Generated.swift, \
99
**AutoMockable**, \
10-
wire-ios-protos/Protos/**, \
1110
wire-ios/Templates/**, \
1211
WireUI/Sources/WireDesign/Icons/Autogenerated/**, \
1312
wire-ios-automation/**

.swiftlint.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,6 @@ excluded:
9292
- sourcery
9393
- vendor
9494
- wire-ios/Templates
95-
- wire-ios-protos/Protos/messages.pb.swift
96-
- wire-ios-protos/Protos/mls.pb.swift
97-
- wire-ios-protos/Protos/otr.pb.swift
98-
- wire-ios-protos/Scripts/generate_header.swift
9995
- wire-ios-sync-engine/Support/Sourcery/generated/AutoMockable.manual.swift
10096
- wire-ios/Wire-iOS Share Extension/Generated/Strings+Generated.swift
10197
- wire-ios/Wire-iOS/Generated/Assets+Generated.swift

Cartfile.private

Lines changed: 0 additions & 2 deletions
This file was deleted.

Cartfile.resolved

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
github "wireapp/ZipArchive" "v2.4.2"
22
github "wireapp/cryptobox-ios" "v1.1.0_xcframework_arm64simulator"
3-
github "wireapp/generic-message-proto" "v1.52.0"
43
github "wireapp/libPhoneNumber-iOS" "1.1"
54
github "wireapp/ocmock" "v3.4.3_Xcode14.3.1"

WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationMLSMessageAddEventProcessor.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
// along with this program. If not, see http://www.gnu.org/licenses/.
1717
//
1818

19+
import GenericMessageProtocol
1920
import WireDataModel
2021
import WireLogging
2122
import WireNetwork

WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationProteusMessageAddEventProcessor.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
// along with this program. If not, see http://www.gnu.org/licenses/.
1717
//
1818

19+
import GenericMessageProtocol
1920
import WireDataModel
2021
import WireLogging
2122
import WireNetwork

WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/ConversationProtobufMessageProcessor.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
// along with this program. If not, see http://www.gnu.org/licenses/.
1717
//
1818

19+
import GenericMessageProtocol
1920
import WireDataModel
2021
import WireLogging
2122
import WireNetwork
22-
import WireProtos
2323

2424
public struct ConversationProtobufMessageProcessor: ConversationProtobufMessageProcessorProtocol {
2525

WireDomain/Sources/WireDomain/Event Processing/ConversationEventProcessor/Protocols/ConversationProtobufMessageProcessorProtocol.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
// along with this program. If not, see http://www.gnu.org/licenses/.
1717
//
1818

19+
import GenericMessageProtocol
1920
import WireDataModel
2021
import WireNetwork
21-
import WireProtos
2222

2323
// sourcery: AutoMockable
2424
/// A common processor for processing MLS / Proteus protobuf message.

WireDomain/Sources/WireDomain/Helpers/ProtobufMessageDecoder.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
// along with this program. If not, see http://www.gnu.org/licenses/.
1717
//
1818

19-
import WireProtos
19+
import Foundation
20+
import GenericMessageProtocol
2021

2122
struct ProtobufMessageDecoder {
2223

0 commit comments

Comments
 (0)