diff --git a/Podfile b/Podfile index 5072effaf3..a322c9583e 100644 --- a/Podfile +++ b/Podfile @@ -9,7 +9,7 @@ use_frameworks! source 'https://cdn.cocoapods.org/' pod 'blurhash', podspec: './ThirdParty/blurhash.podspec' -pod 'SwiftProtobuf', "1.35.1" +pod 'SwiftProtobuf', "1.36.1" ENV['LIBSIGNAL_FFI_PREBUILD_CHECKSUM'] = '0e431c848aa682b8695e77ffd3feea52658c641fd1d6a3c105d09b606150deb5' pod 'LibSignalClient', git: 'https://github.com/signalapp/libsignal.git', tag: 'v0.88.2', testspecs: ["Tests"] diff --git a/Podfile.lock b/Podfile.lock index 9df519b955..bd1e67ea52 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -44,7 +44,7 @@ PODS: - SQLCipher/common (4.6.1) - SQLCipher/standard (4.6.1): - SQLCipher/common - - SwiftProtobuf (1.35.1) + - SwiftProtobuf (1.36.1) DEPENDENCIES: - blurhash (from `./ThirdParty/blurhash.podspec`) @@ -64,7 +64,7 @@ DEPENDENCIES: - SDWebImageWebPCoder - SignalRingRTC (from `https://github.com/signalapp/ringrtc`, tag `v2.67.0`) - SQLCipher (from `https://github.com/signalapp/sqlcipher.git`, tag `v4.6.1-f_barrierfsync`) - - SwiftProtobuf (= 1.35.1) + - SwiftProtobuf (= 1.36.1) SPEC REPOS: trunk: @@ -145,8 +145,8 @@ SPEC CHECKSUMS: SDWebImageWebPCoder: e38c0a70396191361d60c092933e22c20d5b1380 SignalRingRTC: 7a3eaaffc8c3d031ccb1b119e950c0b37e464aab SQLCipher: ff2f045b20d675a73a70f7329395ddd4a2580063 - SwiftProtobuf: c268fcf9642d613eb6639fed15842ae25d4b975a + SwiftProtobuf: 9e106a71456f4d3f6a3b0c8fd87ef0be085efc38 -PODFILE CHECKSUM: 8482ae9bd0795ad6e60f053ad86c2230309ae36a +PODFILE CHECKSUM: db872f26e6cea91150c00f37864a4886a481f8c4 COCOAPODS: 1.15.2 diff --git a/Pods b/Pods index b2538b8b7f..8da0e97f58 160000 --- a/Pods +++ b/Pods @@ -1 +1 @@ -Subproject commit b2538b8b7fd0eaf522c62982aab1c398cdd688b8 +Subproject commit 8da0e97f586feaec7ab4ac02778d303677461b73 diff --git a/SignalServiceKit/Protos/Backups/Backup.pb.swift b/SignalServiceKit/Protos/Backups/Backup.pb.swift index 69909c4e5f..156111073a 100644 --- a/SignalServiceKit/Protos/Backups/Backup.pb.swift +++ b/SignalServiceKit/Protos/Backups/Backup.pb.swift @@ -17,7 +17,11 @@ // Copyright 2024 Signal Messenger, LLC // SPDX-License-Identifier: AGPL-3.0-only +#if canImport(FoundationEssentials) +public import FoundationEssentials +#else public import Foundation +#endif public import SwiftProtobuf // If the compiler emits an error on this type, it is because this file diff --git a/SignalServiceKit/Protos/Generated/CallQualitySurvey.pb.swift b/SignalServiceKit/Protos/Generated/CallQualitySurvey.pb.swift index 5a73b639aa..4cc20d2edc 100644 --- a/SignalServiceKit/Protos/Generated/CallQualitySurvey.pb.swift +++ b/SignalServiceKit/Protos/Generated/CallQualitySurvey.pb.swift @@ -17,7 +17,11 @@ // Copyright 2025 Signal Messenger, LLC // SPDX-License-Identifier: AGPL-3.0-only +#if canImport(FoundationEssentials) +public import FoundationEssentials +#else public import Foundation +#endif public import SwiftProtobuf // If the compiler emits an error on this type, it is because this file diff --git a/SignalServiceKit/Protos/Generated/DeviceTransfer.pb.swift b/SignalServiceKit/Protos/Generated/DeviceTransfer.pb.swift index 26f3195827..0d73579cb7 100644 --- a/SignalServiceKit/Protos/Generated/DeviceTransfer.pb.swift +++ b/SignalServiceKit/Protos/Generated/DeviceTransfer.pb.swift @@ -17,7 +17,11 @@ // Copyright 2019 Signal Messenger, LLC // SPDX-License-Identifier: AGPL-3.0-only +#if canImport(FoundationEssentials) +import FoundationEssentials +#else import Foundation +#endif import SwiftProtobuf // If the compiler emits an error on this type, it is because this file diff --git a/SignalServiceKit/Protos/Generated/Fingerprint.pb.swift b/SignalServiceKit/Protos/Generated/Fingerprint.pb.swift index 7325241496..8057bb1d52 100644 --- a/SignalServiceKit/Protos/Generated/Fingerprint.pb.swift +++ b/SignalServiceKit/Protos/Generated/Fingerprint.pb.swift @@ -20,7 +20,11 @@ /// iOS - since we use a modern proto-compiler, we must specify /// the legacy proto format. +#if canImport(FoundationEssentials) +import FoundationEssentials +#else import Foundation +#endif import SwiftProtobuf // If the compiler emits an error on this type, it is because this file diff --git a/SignalServiceKit/Protos/Generated/Groups.pb.swift b/SignalServiceKit/Protos/Generated/Groups.pb.swift index d47f75b5fa..392504ea32 100644 --- a/SignalServiceKit/Protos/Generated/Groups.pb.swift +++ b/SignalServiceKit/Protos/Generated/Groups.pb.swift @@ -17,7 +17,11 @@ // Copyright 2019 Signal Messenger, LLC // SPDX-License-Identifier: AGPL-3.0-only +#if canImport(FoundationEssentials) +import FoundationEssentials +#else import Foundation +#endif import SwiftProtobuf // If the compiler emits an error on this type, it is because this file diff --git a/SignalServiceKit/Protos/Generated/MobileCoinExternal.pb.swift b/SignalServiceKit/Protos/Generated/MobileCoinExternal.pb.swift index f23f3bfc6d..dc43f93c62 100644 --- a/SignalServiceKit/Protos/Generated/MobileCoinExternal.pb.swift +++ b/SignalServiceKit/Protos/Generated/MobileCoinExternal.pb.swift @@ -14,7 +14,11 @@ // MUST BE KEPT IN SYNC WITH RUST CODE! +#if canImport(FoundationEssentials) +import FoundationEssentials +#else import Foundation +#endif import SwiftProtobuf // If the compiler emits an error on this type, it is because this file diff --git a/SignalServiceKit/Protos/Generated/Provisioning.pb.swift b/SignalServiceKit/Protos/Generated/Provisioning.pb.swift index b3320260ad..7f4d8b6934 100644 --- a/SignalServiceKit/Protos/Generated/Provisioning.pb.swift +++ b/SignalServiceKit/Protos/Generated/Provisioning.pb.swift @@ -20,7 +20,11 @@ /// iOS - since we use a modern proto-compiler, we must specify /// the legacy proto format. +#if canImport(FoundationEssentials) +import FoundationEssentials +#else import Foundation +#endif import SwiftProtobuf // If the compiler emits an error on this type, it is because this file diff --git a/SignalServiceKit/Protos/Generated/Registration.pb.swift b/SignalServiceKit/Protos/Generated/Registration.pb.swift index c16b7db29d..244b758072 100644 --- a/SignalServiceKit/Protos/Generated/Registration.pb.swift +++ b/SignalServiceKit/Protos/Generated/Registration.pb.swift @@ -17,7 +17,11 @@ // Copyright 2025 Signal Messenger, LLC // SPDX-License-Identifier: AGPL-3.0-only +#if canImport(FoundationEssentials) +import FoundationEssentials +#else import Foundation +#endif import SwiftProtobuf // If the compiler emits an error on this type, it is because this file diff --git a/SignalServiceKit/Protos/Generated/SessionRecord.pb.swift b/SignalServiceKit/Protos/Generated/SessionRecord.pb.swift index 709115ea39..67f1a04841 100644 --- a/SignalServiceKit/Protos/Generated/SessionRecord.pb.swift +++ b/SignalServiceKit/Protos/Generated/SessionRecord.pb.swift @@ -17,7 +17,11 @@ // Copyright 2020 Signal Messenger, LLC // SPDX-License-Identifier: AGPL-3.0-only +#if canImport(FoundationEssentials) +import FoundationEssentials +#else import Foundation +#endif import SwiftProtobuf // If the compiler emits an error on this type, it is because this file diff --git a/SignalServiceKit/Protos/Generated/SignalIOS.pb.swift b/SignalServiceKit/Protos/Generated/SignalIOS.pb.swift index 78373543d7..666ae06329 100644 --- a/SignalServiceKit/Protos/Generated/SignalIOS.pb.swift +++ b/SignalServiceKit/Protos/Generated/SignalIOS.pb.swift @@ -20,7 +20,11 @@ /// iOS - since we use a modern proto-compiler, we must specify /// the legacy proto format. +#if canImport(FoundationEssentials) +import FoundationEssentials +#else import Foundation +#endif import SwiftProtobuf // If the compiler emits an error on this type, it is because this file diff --git a/SignalServiceKit/Protos/Generated/SignalService.pb.swift b/SignalServiceKit/Protos/Generated/SignalService.pb.swift index d5819fa000..5d05cdca8e 100644 --- a/SignalServiceKit/Protos/Generated/SignalService.pb.swift +++ b/SignalServiceKit/Protos/Generated/SignalService.pb.swift @@ -20,7 +20,11 @@ /// iOS - since we use a modern proto-compiler, we must specify /// the legacy proto format. +#if canImport(FoundationEssentials) +import FoundationEssentials +#else import Foundation +#endif import SwiftProtobuf // If the compiler emits an error on this type, it is because this file diff --git a/SignalServiceKit/Protos/Generated/StorageService.pb.swift b/SignalServiceKit/Protos/Generated/StorageService.pb.swift index c5ee24ece6..3987dcf8a2 100644 --- a/SignalServiceKit/Protos/Generated/StorageService.pb.swift +++ b/SignalServiceKit/Protos/Generated/StorageService.pb.swift @@ -17,7 +17,11 @@ // Copyright 2019 Signal Messenger, LLC // SPDX-License-Identifier: AGPL-3.0-only +#if canImport(FoundationEssentials) +import FoundationEssentials +#else import Foundation +#endif import SwiftProtobuf // If the compiler emits an error on this type, it is because this file diff --git a/SignalServiceKit/Protos/Generated/WebSocketResources.pb.swift b/SignalServiceKit/Protos/Generated/WebSocketResources.pb.swift index 0ea758b503..781645bc7d 100644 --- a/SignalServiceKit/Protos/Generated/WebSocketResources.pb.swift +++ b/SignalServiceKit/Protos/Generated/WebSocketResources.pb.swift @@ -20,7 +20,11 @@ /// iOS - since we use a modern proto-compiler, we must specify /// the legacy proto format. +#if canImport(FoundationEssentials) +import FoundationEssentials +#else import Foundation +#endif import SwiftProtobuf // If the compiler emits an error on this type, it is because this file diff --git a/SignalServiceKit/Protos/Generated/svr2.pb.swift b/SignalServiceKit/Protos/Generated/svr2.pb.swift index a8ce60ca2a..fc51d9b456 100644 --- a/SignalServiceKit/Protos/Generated/svr2.pb.swift +++ b/SignalServiceKit/Protos/Generated/svr2.pb.swift @@ -17,7 +17,11 @@ // Copyright 2023 Signal Messenger, LLC // SPDX-License-Identifier: AGPL-3.0-only +#if canImport(FoundationEssentials) +import FoundationEssentials +#else import Foundation +#endif import SwiftProtobuf // If the compiler emits an error on this type, it is because this file