From 11007f343c05dbf0292f2c81976653530877c3be Mon Sep 17 00:00:00 2001 From: Miltiadis Vasilakis Date: Fri, 15 Nov 2024 12:31:41 +0200 Subject: [PATCH 1/2] Update SPM dependencies --- Zotero.xcodeproj/project.pbxproj | 6 +++--- .../xcshareddata/swiftpm/Package.resolved | 16 ++++++++-------- Zotero/Scenes/Detail/PDF/PDFCoordinator.swift | 13 ------------- .../PDF/Views/PDFDocumentViewController.swift | 14 -------------- 4 files changed, 11 insertions(+), 38 deletions(-) diff --git a/Zotero.xcodeproj/project.pbxproj b/Zotero.xcodeproj/project.pbxproj index 1c1bed36a..f0857dd55 100644 --- a/Zotero.xcodeproj/project.pbxproj +++ b/Zotero.xcodeproj/project.pbxproj @@ -6662,7 +6662,7 @@ repositoryURL = "https://github.com/Quick/Nimble"; requirement = { kind = exactVersion; - version = 13.6.0; + version = 13.6.2; }; }; B356A38E2524A6BA003F1943 /* XCRemoteSwiftPackageReference "Quick" */ = { @@ -6694,7 +6694,7 @@ repositoryURL = "https://github.com/realm/realm-cocoa"; requirement = { kind = exactVersion; - version = 10.54.0; + version = 10.54.1; }; }; B35E4B8B25248B3C000EA134 /* XCRemoteSwiftPackageReference "RxSwift" */ = { @@ -6710,7 +6710,7 @@ repositoryURL = "https://github.com/PSPDFKit/PSPDFKit-SP"; requirement = { kind = exactVersion; - version = 14.1.0; + version = 14.2.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 53ba3f2db..1bac3660c 100644 --- a/Zotero.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Zotero.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -51,8 +51,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/Quick/Nimble", "state" : { - "revision" : "6416749c3c0488664fff6b42f8bf3ea8dc282ca1", - "version" : "13.6.0" + "revision" : "f3bedd7c2a858f4513e7d004def200a69238db2f", + "version" : "13.6.2" } }, { @@ -78,8 +78,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/PSPDFKit/PSPDFKit-SP", "state" : { - "revision" : "16bc87c8d6dc3af0c57ecaf12a69ca6b58634531", - "version" : "14.1.0" + "revision" : "3cdcac00ee7bce16b96d7aafcdc56b5837773d55", + "version" : "14.2.0" } }, { @@ -96,8 +96,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/realm/realm-cocoa", "state" : { - "revision" : "863498d37a9f0e72caa65963da9641d8cdfc8228", - "version" : "10.54.0" + "revision" : "5553cfd1c789efdb3d6daf7f0cc0733cfe601846", + "version" : "10.54.1" } }, { @@ -105,8 +105,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/realm/realm-core.git", "state" : { - "revision" : "e474a8d2270a8b12ac63ac9504e4757e39814b99", - "version" : "14.13.0" + "revision" : "85eeca41654cc9070ad81a21a4b1d153ad467c33", + "version" : "14.13.1" } }, { diff --git a/Zotero/Scenes/Detail/PDF/PDFCoordinator.swift b/Zotero/Scenes/Detail/PDF/PDFCoordinator.swift index fc957e132..319c5e0cf 100644 --- a/Zotero/Scenes/Detail/PDF/PDFCoordinator.swift +++ b/Zotero/Scenes/Detail/PDF/PDFCoordinator.swift @@ -27,7 +27,6 @@ protocol PdfReaderCoordinatorDelegate: AnyObject { func show(error: PDFDocumentExporter.Error) func share(url: URL, barButton: UIBarButtonItem) func share(text: String, rect: CGRect, view: UIView, userInterfaceStyle: UIUserInterfaceStyle) - func lookup(text: String, rect: CGRect, view: UIView, userInterfaceStyle: UIUserInterfaceStyle) func showDeletedAlertForPdf(completion: @escaping (Bool) -> Void) func showSettings(with settings: PDFSettings, sender: UIBarButtonItem) -> ViewModel func showReader(document: Document, userInterfaceStyle: UIUserInterfaceStyle) @@ -297,18 +296,6 @@ extension PDFCoordinator: PdfReaderCoordinatorDelegate { self.share(item: text, sourceView: .view(view, rect), userInterfaceStyle: userInterfaceStyle) } - func lookup(text: String, rect: CGRect, view: UIView, userInterfaceStyle: UIUserInterfaceStyle) { - DDLogInfo("PDFCoordinator: show lookup") - // When presented as a popover, UIReferenceLibraryViewController ignores overrideUserInterfaceStyle, so we wrap it in a navigation controller to force it. - let controller = UINavigationController(rootViewController: UIReferenceLibraryViewController(term: text)) - controller.setNavigationBarHidden(true, animated: false) - controller.overrideUserInterfaceStyle = userInterfaceStyle - controller.modalPresentationStyle = .popover - controller.popoverPresentationController?.sourceView = view - controller.popoverPresentationController?.sourceRect = rect - self.navigationController?.present(controller, animated: true, completion: nil) - } - func show(error: PDFReaderState.Error) { let title: String let message: String diff --git a/Zotero/Scenes/Detail/PDF/Views/PDFDocumentViewController.swift b/Zotero/Scenes/Detail/PDF/Views/PDFDocumentViewController.swift index 1c9ed23cf..26224fe22 100644 --- a/Zotero/Scenes/Detail/PDF/Views/PDFDocumentViewController.swift +++ b/Zotero/Scenes/Detail/PDF/Views/PDFDocumentViewController.swift @@ -782,9 +782,6 @@ extension PDFDocumentViewController: PDFViewControllerDelegate { return action } - case .PSPDFKit.accessibility: - return action - case .share: guard action.identifier == .PSPDFKit.share else { return nil } return action.replacing(handler: { [weak self] _ in @@ -799,17 +796,6 @@ extension PDFDocumentViewController: PDFViewControllerDelegate { case .pspdfkitActions: switch action.identifier { - case .PSPDFKit.define: - return action.replacing(title: L10n.lookUp, handler: { [weak self] _ in - guard let self else { return } - coordinatorDelegate?.lookup( - text: glyphs.text, - rect: pageView.convert(glyphs.boundingBox, from: pageView.pdfCoordinateSpace), - view: pageView, - userInterfaceStyle: viewModel.state.settings.appearanceMode.userInterfaceStyle - ) - }) - case .PSPDFKit.searchDocument: return action.replacing(handler: { [weak self] _ in guard let self, let pdfController else { return } From a642c979f7202b9989bff6b394da271f1f114638 Mon Sep 17 00:00:00 2001 From: Miltiadis Vasilakis Date: Mon, 18 Nov 2024 13:13:36 +0200 Subject: [PATCH 2/2] Update github actions --- .github/workflows/run-tests.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index d012cf38b..e84b1031d 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -11,12 +11,12 @@ on: jobs: tests: name: Run Xcode Tests - runs-on: macos-14 + runs-on: macos-15 strategy: matrix: - xcode: ["16.0"] - ios_version: ["18.0"] - device_name: ["iPhone 15"] + xcode: ["16.1"] + ios_version: ["18.1"] + device_name: ["iPhone 16"] steps: - name: Checkout