fix(macOS): Drop macOS 12 Support

i2h3 · i2h3 · commit 78f36bf63926 · 2026-02-20T15:35:49.000+01:00
- Raised required macOS version to 13 for Swift packages.
- Removed fallback code switches for macOS and file provider framework releases before macOS 13.
- Consolidated Xcode project build settings into single declaration in build settings file.

Signed-off-by: Iva Horn &lt;iva.horn@nextcloud.com&gt;
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,7 +7,7 @@ cmake_policy(SET CMP0071 NEW) # Enable use of QtQuick compiler/generated code
 project(client)
 
 if(APPLE)
-    set(CMAKE_OSX_DEPLOYMENT_TARGET "12.0" CACHE STRING "Minimum OSX deployment version")
+    set(CMAKE_OSX_DEPLOYMENT_TARGET "13.0" CACHE STRING "Minimum OSX deployment version")
 endif()
 
 set(CMAKE_CXX_STANDARD 20)
diff --git a/admin/osx/mac-crafter/Package.swift b/admin/osx/mac-crafter/Package.swift
@@ -11,7 +11,7 @@ import PackageDescription
 let package = Package(
     name: "mac-crafter",
     platforms: [
-        .macOS(.v12),
+        .macOS(.v13),
     ],
     dependencies: [
         .package(url: "https://github.com/apple/swift-argument-parser", from: "1.4.0")
diff --git a/cmake/modules/MacOSXBundleInfo.plist.in b/cmake/modules/MacOSXBundleInfo.plist.in
@@ -5,7 +5,7 @@
     <key>NSPrincipalClass</key>
     <string>NSApplication</string>
     <key>LSMinimumSystemVersion</key>
-    <string>12.0</string>
+    <string>13.0</string>
     <key>LSUIElement</key>
     <true/>
     <key>CFBundleDevelopmentRegion</key>
diff --git a/craftmaster.ini b/craftmaster.ini
@@ -18,7 +18,7 @@ CreateCache = False
 # Category is case sensitive
 [GeneralSettings]
 
-General/MacDeploymentTarget = 12.0
+General/MacDeploymentTarget = 13.0
 
 Compile/BuildType = RelWithDebInfo
 
diff --git a/shell_integration/MacOSX/NextcloudFileProviderKit/Package.swift b/shell_integration/MacOSX/NextcloudFileProviderKit/Package.swift
@@ -7,7 +7,7 @@ let package = Package(
     name: "NextcloudFileProviderKit",
     platforms: [
         .iOS(.v16),
-        .macOS(.v12),
+        .macOS(.v13),
         .visionOS(.v1)
     ],
     products: [
diff --git a/shell_integration/MacOSX/NextcloudFileProviderKit/Sources/NextcloudFileProviderKit/Database/FilesDatabaseManager+KeepDownloaded.swift b/shell_integration/MacOSX/NextcloudFileProviderKit/Sources/NextcloudFileProviderKit/Database/FilesDatabaseManager+KeepDownloaded.swift
@@ -6,17 +6,6 @@ import RealmSwift
 
 public extension FilesDatabaseManager {
     func set(keepDownloaded: Bool, for metadata: SendableItemMetadata) throws -> SendableItemMetadata? {
-        guard #available(macOS 13.0, iOS 16.0, visionOS 1.0, *) else {
-            let error = "Could not update keepDownloaded status for item because the system does not support this state."
-            logger.error(error, [.item: metadata.ocId, .name: metadata.fileName])
-
-            throw NSError(
-                domain: Self.errorDomain,
-                code: NSFeatureUnsupportedError,
-                userInfo: [NSLocalizedDescriptionKey: error]
-            )
-        }
-
         guard let result = itemMetadatas.where({ $0.ocId == metadata.ocId }).first else {
             let error = "Did not update keepDownloaded for item metadata as it was not found."
             logger.error(error, [.item: metadata.ocId, .name: metadata.fileName])
diff --git a/shell_integration/MacOSX/NextcloudFileProviderKit/Sources/NextcloudFileProviderKit/Item/Item+Fetch.swift b/shell_integration/MacOSX/NextcloudFileProviderKit/Sources/NextcloudFileProviderKit/Item/Item+Fetch.swift
@@ -117,12 +117,9 @@ public extension Item {
 
             if let domain, let localUrl = await localUrlForContents(domain: domain) {
                 return (localUrl, self, nil)
-            } else if #available(macOS 13.0, *) {
-                logger.error("Could not get local contents URL for lock file, erroring.")
-                return (nil, self, NSFileProviderError(.excludedFromSync))
             } else {
-                logger.error("Could not get local contents URL for lock file, nilling.")
-                return (nil, self, nil)
+                logger.error("Could not get local content URL for lock file.")
+                return (nil, self, NSFileProviderError(.excludedFromSync))
             }
         }
 
diff --git a/shell_integration/MacOSX/NextcloudFileProviderKit/Sources/NextcloudFileProviderKit/Item/Item+Ignored.swift b/shell_integration/MacOSX/NextcloudFileProviderKit/Sources/NextcloudFileProviderKit/Item/Item+Ignored.swift
@@ -67,10 +67,6 @@ extension Item {
             log: log
         )
 
-        if #available(macOS 13.0, *) {
-            return (item, NSFileProviderError(.excludedFromSync))
-        } else {
-            return (item, nil)
-        }
+        return (item, NSFileProviderError(.excludedFromSync))
     }
 }
diff --git a/shell_integration/MacOSX/NextcloudFileProviderKit/Sources/NextcloudFileProviderKit/Item/Item+KeepDownloaded.swift b/shell_integration/MacOSX/NextcloudFileProviderKit/Sources/NextcloudFileProviderKit/Item/Item+KeepDownloaded.swift
@@ -24,16 +24,10 @@ public extension Item {
             }
         }
 
-        if #available(macOS 13.0, iOS 16.0, visionOS 1.0, *) {
-            if keepDownloaded, !isDownloaded {
-                try await manager.requestDownloadForItem(withIdentifier: itemIdentifier)
-            } else {
-                try await manager.requestModification(
-                    of: [.lastUsedDate], forItemWithIdentifier: itemIdentifier
-                )
-            }
+        if keepDownloaded, !isDownloaded {
+            try await manager.requestDownloadForItem(withIdentifier: itemIdentifier)
         } else {
-            try await manager.signalEnumerator(for: .workingSet)
+            try await manager.requestModification(of: [.lastUsedDate], forItemWithIdentifier: itemIdentifier)
         }
     }
 }
diff --git a/shell_integration/MacOSX/NextcloudFileProviderKit/Sources/NextcloudFileProviderKit/Item/Item+LockFile.swift b/shell_integration/MacOSX/NextcloudFileProviderKit/Sources/NextcloudFileProviderKit/Item/Item+LockFile.swift
@@ -74,26 +74,14 @@ extension Item {
 
         guard await assertRequiredCapabilities(domain: domain, itemIdentifier: itemTemplate.itemIdentifier, account: account, remoteInterface: remoteInterface, logger: logger) else {
             logger.debug("Excluding lock file from synchronizing due to lack of server-side locking capability.", [.item: itemTemplate.itemIdentifier, .name: itemTemplate.filename])
-
-            let error = if #available(macOS 13.0, *) {
-                NSFileProviderError(.excludedFromSync)
-            } else {
-                NSFileProviderError(.cannotSynchronize)
-            }
-
-            return (nil, error)
+            return (nil, NSFileProviderError(.excludedFromSync))
         }
 
         logger.info("Item to create is a lock file. Will attempt to lock the associated file on the server.", [.name: itemTemplate.filename])
 
         guard let targetFileName = originalFileName(fromLockFileName: itemTemplate.filename, dbManager: dbManager) else {
             logger.error("Will not lock the target file because it could not be determined based on the lock file name.", [.name: itemTemplate.filename])
-
-            if #available(macOS 13.0, *) {
-                return (nil, NSFileProviderError(.excludedFromSync))
-            } else {
-                return (nil, NSFileProviderError(.cannotSynchronize))
-            }
+            return (nil, NSFileProviderError(.excludedFromSync))
         }
 
         logger.debug("Derived target file name for lock file.", [.name: targetFileName])
diff --git a/shell_integration/MacOSX/NextcloudFileProviderKit/Sources/NextcloudFileProviderKit/Item/Item+Modify.swift b/shell_integration/MacOSX/NextcloudFileProviderKit/Sources/NextcloudFileProviderKit/Item/Item+Modify.swift
@@ -578,12 +578,7 @@ public extension Item {
             }
 
             modifiedItem = modifiedIgnored
-
-            if #available(macOS 13.0, *) {
-                return (modifiedItem, NSFileProviderError(.excludedFromSync))
-            } else {
-                return (modifiedItem, nil)
-            }
+            return (modifiedItem, NSFileProviderError(.excludedFromSync))
         }
 
         // We are handling an item that is available locally but not on the server -- so create it
diff --git a/shell_integration/MacOSX/NextcloudFileProviderKit/Sources/NextcloudFileProviderKit/Item/Item+Trash.swift b/shell_integration/MacOSX/NextcloudFileProviderKit/Sources/NextcloudFileProviderKit/Item/Item+Trash.swift
@@ -73,12 +73,7 @@ extension Item {
         )
         else {
             logger.error("Did not find trashed item in trash, asking for a rescan.", [.item: modifiedItem])
-
-            if #available(macOS 11.3, *) {
-                return (dirtyItem, NSFileProviderError(.unsyncedEdits))
-            } else {
-                return (dirtyItem, NSFileProviderError(.syncAnchorExpired))
-            }
+            return (dirtyItem, NSFileProviderError(.unsyncedEdits))
         }
 
         var postDeleteMetadata = targetItemNKTrash.toItemMetadata(account: account)
@@ -200,12 +195,7 @@ extension Item {
 
         guard modifiedItem.metadata.trashbinOriginalLocation != "" else {
             logger.error("Could not scan restored item. The trashed file's original location is invalid.", [.name: modifiedItem.filename])
-
-            if #available(macOS 11.3, *) {
-                return (modifiedItem, NSFileProviderError(.unsyncedEdits))
-            }
-
-            return (modifiedItem, NSFileProviderError(.cannotSynchronize))
+            return (modifiedItem, NSFileProviderError(.unsyncedEdits))
         }
 
         let originalLocation = account.davFilesUrl + "/" + modifiedItem.metadata.trashbinOriginalLocation
@@ -230,11 +220,7 @@ extension Item {
                 """
             )
 
-            if #available(macOS 11.3, *) {
-                return (modifiedItem, NSFileProviderError(.unsyncedEdits))
-            }
-
-            return (modifiedItem, enumerateError.fileProviderError)
+            return (modifiedItem, NSFileProviderError(.unsyncedEdits))
         }
 
         guard target.ocId == modifiedItem.itemIdentifier.rawValue else {
diff --git a/shell_integration/MacOSX/NextcloudFileProviderKit/Sources/NextcloudFileProviderKit/Item/Item.swift b/shell_integration/MacOSX/NextcloudFileProviderKit/Sources/NextcloudFileProviderKit/Item/Item.swift
@@ -58,15 +58,8 @@ public final class Item: NSObject, NSFileProviderItem, Sendable {
             }
         }
 
-        // .allowsEvicting deprecated on macOS 13.0+, use contentPolicy instead
-        if #unavailable(macOS 13.0), !metadata.keepDownloaded {
-            capabilities.insert(.allowsEvicting)
-        }
-        #if os(macOS)
-            if #available(macOS 11.3, *) {
-                capabilities.insert(.allowsExcludingFromSync)
-            }
-        #endif
+        capabilities.insert(.allowsExcludingFromSync)
+
         return capabilities
     }
 
@@ -200,13 +193,11 @@ public final class Item: NSObject, NSFileProviderItem, Sendable {
             // Note that only files, not folders, should be lockable/unlockable
             userInfoDict["locked"] = metadata.lock
         }
-        if #available(macOS 13.0, iOS 16.0, visionOS 1.0, *) {
-            userInfoDict["displayKeepDownloaded"] = !metadata.keepDownloaded
-            userInfoDict["displayAllowAutoEvicting"] = metadata.keepDownloaded
-            userInfoDict["displayEvict"] = metadata.downloaded && !metadata.keepDownloaded
-        } else {
-            userInfoDict["displayEvict"] = metadata.downloaded
-        }
+
+        userInfoDict["displayKeepDownloaded"] = !metadata.keepDownloaded
+        userInfoDict["displayAllowAutoEvicting"] = metadata.keepDownloaded
+        userInfoDict["displayEvict"] = metadata.downloaded && !metadata.keepDownloaded
+
         // https://docs.nextcloud.com/server/latest/developer_manual/client_apis/WebDAV/basic.html
         if metadata.permissions.uppercased().contains("R"), // Shareable
            ![.rootContainer, .trashContainer].contains(itemIdentifier)
@@ -228,8 +219,7 @@ public final class Item: NSObject, NSFileProviderItem, Sendable {
     }
 
     public var keepDownloaded: Bool {
-        guard #available(macOS 13.0, iOS 16.0, visionOS 1.0, *) else { return false }
-        return metadata.keepDownloaded
+        metadata.keepDownloaded
     }
 
     ///
diff --git a/shell_integration/MacOSX/NextcloudFileProviderKit/Sources/NextcloudFileProviderKit/Metadata/ItemMetadata.swift b/shell_integration/MacOSX/NextcloudFileProviderKit/Sources/NextcloudFileProviderKit/Metadata/ItemMetadata.swift
@@ -157,11 +157,7 @@ public extension ItemMetadata {
         guard hasPreview else {
             return nil
         }
-        guard #available(macOS 13.0, iOS 16.0, visionOS 1.0, *) else {
-            return URL(
-                string: "\(urlBase.urlEncoded ?? "")/index.php/core/preview?fileId=\(fileId)&x=\(size.width)&y=\(size.height)&a=true"
-            )
-        }
+
         return URL(string: urlBase.urlEncoded ?? "")?
             .appending(components: "index.php", "core", "preview")
             .appending(queryItems: [
diff --git a/shell_integration/MacOSX/NextcloudFileProviderKit/Tests/NextcloudFileProviderKitTests/ItemCreateTests.swift b/shell_integration/MacOSX/NextcloudFileProviderKit/Tests/NextcloudFileProviderKitTests/ItemCreateTests.swift
@@ -718,12 +718,7 @@ final class ItemCreateTests: NextcloudFileProviderKitTestCase {
 
         XCTAssertNil(createdItem)
         let unwrappedError = try XCTUnwrap(error) as? NSFileProviderError
-        let expectedError = if #available(macOS 13.0, *) {
-            NSFileProviderError(.excludedFromSync)
-        } else {
-            NSFileProviderError(.cannotSynchronize)
-        }
-        XCTAssertEqual(unwrappedError, expectedError)
+        XCTAssertEqual(unwrappedError, NSFileProviderError(.excludedFromSync))
         XCTAssertNil(Self.dbManager.itemMetadata(ocId: lockFileMetadata.ocId))
         XCTAssertFalse(targetRemote.locked)
     }
diff --git a/shell_integration/MacOSX/NextcloudFileProviderKit/Tests/NextcloudFileProviderKitTests/ItemModifyTests.swift b/shell_integration/MacOSX/NextcloudFileProviderKit/Tests/NextcloudFileProviderKitTests/ItemModifyTests.swift
@@ -1346,11 +1346,7 @@ final class ItemModifyTests: NextcloudFileProviderKitTestCase {
             ignoredFiles: ignoredMatcher,
             dbManager: Self.dbManager
         )
-        if #available(macOS 13.0, *) {
-            XCTAssertEqual(error as? NSFileProviderError, NSFileProviderError(.excludedFromSync))
-        } else {
-            XCTAssertNil(error)
-        }
+        XCTAssertEqual(error as? NSFileProviderError, NSFileProviderError(.excludedFromSync))
         XCTAssertNotNil(resultItem)
         XCTAssertEqual(resultItem?.metadata.fileName, "error.bak")
     }
diff --git a/shell_integration/MacOSX/NextcloudFileProviderKit/Tests/NextcloudFileProviderKitTests/ItemPropertyTests.swift b/shell_integration/MacOSX/NextcloudFileProviderKit/Tests/NextcloudFileProviderKitTests/ItemPropertyTests.swift
@@ -776,11 +776,7 @@ final class ItemPropertyTests: NextcloudFileProviderKitTestCase {
 
         // Excluding from sync is macOS-specific and always added if available
         var platformExpected = expected
-        #if os(macOS)
-            if #available(macOS 11.3, *) {
-                platformExpected.insert(.allowsExcludingFromSync)
-            }
-        #endif
+        platformExpected.insert(.allowsExcludingFromSync)
 
         XCTAssertEqual(item.capabilities, platformExpected)
     }
@@ -811,11 +807,7 @@ final class ItemPropertyTests: NextcloudFileProviderKitTestCase {
         ]
 
         var platformExpected = expected
-        #if os(macOS)
-            if #available(macOS 11.3, *) {
-                platformExpected.insert(.allowsExcludingFromSync)
-            }
-        #endif
+        platformExpected.insert(.allowsExcludingFromSync)
 
         XCTAssertEqual(item.capabilities, platformExpected)
     }
@@ -837,38 +829,31 @@ final class ItemPropertyTests: NextcloudFileProviderKitTestCase {
         // Trashing and Excluding from Sync might still be allowed as they don't depend on the
         // permission string
         var expected: NSFileProviderItemCapabilities = [.allowsTrashing]
-
-        #if os(macOS)
-            if #available(macOS 11.3, *) {
-                expected.insert(.allowsExcludingFromSync)
-            }
-        #endif
+        expected.insert(.allowsExcludingFromSync)
 
         XCTAssertEqual(item.capabilities, expected)
     }
 
     #if os(macOS)
         func testCapabilitiesMacOSExclusion() {
-            if #available(macOS 11.3, *) {
-                var metadata = SendableItemMetadata(
-                    ocId: "macos-exclusion", fileName: "file.txt", account: Self.account
-                )
-                metadata.permissions = ""
-                let item = Item(
-                    metadata: metadata,
-                    parentItemIdentifier: .rootContainer,
-                    account: Self.account,
-                    remoteInterface: MockRemoteInterface(account: Self.account),
-                    dbManager: Self.dbManager,
-                    remoteSupportsTrash: true,
-                    log: FileProviderLogMock()
-                )
-
-                XCTAssertTrue(
-                    item.capabilities.contains(.allowsExcludingFromSync),
-                    "Should allow excluding from sync on supported macOS versions."
-                )
-            }
+            var metadata = SendableItemMetadata(
+                ocId: "macos-exclusion", fileName: "file.txt", account: Self.account
+            )
+            metadata.permissions = ""
+            let item = Item(
+                metadata: metadata,
+                parentItemIdentifier: .rootContainer,
+                account: Self.account,
+                remoteInterface: MockRemoteInterface(account: Self.account),
+                dbManager: Self.dbManager,
+                remoteSupportsTrash: true,
+                log: FileProviderLogMock()
+            )
+
+            XCTAssertTrue(
+                item.capabilities.contains(.allowsExcludingFromSync),
+                "Should allow excluding from sync on supported macOS versions."
+            )
         }
     #endif
 
diff --git a/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderExtension.swift b/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/FileProviderExtension.swift
@@ -302,16 +302,8 @@ import OSLog
             if error == nil {
                 removeSyncAction(actionId)
             } else {
-                // Do not consider the exclusion of a file a synchronization error resulting in a misleading status report because exclusion is expected.
-                // Though, the exclusion error code is only available starting with macOS 13, hence this logic reads a bit more cumbersome.
-
-                if #available(macOS 13.0, *) {
-                    if let fileProviderError = error as? NSFileProviderError, fileProviderError.code == .excludedFromSync {
-                        removeSyncAction(actionId)
-                    } else {
-                        insertErrorAction(actionId)
-                        signalEnumerator(completionHandler: { _ in })
-                    }
+                if let fileProviderError = error as? NSFileProviderError, fileProviderError.code == .excludedFromSync {
+                    removeSyncAction(actionId)
                 } else {
                     insertErrorAction(actionId)
                     signalEnumerator(completionHandler: { _ in })
diff --git a/shell_integration/MacOSX/NextcloudIntegration/FileProviderUIExt/Extensions/NKShare+Extensions.swift b/shell_integration/MacOSX/NextcloudIntegration/FileProviderUIExt/Extensions/NKShare+Extensions.swift
@@ -58,11 +58,8 @@ extension NKShare {
         }
 
         var config = NSImage.SymbolConfiguration(textStyle: .body, scale: .large)
-        if #available(macOS 12.0, *) {
-            config = config.applying(
-                .init(paletteColors: [.controlBackgroundColor, .controlAccentColor])
-            )
-        }
+        config = config.applying(.init(paletteColors: [.controlBackgroundColor, .controlAccentColor]))
+
         return image?.withSymbolConfiguration(config)
     }
 
diff --git a/shell_integration/MacOSX/NextcloudIntegration/FileProviderUIExt/Sharing/ShareTableItemView.swift b/shell_integration/MacOSX/NextcloudIntegration/FileProviderUIExt/Sharing/ShareTableItemView.swift
diff --git a/shell_integration/MacOSX/NextcloudIntegration/NextcloudDev/Build.xcconfig b/shell_integration/MacOSX/NextcloudIntegration/NextcloudDev/Build.xcconfig
diff --git a/shell_integration/MacOSX/NextcloudIntegration/NextcloudIntegration.xcodeproj/project.pbxproj b/shell_integration/MacOSX/NextcloudIntegration/NextcloudIntegration.xcodeproj/project.pbxproj
diff --git a/src/gui/macOS/fileproviderdomainmanager.mm b/src/gui/macOS/fileproviderdomainmanager.mm
diff --git a/src/gui/macOS/fileprovideritemmetadata_mac.mm b/src/gui/macOS/fileprovideritemmetadata_mac.mm
diff --git a/src/gui/macOS/fileproviderxpc_mac_utils.mm b/src/gui/macOS/fileproviderxpc_mac_utils.mm

Original file line number	Diff line number	Diff line change
`@@ -117,12 +117,9 @@ public extension Item {`
`117`	`117`
`118`	`118`	`if let domain, let localUrl = await localUrlForContents(domain: domain) {`
`119`	`119`	`return (localUrl, self, nil)`
`120`		`- } else if #available(macOS 13.0, *) {`
`121`		`- logger.error("Could not get local contents URL for lock file, erroring.")`
`122`		`- return (nil, self, NSFileProviderError(.excludedFromSync))`
`123`	`120`	`} else {`
`124`		`- logger.error("Could not get local contents URL for lock file, nilling.")`
`125`		`- return (nil, self, nil)`
	`121`	`+ logger.error("Could not get local content URL for lock file.")`
	`122`	`+ return (nil, self, NSFileProviderError(.excludedFromSync))`
`126`	`123`	`}`
`127`	`124`	`}`
`128`	`125`
Original file line number	Diff line number	Diff line change
`@@ -67,10 +67,6 @@ extension Item {`
`67`	`67`	`log: log`
`68`	`68`	`)`
`69`	`69`
`70`		`- if #available(macOS 13.0, *) {`
`71`		`- return (item, NSFileProviderError(.excludedFromSync))`
`72`		`- } else {`
`73`		`- return (item, nil)`
`74`		`- }`
	`70`	`+ return (item, NSFileProviderError(.excludedFromSync))`
`75`	`71`	`}`
`76`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,16 +24,10 @@ public extension Item {`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`
`27`		`- if #available(macOS 13.0, iOS 16.0, visionOS 1.0, *) {`
`28`		`- if keepDownloaded, !isDownloaded {`
`29`		`- try await manager.requestDownloadForItem(withIdentifier: itemIdentifier)`
`30`		`- } else {`
`31`		`- try await manager.requestModification(`
`32`		`- of: [.lastUsedDate], forItemWithIdentifier: itemIdentifier`
`33`		`- )`
`34`		`- }`
	`27`	`+ if keepDownloaded, !isDownloaded {`
	`28`	`+ try await manager.requestDownloadForItem(withIdentifier: itemIdentifier)`
`35`	`29`	`} else {`
`36`		`- try await manager.signalEnumerator(for: .workingSet)`
	`30`	`+ try await manager.requestModification(of: [.lastUsedDate], forItemWithIdentifier: itemIdentifier)`
`37`	`31`	`}`
`38`	`32`	`}`
`39`	`33`	`}`