Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update SPM dependencies #1025

Merged
merged 2 commits into from
Nov 18, 2024
Merged

Update SPM dependencies #1025

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11007f3
Update SPM dependencies
mvasilak Nov 15, 2024
a642c97
Update github actions
mvasilak Nov 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/run-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions Zotero.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6662,7 +6662,7 @@
repositoryURL = "https://github.com/Quick/Nimble";
requirement = {
kind = exactVersion;
version = 13.6.0;
version = 13.6.2;
};
};
B356A38E2524A6BA003F1943 /* XCRemoteSwiftPackageReference "Quick" */ = {
Expand Down Expand Up @@ -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" */ = {
Expand All @@ -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" */ = {
Expand Down
16 changes: 8 additions & 8 deletions Zotero.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
},
{
Expand All @@ -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"
}
},
{
Expand All @@ -96,17 +96,17 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/realm/realm-cocoa",
"state" : {
"revision" : "863498d37a9f0e72caa65963da9641d8cdfc8228",
"version" : "10.54.0"
"revision" : "5553cfd1c789efdb3d6daf7f0cc0733cfe601846",
"version" : "10.54.1"
}
},
{
"identity" : "realm-core",
"kind" : "remoteSourceControl",
"location" : "https://github.com/realm/realm-core.git",
"state" : {
"revision" : "e474a8d2270a8b12ac63ac9504e4757e39814b99",
"version" : "14.13.0"
"revision" : "85eeca41654cc9070ad81a21a4b1d153ad467c33",
"version" : "14.13.1"
}
},
{
Expand Down
13 changes: 0 additions & 13 deletions Zotero/Scenes/Detail/PDF/PDFCoordinator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<ReaderSettingsActionHandler>
func showReader(document: Document, userInterfaceStyle: UIUserInterfaceStyle)
Expand Down Expand Up @@ -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
Expand Down
14 changes: 0 additions & 14 deletions Zotero/Scenes/Detail/PDF/Views/PDFDocumentViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 }
Expand Down