Update SPM dependencies (#1075)

zotero · Feb 20, 2025 · 2191cb4 · 2191cb4
1 parent 71f3057
commit 2191cb4
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 63 deletions.
diff --git a/.gitignore b/.gitignore
@@ -81,4 +81,3 @@ bundled/translators
 bundled/styles
 bundled/locales
 bundled/note_editor
-bundled/fonts
diff --git a/Zotero.xcodeproj/project.pbxproj b/Zotero.xcodeproj/project.pbxproj
@@ -4325,7 +4325,6 @@
 				B3593F142668D37900FA4BB2 /* Bundle Styles */,
 				B34A85AC243CB1E4003D5638 /* Bundle Translators */,
 				B3A1D03D2BA321B30040FEE9 /* Bundle Note Editor */,
-				61975C432D3A84F5005BB41A /* Fetch Bundled Fonts */,
 				B337A5AD244F229400AFD13D /* SwiftGen */,
 				B30D59512206F60400884C4A /* Sources */,
 				B30D59522206F60400884C4A /* Frameworks */,
@@ -4637,26 +4636,6 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		61975C432D3A84F5005BB41A /* Fetch Bundled Fonts */ = {
-			isa = PBXShellScriptBuildPhase;
-			alwaysOutOfDate = 1;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-				"$(SRCROOT)/scripts/fetch_bundled_fonts.sh",
-			);
-			name = "Fetch Bundled Fonts";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "sh \"$SCRIPT_INPUT_FILE_0\"\n";
-		};
 		61AE2F282A2619E50072571D /* SwiftLint */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
@@ -6654,7 +6633,7 @@
 			repositoryURL = "https://github.com/microsoft/plcrashreporter";
 			requirement = {
 				kind = exactVersion;
-				version = 1.11.2;
+				version = 1.11.3;
 			};
 		};
 		B356A361252490B3003F1943 /* XCRemoteSwiftPackageReference "Alamofire" */ = {
@@ -6742,15 +6721,15 @@
 			repositoryURL = "https://github.com/ReactiveX/RxSwift";
 			requirement = {
 				kind = exactVersion;
-				version = 6.8.0;
+				version = 6.9.0;
 			};
 		};
 		B3A6C59D252CA08200F24CBE /* XCRemoteSwiftPackageReference "PSPDFKit-SP" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/PSPDFKit/PSPDFKit-SP";
 			requirement = {
 				kind = exactVersion;
-				version = 14.4.0;
+				version = 14.5.0;
 			};
 		};
 		B3D84BEE27919FDE005DDD7C /* XCRemoteSwiftPackageReference "Starscream" */ = {

diff --git a/Zotero.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Zotero.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -69,17 +69,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/microsoft/plcrashreporter",
       "state" : {
-        "revision" : "6752f71de206f6a53fa6a758c3660fd9a7fe7527",
-        "version" : "1.11.2"
+        "revision" : "fec2ff791b27fd9b9ceab9072025dea56409cca1",
+        "version" : "1.11.3"
       }
     },
     {
       "identity" : "pspdfkit-sp",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/PSPDFKit/PSPDFKit-SP",
       "state" : {
-        "revision" : "63d63a932acca943551f1774e04c14ab4777c974",
-        "version" : "14.4.0"
+        "revision" : "75290ecfb74615cccb52a0884d50f08597735ef3",
+        "version" : "14.5.0"
       }
     },
     {
@@ -114,8 +114,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/ReactiveX/RxSwift",
       "state" : {
-        "revision" : "c7c7d2cf50a3211fe2843f76869c698e4e417930",
-        "version" : "6.8.0"
+        "revision" : "5dd1907d64f0d36f158f61a466bab75067224893",
+        "version" : "6.9.0"
       }
     },
     {

diff --git a/Zotero/AppDelegate.swift b/Zotero/AppDelegate.swift
@@ -220,9 +220,7 @@ extension AppDelegate: SceneActivityCounter {
 extension AppDelegate: UIApplicationDelegate {
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         if let key = Licenses.shared.pspdfkitKey {
-            let additionalFontDirectory = Bundle.main.bundleURL.appendingPathComponent("Bundled/fonts", isDirectory: true).path
-            let options: [SDK.Setting: Any] = [.additionalFontDirectories: [additionalFontDirectory]]
-            PSPDFKit.SDK.setLicenseKey(key, options: options)
+            PSPDFKit.SDK.setLicenseKey(key)
         }
         DDLogInfo("AppDelegate: clearPSPDFKitCacheGuard: \(Defaults.shared.clearPSPDFKitCacheGuard); currentClearPSPDFKitCacheGuard: \(Defaults.currentClearPSPDFKitCacheGuard)")
         if Defaults.shared.clearPSPDFKitCacheGuard < Defaults.currentClearPSPDFKitCacheGuard {

diff --git a/Zotero/Models/Defaults.swift b/Zotero/Models/Defaults.swift
@@ -176,7 +176,7 @@ final class Defaults {
     var didPerformFullSyncFix: Bool
 
     // Increment currentClearPSPDFKitCacheGuard by 1, whenever the upcoming release should clear the PSPDFKit cache.
-    static let currentClearPSPDFKitCacheGuard = 1
+    static let currentClearPSPDFKitCacheGuard = 2
     @UserDefault(key: "ClearPSPDFKitCacheGuard", defaultValue: currentClearPSPDFKitCacheGuard - 1)
     var clearPSPDFKitCacheGuard: Int
 

diff --git a/scripts/fetch_bundled_fonts.sh b/scripts/fetch_bundled_fonts.sh