Skip to content

Commit 6ee5a33

Browse files
tobihagemanntobihagemann
committed
Merge branch 'release/1.11.0'
2 parents cd7a18a + a5ced5e commit 6ee5a33

File tree

48 files changed

+1577
-106
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+1577
-106
lines changed

‎.github/workflows/build.yml

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
name: Build
22

33
on:
4-
[push]
4+
push:
5+
pull_request_target:
6+
types: [labeled]
57

68
jobs:
79
build:
@@ -51,6 +53,8 @@ jobs:
5153
fail-fast: false
5254
matrix:
5355
include:
56+
- name: Box
57+
scheme-name: BoxIntegrationTests
5458
- name: Common
5559
scheme-name: CommonIntegrationTests
5660
- name: Dropbox
@@ -80,6 +84,9 @@ jobs:
8084
- name: Run integration tests
8185
run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild -scheme '${{ matrix.scheme-name }}' -destination "name=$DEVICE" -derivedDataPath $DERIVED_DATA_PATH test | xcpretty
8286
env:
87+
BOX_CLIENT_ID: ${{ secrets.BOX_CLIENT_ID }}
88+
BOX_CLIENT_SECRET: ${{ secrets.BOX_CLIENT_SECRET }}
89+
BOX_ENTERPRISE_ID: ${{ secrets.BOX_ENTERPRISE_ID }}
8390
DROPBOX_ACCESS_TOKEN: ${{ secrets.DROPBOX_ACCESS_TOKEN }}
8491
GOOGLE_DRIVE_CLIENT_ID: ${{ secrets.GOOGLE_DRIVE_CLIENT_ID }}
8592
GOOGLE_DRIVE_REFRESH_TOKEN: ${{ secrets.GOOGLE_DRIVE_REFRESH_TOKEN }}

‎.swiftlint.yml

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
disabled_rules:
22
- file_length
33
- line_length
4+
- redundant_void_return
45
- todo
56
- type_body_length
67

‎CryptomatorCloudAccess.xcodeproj/project.pbxproj

+82
Large diffs are not rendered by default.

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

+20-10
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"originHash" : "9cadc7a70613b038fe8d97d191b9a6f48d09309fa0636f36dfa1ef6376591ebc",
23
"pins" : [
34
{
45
"identity" : "appauth-ios",
@@ -14,8 +15,8 @@
1415
"kind" : "remoteSourceControl",
1516
"location" : "https://github.com/aws-amplify/aws-sdk-ios-spm.git",
1617
"state" : {
17-
"revision" : "cfcf97f6994b6ffd9a3244dc638458f5822aba56",
18-
"version" : "2.34.0"
18+
"revision" : "8ff8bebfe24271f7b16c5abaeb78daf82bee3a80",
19+
"version" : "2.34.2"
1920
}
2021
},
2122
{
@@ -27,13 +28,22 @@
2728
"version" : "0.9.0"
2829
}
2930
},
31+
{
32+
"identity" : "box-swift-sdk-gen",
33+
"kind" : "remoteSourceControl",
34+
"location" : "https://github.com/box/box-swift-sdk-gen.git",
35+
"state" : {
36+
"revision" : "7b2e3963a4f9d7c608ba9176fa3c32d260599906",
37+
"version" : "0.3.1"
38+
}
39+
},
3040
{
3141
"identity" : "cocoalumberjack",
3242
"kind" : "remoteSourceControl",
3343
"location" : "https://github.com/CocoaLumberjack/CocoaLumberjack.git",
3444
"state" : {
35-
"revision" : "67ec5818a757aba4d7c534e21a905d878d128dbf",
36-
"version" : "3.8.1"
45+
"revision" : "4b8714a7fb84d42393314ce897127b3939885ec3",
46+
"version" : "3.8.5"
3747
}
3848
},
3949
{
@@ -104,8 +114,8 @@
104114
"kind" : "remoteSourceControl",
105115
"location" : "https://github.com/AzureAD/microsoft-authentication-library-for-objc.git",
106116
"state" : {
107-
"revision" : "f3f84a63de86f7f121544ec917e0365e624d6a97",
108-
"version" : "1.3.0"
117+
"revision" : "d2f81ded070ac6452b2a6acb5bc45eb566427fe7",
118+
"version" : "1.3.3"
109119
}
110120
},
111121
{
@@ -147,12 +157,12 @@
147157
{
148158
"identity" : "swift-log",
149159
"kind" : "remoteSourceControl",
150-
"location" : "https://github.com/apple/swift-log.git",
160+
"location" : "https://github.com/apple/swift-log",
151161
"state" : {
152-
"revision" : "532d8b529501fb73a2455b179e0bbb6d49b652ed",
153-
"version" : "1.5.3"
162+
"revision" : "9cb486020ebf03bfa5b5df985387a14a98744537",
163+
"version" : "1.6.1"
154164
}
155165
}
156166
],
157-
"version" : 2
167+
"version" : 3
158168
}

‎CryptomatorCloudAccess.xcodeproj/xcshareddata/xcschemes/BoxIntegrationTests.xcscheme

+129
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,129 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1500"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
</BuildAction>
9+
<TestAction
10+
buildConfiguration = "Debug"
11+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
12+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
13+
shouldUseLaunchSchemeArgsEnv = "YES">
14+
<Testables>
15+
<TestableReference
16+
skipped = "NO">
17+
<BuildableReference
18+
BuildableIdentifier = "primary"
19+
BlueprintIdentifier = "4ACA638D2615FDFF00D19304"
20+
BuildableName = "CryptomatorCloudAccessIntegrationTests.xctest"
21+
BlueprintName = "CryptomatorCloudAccessIntegrationTests"
22+
ReferencedContainer = "container:CryptomatorCloudAccess.xcodeproj">
23+
</BuildableReference>
24+
<SkippedTests>
25+
<Test
26+
Identifier = "CloudAccessIntegrationTest">
27+
</Test>
28+
<Test
29+
Identifier = "CloudAccessIntegrationTestWithAuthentication">
30+
</Test>
31+
<Test
32+
Identifier = "CloudProvider_CreateIntermediateFolderTests">
33+
</Test>
34+
<Test
35+
Identifier = "DropboxCloudProviderIntegrationTests">
36+
</Test>
37+
<Test
38+
Identifier = "GoogleDriveAuthenticatorMockTests">
39+
</Test>
40+
<Test
41+
Identifier = "GoogleDriveCloudProviderIntegrationTests">
42+
</Test>
43+
<Test
44+
Identifier = "LocalFileSystemProviderIntegrationTests">
45+
</Test>
46+
<Test
47+
Identifier = "OneDriveCloudProviderIntegrationTests">
48+
</Test>
49+
<Test
50+
Identifier = "PCloudCloudProviderIntegrationTests">
51+
</Test>
52+
<Test
53+
Identifier = "S3CloudProviderIntegrationTests">
54+
</Test>
55+
<Test
56+
Identifier = "VaultFormat6DropboxIntegrationTests">
57+
</Test>
58+
<Test
59+
Identifier = "VaultFormat6GoogleDriveIntegrationTests">
60+
</Test>
61+
<Test
62+
Identifier = "VaultFormat6LocalFileSystemIntegrationTests">
63+
</Test>
64+
<Test
65+
Identifier = "VaultFormat6OneDriveIntegrationTests">
66+
</Test>
67+
<Test
68+
Identifier = "VaultFormat6PCloudIntegrationTests">
69+
</Test>
70+
<Test
71+
Identifier = "VaultFormat6S3IntegrationTests">
72+
</Test>
73+
<Test
74+
Identifier = "VaultFormat6WebDAVIntegrationTests">
75+
</Test>
76+
<Test
77+
Identifier = "VaultFormat7DropboxIntegrationTests">
78+
</Test>
79+
<Test
80+
Identifier = "VaultFormat7GoogleDriveIntegrationTests">
81+
</Test>
82+
<Test
83+
Identifier = "VaultFormat7LocalFileSystemIntegrationTests">
84+
</Test>
85+
<Test
86+
Identifier = "VaultFormat7OneDriveIntegrationTests">
87+
</Test>
88+
<Test
89+
Identifier = "VaultFormat7PCloudIntegrationTests">
90+
</Test>
91+
<Test
92+
Identifier = "VaultFormat7S3IntegrationTests">
93+
</Test>
94+
<Test
95+
Identifier = "VaultFormat7WebDAVIntegrationTests">
96+
</Test>
97+
<Test
98+
Identifier = "WebDAVCloudProviderIntegrationTests">
99+
</Test>
100+
</SkippedTests>
101+
</TestableReference>
102+
</Testables>
103+
</TestAction>
104+
<LaunchAction
105+
buildConfiguration = "Debug"
106+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
107+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
108+
launchStyle = "0"
109+
useCustomWorkingDirectory = "NO"
110+
ignoresPersistentStateOnLaunch = "NO"
111+
debugDocumentVersioning = "YES"
112+
debugServiceExtension = "internal"
113+
allowLocationSimulation = "YES">
114+
</LaunchAction>
115+
<ProfileAction
116+
buildConfiguration = "Release"
117+
shouldUseLaunchSchemeArgsEnv = "YES"
118+
savedToolIdentifier = ""
119+
useCustomWorkingDirectory = "NO"
120+
debugDocumentVersioning = "YES">
121+
</ProfileAction>
122+
<AnalyzeAction
123+
buildConfiguration = "Debug">
124+
</AnalyzeAction>
125+
<ArchiveAction
126+
buildConfiguration = "Release"
127+
revealArchiveInOrganizer = "YES">
128+
</ArchiveAction>
129+
</Scheme>

‎CryptomatorCloudAccess.xcodeproj/xcshareddata/xcschemes/CommonIntegrationTests.xcscheme

+9
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
ReferencedContainer = "container:CryptomatorCloudAccess.xcodeproj">
2323
</BuildableReference>
2424
<SkippedTests>
25+
<Test
26+
Identifier = "BoxCloudProviderIntegrationTests">
27+
</Test>
2528
<Test
2629
Identifier = "CloudAccessIntegrationTest">
2730
</Test>
@@ -46,6 +49,9 @@
4649
<Test
4750
Identifier = "S3CloudProviderIntegrationTests">
4851
</Test>
52+
<Test
53+
Identifier = "VaultFormat6BoxIntegrationTests">
54+
</Test>
4955
<Test
5056
Identifier = "VaultFormat6DropboxIntegrationTests">
5157
</Test>
@@ -67,6 +73,9 @@
6773
<Test
6874
Identifier = "VaultFormat6WebDAVIntegrationTests">
6975
</Test>
76+
<Test
77+
Identifier = "VaultFormat7BoxIntegrationTests">
78+
</Test>
7079
<Test
7180
Identifier = "VaultFormat7DropboxIntegrationTests">
7281
</Test>

‎CryptomatorCloudAccess.xcodeproj/xcshareddata/xcschemes/DropboxIntegrationTests.xcscheme

+9
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
ReferencedContainer = "container:CryptomatorCloudAccess.xcodeproj">
2323
</BuildableReference>
2424
<SkippedTests>
25+
<Test
26+
Identifier = "BoxCloudProviderIntegrationTests">
27+
</Test>
2528
<Test
2629
Identifier = "CloudAccessIntegrationTest">
2730
</Test>
@@ -49,6 +52,9 @@
4952
<Test
5053
Identifier = "S3CloudProviderIntegrationTests">
5154
</Test>
55+
<Test
56+
Identifier = "VaultFormat6BoxIntegrationTests">
57+
</Test>
5258
<Test
5359
Identifier = "VaultFormat6GoogleDriveIntegrationTests">
5460
</Test>
@@ -67,6 +73,9 @@
6773
<Test
6874
Identifier = "VaultFormat6WebDAVIntegrationTests">
6975
</Test>
76+
<Test
77+
Identifier = "VaultFormat7BoxIntegrationTests">
78+
</Test>
7079
<Test
7180
Identifier = "VaultFormat7GoogleDriveIntegrationTests">
7281
</Test>

‎CryptomatorCloudAccess.xcodeproj/xcshareddata/xcschemes/GoogleDriveIntegrationTests.xcscheme

+9
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
ReferencedContainer = "container:CryptomatorCloudAccess.xcodeproj">
2323
</BuildableReference>
2424
<SkippedTests>
25+
<Test
26+
Identifier = "BoxCloudProviderIntegrationTests">
27+
</Test>
2528
<Test
2629
Identifier = "CloudAccessIntegrationTest">
2730
</Test>
@@ -49,6 +52,9 @@
4952
<Test
5053
Identifier = "S3CloudProviderIntegrationTests">
5154
</Test>
55+
<Test
56+
Identifier = "VaultFormat6BoxIntegrationTests">
57+
</Test>
5258
<Test
5359
Identifier = "VaultFormat6DropboxIntegrationTests">
5460
</Test>
@@ -67,6 +73,9 @@
6773
<Test
6874
Identifier = "VaultFormat6WebDAVIntegrationTests">
6975
</Test>
76+
<Test
77+
Identifier = "VaultFormat7BoxIntegrationTests">
78+
</Test>
7079
<Test
7180
Identifier = "VaultFormat7DropboxIntegrationTests">
7281
</Test>

‎CryptomatorCloudAccess.xcodeproj/xcshareddata/xcschemes/LocalFileSystemIntegrationTests.xcscheme

+9
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
ReferencedContainer = "container:CryptomatorCloudAccess.xcodeproj">
2323
</BuildableReference>
2424
<SkippedTests>
25+
<Test
26+
Identifier = "BoxCloudProviderIntegrationTests">
27+
</Test>
2528
<Test
2629
Identifier = "CloudAccessIntegrationTest">
2730
</Test>
@@ -49,6 +52,9 @@
4952
<Test
5053
Identifier = "S3CloudProviderIntegrationTests">
5154
</Test>
55+
<Test
56+
Identifier = "VaultFormat6BoxIntegrationTests">
57+
</Test>
5258
<Test
5359
Identifier = "VaultFormat6DropboxIntegrationTests">
5460
</Test>
@@ -67,6 +73,9 @@
6773
<Test
6874
Identifier = "VaultFormat6WebDAVIntegrationTests">
6975
</Test>
76+
<Test
77+
Identifier = "VaultFormat7BoxIntegrationTests">
78+
</Test>
7079
<Test
7180
Identifier = "VaultFormat7DropboxIntegrationTests">
7281
</Test>

‎CryptomatorCloudAccess.xcodeproj/xcshareddata/xcschemes/OneDriveIntegrationTests.xcscheme

+9
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
ReferencedContainer = "container:CryptomatorCloudAccess.xcodeproj">
2323
</BuildableReference>
2424
<SkippedTests>
25+
<Test
26+
Identifier = "BoxCloudProviderIntegrationTests">
27+
</Test>
2528
<Test
2629
Identifier = "CloudAccessIntegrationTest">
2730
</Test>
@@ -49,6 +52,9 @@
4952
<Test
5053
Identifier = "S3CloudProviderIntegrationTests">
5154
</Test>
55+
<Test
56+
Identifier = "VaultFormat6BoxIntegrationTests">
57+
</Test>
5258
<Test
5359
Identifier = "VaultFormat6DropboxIntegrationTests">
5460
</Test>
@@ -67,6 +73,9 @@
6773
<Test
6874
Identifier = "VaultFormat6WebDAVIntegrationTests">
6975
</Test>
76+
<Test
77+
Identifier = "VaultFormat7BoxIntegrationTests">
78+
</Test>
7079
<Test
7180
Identifier = "VaultFormat7DropboxIntegrationTests">
7281
</Test>

0 commit comments

Comments
 (0)