Merge branch 'release/1.11.0'

cryptomator · Aug 28, 2024 · 6ee5a33 · 6ee5a33
2 parents cd7a18a + a5ced5e
commit 6ee5a33
Show file tree

Hide file tree

Showing 48 changed files with 1,577 additions and 106 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,7 +1,9 @@
 name: Build
 
 on:
-  [push]
+  push:
+  pull_request_target:
+    types: [labeled]
 
 jobs:
   build:
@@ -51,6 +53,8 @@ jobs:
       fail-fast: false
       matrix:
         include:
+        - name: Box
+          scheme-name: BoxIntegrationTests
         - name: Common
           scheme-name: CommonIntegrationTests
         - name: Dropbox
@@ -80,6 +84,9 @@ jobs:
       - name: Run integration tests
         run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild -scheme '${{ matrix.scheme-name }}' -destination "name=$DEVICE" -derivedDataPath $DERIVED_DATA_PATH test | xcpretty
         env:
+          BOX_CLIENT_ID: ${{ secrets.BOX_CLIENT_ID }}
+          BOX_CLIENT_SECRET: ${{ secrets.BOX_CLIENT_SECRET }}
+          BOX_ENTERPRISE_ID: ${{ secrets.BOX_ENTERPRISE_ID }}
           DROPBOX_ACCESS_TOKEN: ${{ secrets.DROPBOX_ACCESS_TOKEN }}
           GOOGLE_DRIVE_CLIENT_ID: ${{ secrets.GOOGLE_DRIVE_CLIENT_ID }}
           GOOGLE_DRIVE_REFRESH_TOKEN: ${{ secrets.GOOGLE_DRIVE_REFRESH_TOKEN }}

diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -1,6 +1,7 @@
 disabled_rules:
   - file_length
   - line_length
+  - redundant_void_return
   - todo
   - type_body_length
 

diff --git a/CryptomatorCloudAccess.xcodeproj/project.pbxproj b/CryptomatorCloudAccess.xcodeproj/project.pbxproj
diff --git a/CryptomatorCloudAccess.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/CryptomatorCloudAccess.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,4 +1,5 @@
 {
+  "originHash" : "9cadc7a70613b038fe8d97d191b9a6f48d09309fa0636f36dfa1ef6376591ebc",
   "pins" : [
     {
       "identity" : "appauth-ios",
@@ -14,8 +15,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/aws-amplify/aws-sdk-ios-spm.git",
       "state" : {
-        "revision" : "cfcf97f6994b6ffd9a3244dc638458f5822aba56",
-        "version" : "2.34.0"
+        "revision" : "8ff8bebfe24271f7b16c5abaeb78daf82bee3a80",
+        "version" : "2.34.2"
       }
     },
     {
@@ -27,13 +28,22 @@
         "version" : "0.9.0"
       }
     },
+    {
+      "identity" : "box-swift-sdk-gen",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/box/box-swift-sdk-gen.git",
+      "state" : {
+        "revision" : "7b2e3963a4f9d7c608ba9176fa3c32d260599906",
+        "version" : "0.3.1"
+      }
+    },
     {
       "identity" : "cocoalumberjack",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/CocoaLumberjack/CocoaLumberjack.git",
       "state" : {
-        "revision" : "67ec5818a757aba4d7c534e21a905d878d128dbf",
-        "version" : "3.8.1"
+        "revision" : "4b8714a7fb84d42393314ce897127b3939885ec3",
+        "version" : "3.8.5"
       }
     },
     {
@@ -104,8 +114,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/AzureAD/microsoft-authentication-library-for-objc.git",
       "state" : {
-        "revision" : "f3f84a63de86f7f121544ec917e0365e624d6a97",
-        "version" : "1.3.0"
+        "revision" : "d2f81ded070ac6452b2a6acb5bc45eb566427fe7",
+        "version" : "1.3.3"
       }
     },
     {
@@ -147,12 +157,12 @@
     {
       "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" : "9cb486020ebf03bfa5b5df985387a14a98744537",
+        "version" : "1.6.1"
       }
     }
   ],
-  "version" : 2
+  "version" : 3
 }
diff --git a/CryptomatorCloudAccess.xcodeproj/xcshareddata/xcschemes/BoxIntegrationTests.xcscheme b/CryptomatorCloudAccess.xcodeproj/xcshareddata/xcschemes/BoxIntegrationTests.xcscheme
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1500"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "4ACA638D2615FDFF00D19304"
+               BuildableName = "CryptomatorCloudAccessIntegrationTests.xctest"
+               BlueprintName = "CryptomatorCloudAccessIntegrationTests"
+               ReferencedContainer = "container:CryptomatorCloudAccess.xcodeproj">
+            </BuildableReference>
+            <SkippedTests>
+               <Test
+                  Identifier = "CloudAccessIntegrationTest">
+               </Test>
+               <Test
+                  Identifier = "CloudAccessIntegrationTestWithAuthentication">
+               </Test>
+               <Test
+                  Identifier = "CloudProvider_CreateIntermediateFolderTests">
+               </Test>
+               <Test
+                  Identifier = "DropboxCloudProviderIntegrationTests">
+               </Test>
+               <Test
+                  Identifier = "GoogleDriveAuthenticatorMockTests">
+               </Test>
+               <Test
+                  Identifier = "GoogleDriveCloudProviderIntegrationTests">
+               </Test>
+               <Test
+                  Identifier = "LocalFileSystemProviderIntegrationTests">
+               </Test>
+               <Test
+                  Identifier = "OneDriveCloudProviderIntegrationTests">
+               </Test>
+               <Test
+                  Identifier = "PCloudCloudProviderIntegrationTests">
+               </Test>
+               <Test
+                  Identifier = "S3CloudProviderIntegrationTests">
+               </Test>
+               <Test
+                  Identifier = "VaultFormat6DropboxIntegrationTests">
+               </Test>
+               <Test
+                  Identifier = "VaultFormat6GoogleDriveIntegrationTests">
+               </Test>
+               <Test
+                  Identifier = "VaultFormat6LocalFileSystemIntegrationTests">
+               </Test>
+               <Test
+                  Identifier = "VaultFormat6OneDriveIntegrationTests">
+               </Test>
+               <Test
+                  Identifier = "VaultFormat6PCloudIntegrationTests">
+               </Test>
+               <Test
+                  Identifier = "VaultFormat6S3IntegrationTests">
+               </Test>
+               <Test
+                  Identifier = "VaultFormat6WebDAVIntegrationTests">
+               </Test>
+               <Test
+                  Identifier = "VaultFormat7DropboxIntegrationTests">
+               </Test>
+               <Test
+                  Identifier = "VaultFormat7GoogleDriveIntegrationTests">
+               </Test>
+               <Test
+                  Identifier = "VaultFormat7LocalFileSystemIntegrationTests">
+               </Test>
+               <Test
+                  Identifier = "VaultFormat7OneDriveIntegrationTests">
+               </Test>
+               <Test
+                  Identifier = "VaultFormat7PCloudIntegrationTests">
+               </Test>
+               <Test
+                  Identifier = "VaultFormat7S3IntegrationTests">
+               </Test>
+               <Test
+                  Identifier = "VaultFormat7WebDAVIntegrationTests">
+               </Test>
+               <Test
+                  Identifier = "WebDAVCloudProviderIntegrationTests">
+               </Test>
+            </SkippedTests>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/CryptomatorCloudAccess.xcodeproj/xcshareddata/xcschemes/CommonIntegrationTests.xcscheme b/CryptomatorCloudAccess.xcodeproj/xcshareddata/xcschemes/CommonIntegrationTests.xcscheme
@@ -22,6 +22,9 @@
                ReferencedContainer = "container:CryptomatorCloudAccess.xcodeproj">
             </BuildableReference>
             <SkippedTests>
+               <Test
+                  Identifier = "BoxCloudProviderIntegrationTests">
+               </Test>
                <Test
                   Identifier = "CloudAccessIntegrationTest">
                </Test>
@@ -46,6 +49,9 @@
                <Test
                   Identifier = "S3CloudProviderIntegrationTests">
                </Test>
+               <Test
+                  Identifier = "VaultFormat6BoxIntegrationTests">
+               </Test>
                <Test
                   Identifier = "VaultFormat6DropboxIntegrationTests">
                </Test>
@@ -67,6 +73,9 @@
                <Test
                   Identifier = "VaultFormat6WebDAVIntegrationTests">
                </Test>
+               <Test
+                  Identifier = "VaultFormat7BoxIntegrationTests">
+               </Test>
                <Test
                   Identifier = "VaultFormat7DropboxIntegrationTests">
                </Test>

diff --git a/CryptomatorCloudAccess.xcodeproj/xcshareddata/xcschemes/DropboxIntegrationTests.xcscheme b/CryptomatorCloudAccess.xcodeproj/xcshareddata/xcschemes/DropboxIntegrationTests.xcscheme
@@ -22,6 +22,9 @@
                ReferencedContainer = "container:CryptomatorCloudAccess.xcodeproj">
             </BuildableReference>
             <SkippedTests>
+               <Test
+                  Identifier = "BoxCloudProviderIntegrationTests">
+               </Test>
                <Test
                   Identifier = "CloudAccessIntegrationTest">
                </Test>
@@ -49,6 +52,9 @@
                <Test
                   Identifier = "S3CloudProviderIntegrationTests">
                </Test>
+               <Test
+                  Identifier = "VaultFormat6BoxIntegrationTests">
+               </Test>
                <Test
                   Identifier = "VaultFormat6GoogleDriveIntegrationTests">
                </Test>
@@ -67,6 +73,9 @@
                <Test
                   Identifier = "VaultFormat6WebDAVIntegrationTests">
                </Test>
+               <Test
+                  Identifier = "VaultFormat7BoxIntegrationTests">
+               </Test>
                <Test
                   Identifier = "VaultFormat7GoogleDriveIntegrationTests">
                </Test>

diff --git a/CryptomatorCloudAccess.xcodeproj/xcshareddata/xcschemes/GoogleDriveIntegrationTests.xcscheme b/CryptomatorCloudAccess.xcodeproj/xcshareddata/xcschemes/GoogleDriveIntegrationTests.xcscheme
@@ -22,6 +22,9 @@
                ReferencedContainer = "container:CryptomatorCloudAccess.xcodeproj">
             </BuildableReference>
             <SkippedTests>
+               <Test
+                  Identifier = "BoxCloudProviderIntegrationTests">
+               </Test>
                <Test
                   Identifier = "CloudAccessIntegrationTest">
                </Test>
@@ -49,6 +52,9 @@
                <Test
                   Identifier = "S3CloudProviderIntegrationTests">
                </Test>
+               <Test
+                  Identifier = "VaultFormat6BoxIntegrationTests">
+               </Test>
                <Test
                   Identifier = "VaultFormat6DropboxIntegrationTests">
                </Test>
@@ -67,6 +73,9 @@
                <Test
                   Identifier = "VaultFormat6WebDAVIntegrationTests">
                </Test>
+               <Test
+                  Identifier = "VaultFormat7BoxIntegrationTests">
+               </Test>
                <Test
                   Identifier = "VaultFormat7DropboxIntegrationTests">
                </Test>

diff --git a/...atorCloudAccess.xcodeproj/xcshareddata/xcschemes/LocalFileSystemIntegrationTests.xcscheme b/...atorCloudAccess.xcodeproj/xcshareddata/xcschemes/LocalFileSystemIntegrationTests.xcscheme
@@ -22,6 +22,9 @@
                ReferencedContainer = "container:CryptomatorCloudAccess.xcodeproj">
             </BuildableReference>
             <SkippedTests>
+               <Test
+                  Identifier = "BoxCloudProviderIntegrationTests">
+               </Test>
                <Test
                   Identifier = "CloudAccessIntegrationTest">
                </Test>
@@ -49,6 +52,9 @@
                <Test
                   Identifier = "S3CloudProviderIntegrationTests">
                </Test>
+               <Test
+                  Identifier = "VaultFormat6BoxIntegrationTests">
+               </Test>
                <Test
                   Identifier = "VaultFormat6DropboxIntegrationTests">
                </Test>
@@ -67,6 +73,9 @@
                <Test
                   Identifier = "VaultFormat6WebDAVIntegrationTests">
                </Test>
+               <Test
+                  Identifier = "VaultFormat7BoxIntegrationTests">
+               </Test>
                <Test
                   Identifier = "VaultFormat7DropboxIntegrationTests">
                </Test>

diff --git a/CryptomatorCloudAccess.xcodeproj/xcshareddata/xcschemes/OneDriveIntegrationTests.xcscheme b/CryptomatorCloudAccess.xcodeproj/xcshareddata/xcschemes/OneDriveIntegrationTests.xcscheme
@@ -22,6 +22,9 @@
                ReferencedContainer = "container:CryptomatorCloudAccess.xcodeproj">
             </BuildableReference>
             <SkippedTests>
+               <Test
+                  Identifier = "BoxCloudProviderIntegrationTests">
+               </Test>
                <Test
                   Identifier = "CloudAccessIntegrationTest">
                </Test>
@@ -49,6 +52,9 @@
                <Test
                   Identifier = "S3CloudProviderIntegrationTests">
                </Test>
+               <Test
+                  Identifier = "VaultFormat6BoxIntegrationTests">
+               </Test>
                <Test
                   Identifier = "VaultFormat6DropboxIntegrationTests">
                </Test>
@@ -67,6 +73,9 @@
                <Test
                   Identifier = "VaultFormat6WebDAVIntegrationTests">
                </Test>
+               <Test
+                  Identifier = "VaultFormat7BoxIntegrationTests">
+               </Test>
                <Test
                   Identifier = "VaultFormat7DropboxIntegrationTests">
                </Test>