Merge branch 'release/1.9.1'

cryptomator · Mar 12, 2024 · 99d4604 · 99d4604
2 parents 63fd1cf + 77146f5
commit 99d4604
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 39 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -6,23 +6,27 @@ on:
 jobs:
   build:
     name: Build and test
-    runs-on: macos-12
+    runs-on: macos-14
     env:
       DERIVED_DATA_PATH: 'DerivedData'
-      DEVICE: 'iPhone 12 Pro'
+      DEVICE: 'iPhone 15 Pro'
     if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/cache@v3
+      - uses: actions/checkout@v4
+      - uses: actions/cache@v4
         with:
           path: .build
           key: ${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }}
           restore-keys: |
             ${{ runner.os }}-spm-
+      - name: Install SwiftLint
+        run: brew install swiftlint
       - name: Run process.sh script
         run: |
           ./Scripts/process.sh
           exit $?
+      - name: Select Xcode 15.2
+        run: sudo xcode-select -s /Applications/Xcode_15.2.app
       - name: Build
         run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild clean build-for-testing -scheme 'CryptomatorCloudAccess' -destination "name=$DEVICE" -derivedDataPath $DERIVED_DATA_PATH -enableCodeCoverage YES | xcpretty
       - name: Test
@@ -59,11 +63,11 @@ jobs:
 
   release:
     name: Deploy and draft a release
-    runs-on: macos-12
+    runs-on: macos-14
     needs: build
     if: startsWith(github.ref, 'refs/tags/')
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Draft release
         uses: actions/create-release@v1
         env:

diff --git a/CryptomatorCloudAccess.xcodeproj/project.pbxproj b/CryptomatorCloudAccess.xcodeproj/project.pbxproj
@@ -1688,7 +1688,7 @@
 			repositoryURL = "https://github.com/google/google-api-objectivec-client-for-rest.git";
 			requirement = {
 				kind = upToNextMinorVersion;
-				minimumVersion = 3.2.0;
+				minimumVersion = 3.5.0;
 			};
 		};
 		4A567B182615C917002C4D82 /* XCRemoteSwiftPackageReference "GTMAppAuth" */ = {
@@ -1736,7 +1736,7 @@
 			repositoryURL = "https://github.com/phil1995/dropbox-sdk-obj-c-spm.git";
 			requirement = {
 				kind = upToNextMinorVersion;
-				minimumVersion = 7.0.0;
+				minimumVersion = 7.2.0;
 			};
 		};
 		4A8B872D287D7E77002D676E /* XCRemoteSwiftPackageReference "CocoaLumberjack" */ = {
@@ -1752,7 +1752,7 @@
 			repositoryURL = "https://github.com/aws-amplify/aws-sdk-ios-spm.git";
 			requirement = {
 				kind = upToNextMinorVersion;
-				minimumVersion = 2.33.0;
+				minimumVersion = 2.34.0;
 			};
 		};
 		740C5877262F800A00F63423 /* XCRemoteSwiftPackageReference "JOSESwift" */ = {
@@ -1768,7 +1768,7 @@
 			repositoryURL = "https://github.com/AzureAD/microsoft-authentication-library-for-objc.git";
 			requirement = {
 				kind = upToNextMinorVersion;
-				minimumVersion = 1.2.0;
+				minimumVersion = 1.3.0;
 			};
 		};
 		746F090C27BC0932003FCD9F /* XCRemoteSwiftPackageReference "pcloud-sdk-swift" */ = {

diff --git a/CryptomatorCloudAccess.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/CryptomatorCloudAccess.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -14,8 +14,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/aws-amplify/aws-sdk-ios-spm.git",
       "state" : {
-        "revision" : "ca31418963a90bac80538e13f6b7af87ea14d279",
-        "version" : "2.33.4"
+        "revision" : "cfcf97f6994b6ffd9a3244dc638458f5822aba56",
+        "version" : "2.34.0"
       }
     },
     {
@@ -50,17 +50,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/phil1995/dropbox-sdk-obj-c-spm.git",
       "state" : {
-        "revision" : "f0eafe25d26c52377c4a1c08f1dbd77320164994",
-        "version" : "7.0.0"
+        "revision" : "87c1fcf96622ab90a956bdf89331ddb4164f4855",
+        "version" : "7.2.0"
       }
     },
     {
       "identity" : "google-api-objectivec-client-for-rest",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/google/google-api-objectivec-client-for-rest.git",
       "state" : {
-        "revision" : "40930b2c3add6234b8be1a780c08cf88b6a7a1f7",
-        "version" : "3.2.0"
+        "revision" : "8b200e6e447c04140ac027cba4f368402766965f",
+        "version" : "3.5.1"
       }
     },
     {
@@ -104,8 +104,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/AzureAD/microsoft-authentication-library-for-objc.git",
       "state" : {
-        "revision" : "35846731c0971694f162b28fe8494c03b615ae74",
-        "version" : "1.2.16"
+        "revision" : "f3f84a63de86f7f121544ec917e0365e624d6a97",
+        "version" : "1.3.0"
       }
     },
     {

diff --git a/Package.resolved b/Package.resolved
@@ -14,8 +14,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/aws-amplify/aws-sdk-ios-spm.git",
       "state" : {
-        "revision" : "ca31418963a90bac80538e13f6b7af87ea14d279",
-        "version" : "2.33.4"
+        "revision" : "cfcf97f6994b6ffd9a3244dc638458f5822aba56",
+        "version" : "2.34.0"
       }
     },
     {
@@ -32,8 +32,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/CocoaLumberjack/CocoaLumberjack.git",
       "state" : {
-        "revision" : "67ec5818a757aba4d7c534e21a905d878d128dbf",
-        "version" : "3.8.1"
+        "revision" : "4b8714a7fb84d42393314ce897127b3939885ec3",
+        "version" : "3.8.5"
       }
     },
     {
@@ -50,17 +50,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/phil1995/dropbox-sdk-obj-c-spm.git",
       "state" : {
-        "revision" : "f0eafe25d26c52377c4a1c08f1dbd77320164994",
-        "version" : "7.0.0"
+        "revision" : "87c1fcf96622ab90a956bdf89331ddb4164f4855",
+        "version" : "7.2.0"
       }
     },
     {
       "identity" : "google-api-objectivec-client-for-rest",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/google/google-api-objectivec-client-for-rest.git",
       "state" : {
-        "revision" : "40930b2c3add6234b8be1a780c08cf88b6a7a1f7",
-        "version" : "3.2.0"
+        "revision" : "8b200e6e447c04140ac027cba4f368402766965f",
+        "version" : "3.5.1"
       }
     },
     {
@@ -104,8 +104,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/AzureAD/microsoft-authentication-library-for-objc.git",
       "state" : {
-        "revision" : "35846731c0971694f162b28fe8494c03b615ae74",
-        "version" : "1.2.16"
+        "revision" : "f3f84a63de86f7f121544ec917e0365e624d6a97",
+        "version" : "1.3.0"
       }
     },
     {
@@ -147,10 +147,10 @@
     {
       "identity" : "swift-log",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-log.git",
+      "location" : "https://github.com/apple/swift-log",
       "state" : {
-        "revision" : "532d8b529501fb73a2455b179e0bbb6d49b652ed",
-        "version" : "1.5.3"
+        "revision" : "e97a6fcb1ab07462881ac165fdbb37f067e205d5",
+        "version" : "1.5.4"
       }
     }
   ],

diff --git a/Package.swift b/Package.swift
@@ -28,18 +28,18 @@ let package = Package(
 	],
 	dependencies: [
 		.package(url: "https://github.com/tobihagemann/JOSESwift.git", exact: "2.4.1-cryptomator"),
-		.package(url: "https://github.com/AzureAD/microsoft-authentication-library-for-objc.git", .upToNextMinor(from: "1.2.0")),
-		.package(url: "https://github.com/aws-amplify/aws-sdk-ios-spm.git", .upToNextMinor(from: "2.33.0")),
+		.package(url: "https://github.com/AzureAD/microsoft-authentication-library-for-objc.git", .upToNextMinor(from: "1.3.0")),
+		.package(url: "https://github.com/aws-amplify/aws-sdk-ios-spm.git", .upToNextMinor(from: "2.34.0")),
 		.package(url: "https://github.com/cryptomator/cryptolib-swift.git", .upToNextMinor(from: "1.1.0")),
 		.package(url: "https://github.com/CocoaLumberjack/CocoaLumberjack.git", .upToNextMinor(from: "3.8.0")),
-		.package(url: "https://github.com/google/google-api-objectivec-client-for-rest.git", .upToNextMinor(from: "3.2.0")),
+		.package(url: "https://github.com/google/google-api-objectivec-client-for-rest.git", .upToNextMinor(from: "3.5.0")),
 		.package(url: "https://github.com/google/GTMAppAuth.git", .upToNextMinor(from: "4.0.0")),
 		.package(url: "https://github.com/google/gtm-session-fetcher.git", .upToNextMinor(from: "3.1.0")),
 		.package(url: "https://github.com/google/promises.git", .upToNextMinor(from: "2.3.0")),
 		.package(url: "https://github.com/groue/GRDB.swift.git", .upToNextMinor(from: "5.26.0")),
 		.package(url: "https://github.com/openid/AppAuth-iOS.git", .upToNextMinor(from: "1.6.0")),
 		.package(url: "https://github.com/pCloud/pcloud-sdk-swift.git", .upToNextMinor(from: "3.2.0")),
-		.package(url: "https://github.com/phil1995/dropbox-sdk-obj-c-spm.git", .upToNextMinor(from: "7.0.0")),
+		.package(url: "https://github.com/phil1995/dropbox-sdk-obj-c-spm.git", .upToNextMinor(from: "7.2.0")),
 		.package(url: "https://github.com/phil1995/msgraph-sdk-objc-spm.git", .upToNextMinor(from: "1.0.0")),
 		.package(url: "https://github.com/phil1995/msgraph-sdk-objc-models-spm.git", .upToNextMinor(from: "1.3.0"))
 	],

diff --git a/Sources/CryptomatorCloudAccess/Dropbox/DropboxSetup.swift b/Sources/CryptomatorCloudAccess/Dropbox/DropboxSetup.swift
@@ -7,6 +7,7 @@
 //
 
 import Foundation
+
 /**
  Setup for the Dropbox Cloud Provider
 

diff --git a/Sources/CryptomatorCloudAccess/LocalFileSystem/LocalFileSystemProvider.swift b/Sources/CryptomatorCloudAccess/LocalFileSystem/LocalFileSystemProvider.swift
@@ -130,9 +130,8 @@ public class LocalFileSystemProvider: CloudProvider {
 
 	private func evaluateReadingIntentForFetchItemList(_ readingIntent: NSFileAccessIntent) throws {
 		do {
-			let attributes = try readingIntent.url.promisedItemResourceValues(forKeys: [.nameKey, .fileSizeKey, .contentModificationDateKey, .fileResourceTypeKey])
-			let itemType = getItemType(from: attributes.fileResourceType)
-			guard itemType == .folder else {
+			let attributes = try readingIntent.url.promisedItemResourceValues(forKeys: [.isDirectoryKey])
+			guard attributes.isDirectory ?? false else {
 				throw CloudProviderError.itemTypeMismatch
 			}
 		} catch CocoaError.fileReadNoSuchFile {
@@ -458,7 +457,7 @@ public class LocalFileSystemProvider: CloudProvider {
 	private func getItemMetadata(forItemAt url: URL, parentCloudPath: CloudPath) -> Promise<CloudItemMetadata> {
 		CloudAccessDDLogDebug("LocalFileSystemProvider: getItemMetadata(forItemAt: \(url), parentCloudPath: \(parentCloudPath.path)) called")
 		let promise = Promise<CloudItemMetadata>.pending()
-		let readingIntent = NSFileAccessIntent.readingIntent(with: url, options: .immediatelyAvailableMetadataOnly)
+		let readingIntent = NSFileAccessIntent.readingIntent(with: url)
 		fileCoordinator.coordinate(with: [readingIntent], queue: queue) { error in
 			if let error = error {
 				CloudAccessDDLogDebug("LocalFileSystemProvider: getItemMetadata(forItemAt: \(url), parentCloudPath: \(parentCloudPath.path)) failed coordinated read with error: \(error)")
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,7 @@ @@
     //
     import Foundation
     /**
      Setup for the Dropbox Cloud Provider
@@ Expand Down @@