Skip to content

Commit 5928649

Browse files
mvasilakmvasilak
authored
Drop support for iOS 15 (#1056)
Update PSPDFKit/PSPDFKit-SP to 14.3.0 Remove unnecessary code
1 parent f3eddec commit 5928649

File tree

8 files changed

+17
-60
lines changed

8 files changed

+17
-60
lines changed

‎Zotero.xcodeproj/project.pbxproj

+13-13
Original file line numberDiff line numberDiff line change
@@ -6127,7 +6127,7 @@
61276127
);
61286128
GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
61296129
INFOPLIST_FILE = Zotero/Info.plist;
6130-
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
6130+
IPHONEOS_DEPLOYMENT_TARGET = 16.6;
61316131
LD_RUNPATH_SEARCH_PATHS = (
61326132
"$(inherited)",
61336133
"@executable_path/Frameworks",
@@ -6164,7 +6164,7 @@
61646164
);
61656165
GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
61666166
INFOPLIST_FILE = Zotero/Info.plist;
6167-
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
6167+
IPHONEOS_DEPLOYMENT_TARGET = 16.6;
61686168
LD_RUNPATH_SEARCH_PATHS = (
61696169
"$(inherited)",
61706170
"@executable_path/Frameworks",
@@ -6197,7 +6197,7 @@
61976197
"TESTING=1",
61986198
);
61996199
INFOPLIST_FILE = ZoteroTests/Info.plist;
6200-
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
6200+
IPHONEOS_DEPLOYMENT_TARGET = 16.6;
62016201
LD_RUNPATH_SEARCH_PATHS = (
62026202
"$(inherited)",
62036203
"@executable_path/Frameworks",
@@ -6223,7 +6223,7 @@
62236223
COPY_PHASE_STRIP = YES;
62246224
DEVELOPMENT_TEAM = 8LAYR367YV;
62256225
INFOPLIST_FILE = ZoteroTests/Info.plist;
6226-
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
6226+
IPHONEOS_DEPLOYMENT_TARGET = 16.6;
62276227
LD_RUNPATH_SEARCH_PATHS = (
62286228
"$(inherited)",
62296229
"@executable_path/Frameworks",
@@ -6248,7 +6248,7 @@
62486248
COPY_PHASE_STRIP = YES;
62496249
DEVELOPMENT_TEAM = 8LAYR367YV;
62506250
INFOPLIST_FILE = ZoteroUITests/Info.plist;
6251-
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
6251+
IPHONEOS_DEPLOYMENT_TARGET = 16.6;
62526252
LD_RUNPATH_SEARCH_PATHS = (
62536253
"$(inherited)",
62546254
"@executable_path/Frameworks",
@@ -6273,7 +6273,7 @@
62736273
COPY_PHASE_STRIP = YES;
62746274
DEVELOPMENT_TEAM = 8LAYR367YV;
62756275
INFOPLIST_FILE = ZoteroUITests/Info.plist;
6276-
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
6276+
IPHONEOS_DEPLOYMENT_TARGET = 16.6;
62776277
LD_RUNPATH_SEARCH_PATHS = (
62786278
"$(inherited)",
62796279
"@executable_path/Frameworks",
@@ -6304,7 +6304,7 @@
63046304
"$(PROJECT_DIR)",
63056305
);
63066306
INFOPLIST_FILE = ZShare/Info.plist;
6307-
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
6307+
IPHONEOS_DEPLOYMENT_TARGET = 16.6;
63086308
LD_RUNPATH_SEARCH_PATHS = (
63096309
"$(inherited)",
63106310
"@executable_path/Frameworks",
@@ -6338,7 +6338,7 @@
63386338
"$(PROJECT_DIR)",
63396339
);
63406340
INFOPLIST_FILE = ZShare/Info.plist;
6341-
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
6341+
IPHONEOS_DEPLOYMENT_TARGET = 16.6;
63426342
LD_RUNPATH_SEARCH_PATHS = (
63436343
"$(inherited)",
63446344
"@executable_path/Frameworks",
@@ -6440,7 +6440,7 @@
64406440
);
64416441
GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
64426442
INFOPLIST_FILE = Zotero/Info.plist;
6443-
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
6443+
IPHONEOS_DEPLOYMENT_TARGET = 16.6;
64446444
LD_RUNPATH_SEARCH_PATHS = (
64456445
"$(inherited)",
64466446
"@executable_path/Frameworks",
@@ -6474,7 +6474,7 @@
64746474
"TESTING=1",
64756475
);
64766476
INFOPLIST_FILE = ZoteroTests/Info.plist;
6477-
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
6477+
IPHONEOS_DEPLOYMENT_TARGET = 16.6;
64786478
LD_RUNPATH_SEARCH_PATHS = (
64796479
"$(inherited)",
64806480
"@executable_path/Frameworks",
@@ -6499,7 +6499,7 @@
64996499
COPY_PHASE_STRIP = YES;
65006500
DEVELOPMENT_TEAM = 8LAYR367YV;
65016501
INFOPLIST_FILE = ZoteroUITests/Info.plist;
6502-
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
6502+
IPHONEOS_DEPLOYMENT_TARGET = 16.6;
65036503
LD_RUNPATH_SEARCH_PATHS = (
65046504
"$(inherited)",
65056505
"@executable_path/Frameworks",
@@ -6530,7 +6530,7 @@
65306530
"$(PROJECT_DIR)",
65316531
);
65326532
INFOPLIST_FILE = ZShare/Info.plist;
6533-
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
6533+
IPHONEOS_DEPLOYMENT_TARGET = 16.6;
65346534
LD_RUNPATH_SEARCH_PATHS = (
65356535
"$(inherited)",
65366536
"@executable_path/Frameworks",
@@ -6714,7 +6714,7 @@
67146714
repositoryURL = "https://github.com/PSPDFKit/PSPDFKit-SP";
67156715
requirement = {
67166716
kind = exactVersion;
6717-
version = 14.1.1;
6717+
version = 14.3.0;
67186718
};
67196719
};
67206720
B3D84BEE27919FDE005DDD7C /* XCRemoteSwiftPackageReference "Starscream" */ = {

‎Zotero.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

+2-2
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@
7878
"kind" : "remoteSourceControl",
7979
"location" : "https://github.com/PSPDFKit/PSPDFKit-SP",
8080
"state" : {
81-
"revision" : "80539b4cf5f06bc987b1ceae49b42959f256896b",
82-
"version" : "14.1.1"
81+
"revision" : "ef3a12718e273fe0b0fee1cf664b6de077d66a69",
82+
"version" : "14.3.0"
8383
}
8484
},
8585
{

‎Zotero/Scenes/AppCoordinator.swift

+1-5
Original file line numberDiff line numberDiff line change
@@ -819,11 +819,7 @@ extension AppCoordinator: ConflictReceiver {
819819
domainName = "zotero.org"
820820
} else {
821821
let url = URL(string: webDavController.sessionStorage.url)
822-
if #available(iOS 16.0, *) {
823-
domainName = url?.host() ?? ""
824-
} else {
825-
domainName = url?.host ?? ""
826-
}
822+
domainName = url?.host() ?? ""
827823
}
828824

829825
let actions = [UIAlertAction(title: L10n.Errors.Sync.resetGroupFiles, style: .cancel, handler: { _ in

‎Zotero/Scenes/Detail/PDF/PDFCoordinator.swift

-13
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ protocol PdfReaderCoordinatorDelegate: AnyObject {
2727
func show(error: PDFDocumentExporter.Error)
2828
func share(url: URL, barButton: UIBarButtonItem)
2929
func share(text: String, rect: CGRect, view: UIView, userInterfaceStyle: UIUserInterfaceStyle)
30-
func lookup(text: String, rect: CGRect, view: UIView, userInterfaceStyle: UIUserInterfaceStyle)
3130
func showDeletedAlertForPdf(completion: @escaping (Bool) -> Void)
3231
func showSettings(with settings: PDFSettings, sender: UIBarButtonItem) -> ViewModel<ReaderSettingsActionHandler>
3332
func showReader(document: Document, userInterfaceStyle: UIUserInterfaceStyle)
@@ -304,18 +303,6 @@ extension PDFCoordinator: PdfReaderCoordinatorDelegate {
304303
self.share(item: text, sourceView: .view(view, rect), userInterfaceStyle: userInterfaceStyle)
305304
}
306305

307-
func lookup(text: String, rect: CGRect, view: UIView, userInterfaceStyle: UIUserInterfaceStyle) {
308-
DDLogInfo("PDFCoordinator: show lookup")
309-
// When presented as a popover, UIReferenceLibraryViewController ignores overrideUserInterfaceStyle, so we wrap it in a navigation controller to force it.
310-
let controller = UINavigationController(rootViewController: UIReferenceLibraryViewController(term: text))
311-
controller.setNavigationBarHidden(true, animated: false)
312-
controller.overrideUserInterfaceStyle = userInterfaceStyle
313-
controller.modalPresentationStyle = .popover
314-
controller.popoverPresentationController?.sourceView = view
315-
controller.popoverPresentationController?.sourceRect = rect
316-
self.navigationController?.present(controller, animated: true, completion: nil)
317-
}
318-
319306
func show(error: PDFReaderState.Error) {
320307
let title: String
321308
let message: String

‎Zotero/Scenes/Detail/PDF/Views/PDFDocumentViewController.swift

-14
Original file line numberDiff line numberDiff line change
@@ -782,9 +782,6 @@ extension PDFDocumentViewController: PDFViewControllerDelegate {
782782
return action
783783
}
784784

785-
case .PSPDFKit.accessibility:
786-
return action
787-
788785
case .share:
789786
guard action.identifier == .PSPDFKit.share else { return nil }
790787
return action.replacing(handler: { [weak self] _ in
@@ -799,17 +796,6 @@ extension PDFDocumentViewController: PDFViewControllerDelegate {
799796

800797
case .pspdfkitActions:
801798
switch action.identifier {
802-
case .PSPDFKit.define:
803-
return action.replacing(title: L10n.lookUp, handler: { [weak self] _ in
804-
guard let self else { return }
805-
coordinatorDelegate?.lookup(
806-
text: glyphs.text,
807-
rect: pageView.convert(glyphs.boundingBox, from: pageView.pdfCoordinateSpace),
808-
view: pageView,
809-
userInterfaceStyle: viewModel.state.settings.appearanceMode.userInterfaceStyle
810-
)
811-
})
812-
813799
case .PSPDFKit.searchDocument:
814800
return action.replacing(handler: { [weak self] _ in
815801
guard let self, let pdfController else { return }

‎Zotero/Scenes/Detail/PDF/Views/PDFReaderViewController.swift

-3
Original file line numberDiff line numberDiff line change
@@ -369,9 +369,6 @@ class PDFReaderViewController: UIViewController {
369369
}
370370

371371
override func viewIsAppearing(_ animated: Bool) {
372-
if #unavailable(iOS 16.0) {
373-
children.forEach { $0.viewIsAppearing(animated) }
374-
}
375372
super.viewIsAppearing(animated)
376373
let editingEnabled = viewModel.state.library.metadataEditable && !viewModel.state.document.isLocked
377374
annotationToolbarHandler.viewIsAppearing(editingEnabled: editingEnabled)

‎Zotero/Scenes/Detail/PDF/Views/PDFSidebarViewController.swift

-7
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,6 @@ class PDFSidebarViewController: UIViewController {
7272
select(tab: .annotations)
7373
}
7474

75-
override func viewIsAppearing(_ animated: Bool) {
76-
if #unavailable(iOS 16.0) {
77-
children.forEach { $0.viewIsAppearing(animated) }
78-
}
79-
super.viewIsAppearing(animated)
80-
}
81-
8275
private func select(tab: Tab) {
8376
guard let index = Tab.sortedTabs.firstIndex(of: tab) else { return }
8477
picker.selectedSegmentIndex = index

‎Zotero/Scenes/General/Views/TagPickerViewController.swift

+1-3
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,7 @@ final class TagPickerViewController: UIViewController {
134134
.disposed(by: self.disposeBag)
135135

136136
self.navigationItem.searchController = searchController
137-
if #available(iOS 16.0, *) {
138-
self.navigationItem.preferredSearchBarPlacement = .stacked
139-
}
137+
self.navigationItem.preferredSearchBarPlacement = .stacked
140138
self.navigationItem.hidesSearchBarWhenScrolling = false
141139
}
142140

0 commit comments

Comments
 (0)