From 2ab1a41059d3c640db25834e0731cab6a4c21ea9 Mon Sep 17 00:00:00 2001 From: Miltiadis Vasilakis Date: Mon, 21 Oct 2024 13:20:09 +0300 Subject: [PATCH] Update dependencies (#1020) * Update dependencies * Fix warnings --- Zotero.xcodeproj/project.pbxproj | 12 ++++---- .../xcshareddata/swiftpm/Package.resolved | 28 +++++++++---------- .../IdentifierLookupController.swift | 2 +- Zotero/Models/Convertible.swift | 2 +- ZoteroTests/SyncActionsSpec.swift | 2 +- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Zotero.xcodeproj/project.pbxproj b/Zotero.xcodeproj/project.pbxproj index a1287bb28..07d6ac20d 100644 --- a/Zotero.xcodeproj/project.pbxproj +++ b/Zotero.xcodeproj/project.pbxproj @@ -6528,7 +6528,7 @@ repositoryURL = "https://github.com/apple/swift-collections.git"; requirement = { kind = exactVersion; - version = 1.1.3; + version = 1.1.4; }; }; B3445F4426EF5EE9007D4009 /* XCRemoteSwiftPackageReference "plcrashreporter" */ = { @@ -6544,7 +6544,7 @@ repositoryURL = "https://github.com/Alamofire/Alamofire"; requirement = { kind = exactVersion; - version = 5.9.1; + version = 5.10.1; }; }; B356A367252490DB003F1943 /* XCRemoteSwiftPackageReference "keychain-swift" */ = { @@ -6584,7 +6584,7 @@ repositoryURL = "https://github.com/Quick/Nimble"; requirement = { kind = exactVersion; - version = 13.5.0; + version = 13.6.0; }; }; B356A38E2524A6BA003F1943 /* XCRemoteSwiftPackageReference "Quick" */ = { @@ -6616,7 +6616,7 @@ repositoryURL = "https://github.com/realm/realm-cocoa"; requirement = { kind = exactVersion; - version = 20.0.0; + version = 10.54.0; }; }; B35E4B8B25248B3C000EA134 /* XCRemoteSwiftPackageReference "RxSwift" */ = { @@ -6624,7 +6624,7 @@ repositoryURL = "https://github.com/ReactiveX/RxSwift"; requirement = { kind = exactVersion; - version = 6.7.1; + version = 6.8.0; }; }; B3A6C59D252CA08200F24CBE /* XCRemoteSwiftPackageReference "PSPDFKit-SP" */ = { @@ -6632,7 +6632,7 @@ repositoryURL = "https://github.com/PSPDFKit/PSPDFKit-SP"; requirement = { kind = exactVersion; - version = 14.0.0; + version = 14.1.0; }; }; B3D84BEE27919FDE005DDD7C /* XCRemoteSwiftPackageReference "Starscream" */ = { diff --git a/Zotero.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Zotero.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index a3032655c..53ba3f2db 100644 --- a/Zotero.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Zotero.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -6,8 +6,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/Alamofire/Alamofire", "state" : { - "revision" : "f455c2975872ccd2d9c81594c658af65716e9b9a", - "version" : "5.9.1" + "revision" : "e16d3481f5ed35f0472cb93350085853d754913f", + "version" : "5.10.1" } }, { @@ -51,8 +51,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/Quick/Nimble", "state" : { - "revision" : "cecacf00ddf36c1efff8d14beb65087f2a676be9", - "version" : "13.5.0" + "revision" : "6416749c3c0488664fff6b42f8bf3ea8dc282ca1", + "version" : "13.6.0" } }, { @@ -78,8 +78,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/PSPDFKit/PSPDFKit-SP", "state" : { - "revision" : "39c61f0746177e6f7795d6f9b62fe0c39a1d7de2", - "version" : "14.0.0" + "revision" : "16bc87c8d6dc3af0c57ecaf12a69ca6b58634531", + "version" : "14.1.0" } }, { @@ -96,8 +96,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/realm/realm-cocoa", "state" : { - "revision" : "7ea8be1f74034bae860120d58d3491c4fcedff5b", - "version" : "20.0.0" + "revision" : "863498d37a9f0e72caa65963da9641d8cdfc8228", + "version" : "10.54.0" } }, { @@ -105,8 +105,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/realm/realm-core.git", "state" : { - "revision" : "f98720a07e6150c41c953e1937108225550ba155", - "version" : "20.0.0" + "revision" : "e474a8d2270a8b12ac63ac9504e4757e39814b99", + "version" : "14.13.0" } }, { @@ -114,8 +114,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/ReactiveX/RxSwift", "state" : { - "revision" : "b06a8c8596e4c3e8e7788e08e720e3248563ce6a", - "version" : "6.7.1" + "revision" : "c7c7d2cf50a3211fe2843f76869c698e4e417930", + "version" : "6.8.0" } }, { @@ -159,8 +159,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-collections.git", "state" : { - "revision" : "9bf03ff58ce34478e66aaee630e491823326fd06", - "version" : "1.1.3" + "revision" : "671108c96644956dddcd89dd59c203dcdb36cec7", + "version" : "1.1.4" } }, { diff --git a/Zotero/Controllers/IdentifierLookupController.swift b/Zotero/Controllers/IdentifierLookupController.swift index bd451672e..83111bce3 100644 --- a/Zotero/Controllers/IdentifierLookupController.swift +++ b/Zotero/Controllers/IdentifierLookupController.swift @@ -533,7 +533,7 @@ final class IdentifierLookupController { let keys = lookupWebViewHandlersByLookupSettings.keys for key in keys { guard let webView = lookupWebViewHandlersByLookupSettings.removeValue(forKey: key)?.webViewHandler.webView else { continue } - inMainThread { + DispatchQueue.main.async { webView.removeFromSuperview() } } diff --git a/Zotero/Models/Convertible.swift b/Zotero/Models/Convertible.swift index 97c98cb82..b0d442282 100644 --- a/Zotero/Models/Convertible.swift +++ b/Zotero/Models/Convertible.swift @@ -10,7 +10,7 @@ import Foundation import Alamofire -struct Convertible { +struct Convertible: @unchecked Sendable { let url: URL private let token: String? private let httpMethod: ApiHttpMethod diff --git a/ZoteroTests/SyncActionsSpec.swift b/ZoteroTests/SyncActionsSpec.swift index d71fc89dc..7bdaebd32 100644 --- a/ZoteroTests/SyncActionsSpec.swift +++ b/ZoteroTests/SyncActionsSpec.swift @@ -748,7 +748,7 @@ final class SyncActionsSpec: QuickSpec { } } -extension SyncActionError: Equatable { +extension SyncActionError: @retroactive Equatable { public static func == (lhs: SyncActionError, rhs: SyncActionError) -> Bool { switch (lhs, rhs) { case (.attachmentItemNotSubmitted, .attachmentItemNotSubmitted), (.attachmentAlreadyUploaded, .attachmentAlreadyUploaded), (.submitUpdateFailures, .submitUpdateFailures):