From def06833282eb39de0b7193b0cb15cda742c13a1 Mon Sep 17 00:00:00 2001 From: Gil Eluard Date: Wed, 13 Apr 2022 12:30:41 +0200 Subject: [PATCH] Fix build issues for xcode 13.3 --- .../xcshareddata/swiftpm/Package.resolved | 132 +++++++++--------- .../View/Timeline/EmoteRoomTimelineView.swift | 26 ++-- .../Timeline/EventBasedTimelineView.swift | 26 ++-- .../View/Timeline/ImageRoomTimelineView.swift | 49 +++---- .../Timeline/NoticeRoomTimelineView.swift | 26 ++-- .../View/Timeline/TextRoomTimelineView.swift | 26 ++-- 6 files changed, 144 insertions(+), 141 deletions(-) diff --git a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 661414b2f..b4f5c3d6e 100644 --- a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,70 +1,68 @@ { - "object": { - "pins": [ - { - "package": "DTCoreText", - "repositoryURL": "https://github.com/Cocoanetics/DTCoreText", - "state": { - "branch": "develop", - "revision": "9f515155c6fcb5d9c39150aa048685aa65b4904f", - "version": null - } - }, - { - "package": "DTFoundation", - "repositoryURL": "https://github.com/Cocoanetics/DTFoundation.git", - "state": { - "branch": null, - "revision": "76062513434421cb6c8a1ae1d4f8368a7ebc2da3", - "version": "1.7.18" - } - }, - { - "package": "KeychainAccess", - "repositoryURL": "https://github.com/kishikawakatsumi/KeychainAccess", - "state": { - "branch": "master", - "revision": "6299daec1d74be12164fec090faf9ed14d0da9d6", - "version": null - } - }, - { - "package": "Kingfisher", - "repositoryURL": "https://github.com/onevcat/Kingfisher", - "state": { - "branch": null, - "revision": "32e4acdf6971f58f5ad552389cf2d7d016334eaf", - "version": "7.2.0" - } - }, - { - "package": "MatrixRustSDK", - "repositoryURL": "https://github.com/matrix-org/matrix-rust-components-swift.git", - "state": { - "branch": "main", - "revision": "f6682cf02eec087f921c53526895996cba169378", - "version": null - } - }, - { - "package": "Introspect", - "repositoryURL": "https://github.com/siteline/SwiftUI-Introspect.git", - "state": { - "branch": "master", - "revision": "72a509c93166540c0adf8323fd2652daade7f9f6", - "version": null - } - }, - { - "package": "SwiftyBeaver", - "repositoryURL": "https://github.com/SwiftyBeaver/SwiftyBeaver", - "state": { - "branch": null, - "revision": "2c039501d6eeb4d4cd4aec4a8d884ad28862e044", - "version": "1.9.5" - } + "pins" : [ + { + "identity" : "dtcoretext", + "kind" : "remoteSourceControl", + "location" : "https://github.com/Cocoanetics/DTCoreText", + "state" : { + "branch" : "develop", + "revision" : "9f515155c6fcb5d9c39150aa048685aa65b4904f" } - ] - }, - "version": 1 + }, + { + "identity" : "dtfoundation", + "kind" : "remoteSourceControl", + "location" : "https://github.com/Cocoanetics/DTFoundation.git", + "state" : { + "revision" : "76062513434421cb6c8a1ae1d4f8368a7ebc2da3", + "version" : "1.7.18" + } + }, + { + "identity" : "keychainaccess", + "kind" : "remoteSourceControl", + "location" : "https://github.com/kishikawakatsumi/KeychainAccess", + "state" : { + "branch" : "master", + "revision" : "6299daec1d74be12164fec090faf9ed14d0da9d6" + } + }, + { + "identity" : "kingfisher", + "kind" : "remoteSourceControl", + "location" : "https://github.com/onevcat/Kingfisher", + "state" : { + "revision" : "1a7b5480eb750a8e171654b9b1cb0a2cbeb27a55", + "version" : "7.2.1" + } + }, + { + "identity" : "matrix-rust-components-swift", + "kind" : "remoteSourceControl", + "location" : "https://github.com/matrix-org/matrix-rust-components-swift.git", + "state" : { + "branch" : "main", + "revision" : "f6682cf02eec087f921c53526895996cba169378" + } + }, + { + "identity" : "swiftui-introspect", + "kind" : "remoteSourceControl", + "location" : "https://github.com/siteline/SwiftUI-Introspect.git", + "state" : { + "branch" : "master", + "revision" : "72a509c93166540c0adf8323fd2652daade7f9f6" + } + }, + { + "identity" : "swiftybeaver", + "kind" : "remoteSourceControl", + "location" : "https://github.com/SwiftyBeaver/SwiftyBeaver", + "state" : { + "revision" : "12b5acf96d98f91d50de447369bd18df74600f1a", + "version" : "1.9.6" + } + } + ], + "version" : 2 } diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/EmoteRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/EmoteRoomTimelineView.swift index 84fc0ff38..e1419c011 100644 --- a/ElementX/Sources/Screens/RoomScreen/View/Timeline/EmoteRoomTimelineView.swift +++ b/ElementX/Sources/Screens/RoomScreen/View/Timeline/EmoteRoomTimelineView.swift @@ -37,19 +37,21 @@ struct EmoteRoomTimelineView_Previews: PreviewProvider { @ViewBuilder static var body: some View { VStack(alignment: .leading, spacing: 20.0) { - let timelineItem = EmoteRoomTimelineItem(id: UUID().uuidString, - text: "Short loin ground round tongue hamburger, fatback salami shoulder. Beef turkey sausage kielbasa strip steak. Alcatra capicola pig tail pancetta chislic.", - timestamp: "Now", - shouldShowSenderDetails: true, - senderId: "Bob") - EmoteRoomTimelineView(timelineItem: timelineItem) + EmoteRoomTimelineView(timelineItem: itemWith(text: "Short loin ground round tongue hamburger, fatback salami shoulder. Beef turkey sausage kielbasa strip steak. Alcatra capicola pig tail pancetta chislic.", + timestamp: "Now", + senderId: "Bob")) - let timelineItem = EmoteRoomTimelineItem(id: UUID().uuidString, - text: "Some other text", - timestamp: "Later", - shouldShowSenderDetails: true, - senderId: "Anne") - EmoteRoomTimelineView(timelineItem: timelineItem) + EmoteRoomTimelineView(timelineItem: itemWith(text: "Some other text", + timestamp: "Later", + senderId: "Anne")) } } + + private static func itemWith(text: String, timestamp: String, senderId: String) -> EmoteRoomTimelineItem { + return EmoteRoomTimelineItem(id: UUID().uuidString, + text: text, + timestamp: timestamp, + shouldShowSenderDetails: true, + senderId: senderId) + } } diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/EventBasedTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/EventBasedTimelineView.swift index 8193ac474..46a7c39f3 100644 --- a/ElementX/Sources/Screens/RoomScreen/View/Timeline/EventBasedTimelineView.swift +++ b/ElementX/Sources/Screens/RoomScreen/View/Timeline/EventBasedTimelineView.swift @@ -59,19 +59,21 @@ struct EventBasedTimelineView_Previews: PreviewProvider { @ViewBuilder static var body: some View { VStack(alignment: .leading, spacing: 20.0) { - let timelineItem = TextRoomTimelineItem(id: UUID().uuidString, - text: "Short loin ground round tongue hamburger, fatback salami shoulder. Beef turkey sausage kielbasa strip steak. Alcatra capicola pig tail pancetta chislic.", - timestamp: "Now", - shouldShowSenderDetails: true, - senderId: "Bob") - EventBasedTimelineView(timelineItem: timelineItem) + EventBasedTimelineView(timelineItem: itemWith(text: "Short loin ground round tongue hamburger, fatback salami shoulder. Beef turkey sausage kielbasa strip steak. Alcatra capicola pig tail pancetta chislic.", + timestamp: "Now", + senderId: "Bob")) - let timelineItem = TextRoomTimelineItem(id: UUID().uuidString, - text: "Some other text", - timestamp: "Later", - shouldShowSenderDetails: true, - senderId: "Anne") - EventBasedTimelineView(timelineItem: timelineItem) + EventBasedTimelineView(timelineItem: itemWith(text: "Some other text", + timestamp: "Later", + senderId: "Anne")) } } + + private static func itemWith(text: String, timestamp: String, senderId: String) -> TextRoomTimelineItem { + return TextRoomTimelineItem(id: UUID().uuidString, + text: text, + timestamp: timestamp, + shouldShowSenderDetails: true, + senderId: senderId) + } } diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/ImageRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/ImageRoomTimelineView.swift index 948f8c59c..b098edbc3 100644 --- a/ElementX/Sources/Screens/RoomScreen/View/Timeline/ImageRoomTimelineView.swift +++ b/ElementX/Sources/Screens/RoomScreen/View/Timeline/ImageRoomTimelineView.swift @@ -60,34 +60,31 @@ struct ImageRoomTimelineView_Previews: PreviewProvider { @ViewBuilder static var body: some View { VStack(spacing: 20.0) { - let timelineItem = ImageRoomTimelineItem(id: UUID().uuidString, - text: "Some image", - timestamp: "Now", - shouldShowSenderDetails: false, - senderId: "Bob", - source: nil, - image: UIImage(systemName: "photo")) - ImageRoomTimelineView(timelineItem: timelineItem) + ImageRoomTimelineView(timelineItem: ImageRoomTimelineItem(id: UUID().uuidString, + text: "Some image", + timestamp: "Now", + shouldShowSenderDetails: false, + senderId: "Bob", + source: nil, + image: UIImage(systemName: "photo"))) - let timelineItem = ImageRoomTimelineItem(id: UUID().uuidString, - text: "Some other image", - timestamp: "Now", - shouldShowSenderDetails: false, - senderId: "Bob", - source: nil, - image: nil) - ImageRoomTimelineView(timelineItem: timelineItem) + ImageRoomTimelineView(timelineItem: ImageRoomTimelineItem(id: UUID().uuidString, + text: "Some other image", + timestamp: "Now", + shouldShowSenderDetails: false, + senderId: "Bob", + source: nil, + image: nil)) - let timelineItem = ImageRoomTimelineItem(id: UUID().uuidString, - text: "Blurhashed image", - timestamp: "Now", - shouldShowSenderDetails: false, - senderId: "Bob", - source: nil, - image: nil, - aspectRatio: 0.7, - blurhash: "L%KUc%kqS$RP?Ks,WEf8OlrqaekW") - ImageRoomTimelineView(timelineItem: timelineItem) + ImageRoomTimelineView(timelineItem: ImageRoomTimelineItem(id: UUID().uuidString, + text: "Blurhashed image", + timestamp: "Now", + shouldShowSenderDetails: false, + senderId: "Bob", + source: nil, + image: nil, + aspectRatio: 0.7, + blurhash: "L%KUc%kqS$RP?Ks,WEf8OlrqaekW")) } } } diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/NoticeRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/NoticeRoomTimelineView.swift index a828aeb42..58ebce134 100644 --- a/ElementX/Sources/Screens/RoomScreen/View/Timeline/NoticeRoomTimelineView.swift +++ b/ElementX/Sources/Screens/RoomScreen/View/Timeline/NoticeRoomTimelineView.swift @@ -37,20 +37,22 @@ struct NoticeRoomTimelineView_Previews: PreviewProvider { @ViewBuilder static var body: some View { VStack(alignment: .leading, spacing: 20.0) { - let timelineItem = NoticeRoomTimelineItem(id: UUID().uuidString, - text: "Short loin ground round tongue hamburger, fatback salami shoulder. Beef turkey sausage kielbasa strip steak. Alcatra capicola pig tail pancetta chislic.", - timestamp: "Now", - shouldShowSenderDetails: true, - senderId: "Bob") - NoticeRoomTimelineView(timelineItem: timelineItem) + NoticeRoomTimelineView(timelineItem: itemWith(text: "Short loin ground round tongue hamburger, fatback salami shoulder. Beef turkey sausage kielbasa strip steak. Alcatra capicola pig tail pancetta chislic.", + timestamp: "Now", + senderId: "Bob")) - let timelineItem = NoticeRoomTimelineItem(id: UUID().uuidString, - text: "Some other text", - timestamp: "Later", - shouldShowSenderDetails: true, - senderId: "Anne") - NoticeRoomTimelineView(timelineItem: timelineItem) + NoticeRoomTimelineView(timelineItem: itemWith(text: "Some other text", + timestamp: "Later", + senderId: "Anne")) } .padding() } + + private static func itemWith(text: String, timestamp: String, senderId: String) -> NoticeRoomTimelineItem { + return NoticeRoomTimelineItem(id: UUID().uuidString, + text: text, + timestamp: timestamp, + shouldShowSenderDetails: true, + senderId: senderId) + } } diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/TextRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/TextRoomTimelineView.swift index 79c00d370..d71dbefb9 100644 --- a/ElementX/Sources/Screens/RoomScreen/View/Timeline/TextRoomTimelineView.swift +++ b/ElementX/Sources/Screens/RoomScreen/View/Timeline/TextRoomTimelineView.swift @@ -34,19 +34,21 @@ struct TextRoomTimelineView_Previews: PreviewProvider { @ViewBuilder static var body: some View { VStack(alignment: .leading, spacing: 20.0) { - let timelineItem = TextRoomTimelineItem(id: UUID().uuidString, - text: "Short loin ground round tongue hamburger, fatback salami shoulder. Beef turkey sausage kielbasa strip steak. Alcatra capicola pig tail pancetta chislic.", - timestamp: "Now", - shouldShowSenderDetails: true, - senderId: "Bob") - TextRoomTimelineView(timelineItem: timelineItem) + TextRoomTimelineView(timelineItem: itemWith(text: "Short loin ground round tongue hamburger, fatback salami shoulder. Beef turkey sausage kielbasa strip steak. Alcatra capicola pig tail pancetta chislic.", + timestamp: "Now", + senderId: "Bob")) - let timelineItem = TextRoomTimelineItem(id: UUID().uuidString, - text: "Some other text", - timestamp: "Later", - shouldShowSenderDetails: true, - senderId: "Anne") - TextRoomTimelineView(timelineItem: timelineItem) + TextRoomTimelineView(timelineItem: itemWith(text: "Some other text", + timestamp: "Later", + senderId: "Anne")) } } + + private static func itemWith(text: String, timestamp: String, senderId: String) -> TextRoomTimelineItem { + return TextRoomTimelineItem(id: UUID().uuidString, + text: text, + timestamp: timestamp, + shouldShowSenderDetails: true, + senderId: senderId) + } }