Skip to content

Commit 1ef0aa8

Browse files
tobihagemanntobihagemann
committed
Merge branch 'release/2.0.0'
2 parents 299be23 + de7d87b commit 1ef0aa8

54 files changed

Lines changed: 848 additions & 515 deletions

File tree

Some content is hidden

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

‎.github/workflows/build.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ jobs:
6363
scheme-name: GoogleDriveIntegrationTests
6464
- name: Local File System
6565
scheme-name: LocalFileSystemIntegrationTests
66-
- name: OneDrive
67-
scheme-name: OneDriveIntegrationTests
66+
- name: Microsoft Graph
67+
scheme-name: MicrosoftGraphIntegrationTests
6868
- name: pCloud
6969
scheme-name: PCloudIntegrationTests
7070
- name: S3
@@ -90,9 +90,9 @@ jobs:
9090
DROPBOX_ACCESS_TOKEN: ${{ secrets.DROPBOX_ACCESS_TOKEN }}
9191
GOOGLE_DRIVE_CLIENT_ID: ${{ secrets.GOOGLE_DRIVE_CLIENT_ID }}
9292
GOOGLE_DRIVE_REFRESH_TOKEN: ${{ secrets.GOOGLE_DRIVE_REFRESH_TOKEN }}
93-
ONEDRIVE_CLIENT_ID: ${{ secrets.ONEDRIVE_CLIENT_ID }}
94-
ONEDRIVE_REDIRECT_URI_SCHEME: ${{ secrets.ONEDRIVE_REDIRECT_URI_SCHEME }}
95-
ONEDRIVE_REFRESH_TOKEN: ${{ secrets.ONEDRIVE_REFRESH_TOKEN }}
93+
MICROSOFT_GRAPH_CLIENT_ID: ${{ secrets.MICROSOFT_GRAPH_CLIENT_ID }}
94+
MICROSOFT_GRAPH_REDIRECT_URI_SCHEME: ${{ secrets.MICROSOFT_GRAPH_REDIRECT_URI_SCHEME }}
95+
MICROSOFT_GRAPH_REFRESH_TOKEN: ${{ secrets.MICROSOFT_GRAPH_REFRESH_TOKEN }}
9696
PCLOUD_APP_KEY: ${{ secrets.PCLOUD_APP_KEY }}
9797
PCLOUD_ACCESS_TOKEN: ${{ secrets.PCLOUD_ACCESS_TOKEN }}
9898
PCLOUD_HTTP_API_HOST_NAME: ${{ secrets.PCLOUD_HTTP_API_HOST_NAME }}

‎CryptomatorCloudAccess.xcodeproj/project.pbxproj‎

Lines changed: 86 additions & 66 deletions
Large diffs are not rendered by default.

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

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
Identifier = "LocalFileSystemProviderIntegrationTests">
4545
</Test>
4646
<Test
47-
Identifier = "OneDriveCloudProviderIntegrationTests">
47+
Identifier = "MicrosoftGraphCloudProviderIntegrationTests">
4848
</Test>
4949
<Test
5050
Identifier = "PCloudCloudProviderIntegrationTests">
@@ -62,7 +62,7 @@
6262
Identifier = "VaultFormat6LocalFileSystemIntegrationTests">
6363
</Test>
6464
<Test
65-
Identifier = "VaultFormat6OneDriveIntegrationTests">
65+
Identifier = "VaultFormat6MicrosoftGraphIntegrationTests">
6666
</Test>
6767
<Test
6868
Identifier = "VaultFormat6PCloudIntegrationTests">
@@ -83,7 +83,7 @@
8383
Identifier = "VaultFormat7LocalFileSystemIntegrationTests">
8484
</Test>
8585
<Test
86-
Identifier = "VaultFormat7OneDriveIntegrationTests">
86+
Identifier = "VaultFormat7MicrosoftGraphIntegrationTests">
8787
</Test>
8888
<Test
8989
Identifier = "VaultFormat7PCloudIntegrationTests">

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
Identifier = "LocalFileSystemProviderIntegrationTests">
4242
</Test>
4343
<Test
44-
Identifier = "OneDriveCloudProviderIntegrationTests">
44+
Identifier = "MicrosoftGraphCloudProviderIntegrationTests">
4545
</Test>
4646
<Test
4747
Identifier = "PCloudCloudProviderIntegrationTests">
@@ -62,7 +62,7 @@
6262
Identifier = "VaultFormat6LocalFileSystemIntegrationTests">
6363
</Test>
6464
<Test
65-
Identifier = "VaultFormat6OneDriveIntegrationTests">
65+
Identifier = "VaultFormat6MicrosoftGraphIntegrationTests">
6666
</Test>
6767
<Test
6868
Identifier = "VaultFormat6PCloudIntegrationTests">
@@ -86,7 +86,7 @@
8686
Identifier = "VaultFormat7LocalFileSystemIntegrationTests">
8787
</Test>
8888
<Test
89-
Identifier = "VaultFormat7OneDriveIntegrationTests">
89+
Identifier = "VaultFormat7MicrosoftGraphIntegrationTests">
9090
</Test>
9191
<Test
9292
Identifier = "VaultFormat7PCloudIntegrationTests">

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
Identifier = "LocalFileSystemProviderIntegrationTests">
4545
</Test>
4646
<Test
47-
Identifier = "OneDriveCloudProviderIntegrationTests">
47+
Identifier = "MicrosoftGraphCloudProviderIntegrationTests">
4848
</Test>
4949
<Test
5050
Identifier = "PCloudCloudProviderIntegrationTests">
@@ -62,7 +62,7 @@
6262
Identifier = "VaultFormat6LocalFileSystemIntegrationTests">
6363
</Test>
6464
<Test
65-
Identifier = "VaultFormat6OneDriveIntegrationTests">
65+
Identifier = "VaultFormat6MicrosoftGraphIntegrationTests">
6666
</Test>
6767
<Test
6868
Identifier = "VaultFormat6PCloudIntegrationTests">
@@ -83,7 +83,7 @@
8383
Identifier = "VaultFormat7LocalFileSystemIntegrationTests">
8484
</Test>
8585
<Test
86-
Identifier = "VaultFormat7OneDriveIntegrationTests">
86+
Identifier = "VaultFormat7MicrosoftGraphIntegrationTests">
8787
</Test>
8888
<Test
8989
Identifier = "VaultFormat7PCloudIntegrationTests">

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
Identifier = "LocalFileSystemProviderIntegrationTests">
4545
</Test>
4646
<Test
47-
Identifier = "OneDriveCloudProviderIntegrationTests">
47+
Identifier = "MicrosoftGraphCloudProviderIntegrationTests">
4848
</Test>
4949
<Test
5050
Identifier = "PCloudCloudProviderIntegrationTests">
@@ -62,7 +62,7 @@
6262
Identifier = "VaultFormat6LocalFileSystemIntegrationTests">
6363
</Test>
6464
<Test
65-
Identifier = "VaultFormat6OneDriveIntegrationTests">
65+
Identifier = "VaultFormat6MicrosoftGraphIntegrationTests">
6666
</Test>
6767
<Test
6868
Identifier = "VaultFormat6PCloudIntegrationTests">
@@ -83,7 +83,7 @@
8383
Identifier = "VaultFormat7LocalFileSystemIntegrationTests">
8484
</Test>
8585
<Test
86-
Identifier = "VaultFormat7OneDriveIntegrationTests">
86+
Identifier = "VaultFormat7MicrosoftGraphIntegrationTests">
8787
</Test>
8888
<Test
8989
Identifier = "VaultFormat7PCloudIntegrationTests">

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
Identifier = "GoogleDriveCloudProviderIntegrationTests">
4545
</Test>
4646
<Test
47-
Identifier = "OneDriveCloudProviderIntegrationTests">
47+
Identifier = "MicrosoftGraphCloudProviderIntegrationTests">
4848
</Test>
4949
<Test
5050
Identifier = "PCloudCloudProviderIntegrationTests">
@@ -62,7 +62,7 @@
6262
Identifier = "VaultFormat6GoogleDriveIntegrationTests">
6363
</Test>
6464
<Test
65-
Identifier = "VaultFormat6OneDriveIntegrationTests">
65+
Identifier = "VaultFormat6MicrosoftGraphIntegrationTests">
6666
</Test>
6767
<Test
6868
Identifier = "VaultFormat6PCloudIntegrationTests">
@@ -83,7 +83,7 @@
8383
Identifier = "VaultFormat7GoogleDriveIntegrationTests">
8484
</Test>
8585
<Test
86-
Identifier = "VaultFormat7OneDriveIntegrationTests">
86+
Identifier = "VaultFormat7MicrosoftGraphIntegrationTests">
8787
</Test>
8888
<Test
8989
Identifier = "VaultFormat7PCloudIntegrationTests">

CryptomatorCloudAccess.xcodeproj/xcshareddata/xcschemes/OneDriveIntegrationTests.xcscheme renamed to CryptomatorCloudAccess.xcodeproj/xcshareddata/xcschemes/MicrosoftGraphIntegrationTests.xcscheme

File renamed without changes.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
Identifier = "LocalFileSystemProviderIntegrationTests">
4848
</Test>
4949
<Test
50-
Identifier = "OneDriveCloudProviderIntegrationTests">
50+
Identifier = "MicrosoftGraphCloudProviderIntegrationTests">
5151
</Test>
5252
<Test
5353
Identifier = "S3CloudProviderIntegrationTests">
@@ -65,7 +65,7 @@
6565
Identifier = "VaultFormat6LocalFileSystemIntegrationTests">
6666
</Test>
6767
<Test
68-
Identifier = "VaultFormat6OneDriveIntegrationTests">
68+
Identifier = "VaultFormat6MicrosoftGraphIntegrationTests">
6969
</Test>
7070
<Test
7171
Identifier = "VaultFormat6S3IntegrationTests">
@@ -86,7 +86,7 @@
8686
Identifier = "VaultFormat7LocalFileSystemIntegrationTests">
8787
</Test>
8888
<Test
89-
Identifier = "VaultFormat7OneDriveIntegrationTests">
89+
Identifier = "VaultFormat7MicrosoftGraphIntegrationTests">
9090
</Test>
9191
<Test
9292
Identifier = "VaultFormat7S3IntegrationTests">

0 commit comments

Comments
 (0)