Skip to content

Commit 1ef0aa8

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

File tree

54 files changed

+848
-515
lines changed

Some content is hidden

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

54 files changed

+848
-515
lines changed

‎.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
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"kind" : "remoteSourceControl",
77
"location" : "https://github.com/openid/AppAuth-iOS.git",
88
"state" : {
9-
"revision" : "c89ed571ae140f8eb1142735e6e23d7bb8c34cb2",
10-
"version" : "1.7.5"
9+
"revision" : "2781038865a80e2c425a1da12cc1327bcd56501f",
10+
"version" : "1.7.6"
1111
}
1212
},
1313
{
@@ -114,8 +114,8 @@
114114
"kind" : "remoteSourceControl",
115115
"location" : "https://github.com/AzureAD/microsoft-authentication-library-for-objc.git",
116116
"state" : {
117-
"revision" : "b8733236bfd16e10849f4752a4d1c4621e4bf930",
118-
"version" : "1.5.0"
117+
"revision" : "bad310566a9f86cc5f41b0a4e29618f7f7d5d5f6",
118+
"version" : "1.5.1"
119119
}
120120
},
121121
{
@@ -141,8 +141,8 @@
141141
"kind" : "remoteSourceControl",
142142
"location" : "https://github.com/pCloud/pcloud-sdk-swift.git",
143143
"state" : {
144-
"revision" : "ad1a7d8b3a59f12185d7bc89ff7a1b8c087ed0c0",
145-
"version" : "3.2.2"
144+
"revision" : "cc81e0250a9f378019470c78ce9a8bb501dcaeda",
145+
"version" : "3.2.3"
146146
}
147147
},
148148
{
@@ -159,8 +159,8 @@
159159
"kind" : "remoteSourceControl",
160160
"location" : "https://github.com/apple/swift-log",
161161
"state" : {
162-
"revision" : "9cb486020ebf03bfa5b5df985387a14a98744537",
163-
"version" : "1.6.1"
162+
"revision" : "3d8596ed08bd13520157f0355e35caed215ffbfa",
163+
"version" : "1.6.3"
164164
}
165165
}
166166
],

‎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">

‎CryptomatorCloudAccess.xcodeproj/xcshareddata/xcschemes/S3IntegrationTests.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 = "PCloudCloudProviderIntegrationTests">
@@ -65,7 +65,7 @@
6565
Identifier = "VaultFormat6LocalFileSystemIntegrationTests">
6666
</Test>
6767
<Test
68-
Identifier = "VaultFormat6OneDriveIntegrationTests">
68+
Identifier = "VaultFormat6MicrosoftGraphIntegrationTests">
6969
</Test>
7070
<Test
7171
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/WebDAVIntegrationTests.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 = "PCloudCloudProviderIntegrationTests">
@@ -68,7 +68,7 @@
6868
Identifier = "VaultFormat6LocalFileSystemIntegrationTests">
6969
</Test>
7070
<Test
71-
Identifier = "VaultFormat6OneDriveIntegrationTests">
71+
Identifier = "VaultFormat6MicrosoftGraphIntegrationTests">
7272
</Test>
7373
<Test
7474
Identifier = "VaultFormat6PCloudIntegrationTests">
@@ -89,7 +89,7 @@
8989
Identifier = "VaultFormat7LocalFileSystemIntegrationTests">
9090
</Test>
9191
<Test
92-
Identifier = "VaultFormat7OneDriveIntegrationTests">
92+
Identifier = "VaultFormat7MicrosoftGraphIntegrationTests">
9393
</Test>
9494
<Test
9595
Identifier = "VaultFormat7PCloudIntegrationTests">

‎Package.resolved

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
"kind" : "remoteSourceControl",
66
"location" : "https://github.com/openid/AppAuth-iOS.git",
77
"state" : {
8-
"revision" : "c89ed571ae140f8eb1142735e6e23d7bb8c34cb2",
9-
"version" : "1.7.5"
8+
"revision" : "2781038865a80e2c425a1da12cc1327bcd56501f",
9+
"version" : "1.7.6"
1010
}
1111
},
1212
{
@@ -113,8 +113,8 @@
113113
"kind" : "remoteSourceControl",
114114
"location" : "https://github.com/AzureAD/microsoft-authentication-library-for-objc.git",
115115
"state" : {
116-
"revision" : "b8733236bfd16e10849f4752a4d1c4621e4bf930",
117-
"version" : "1.5.0"
116+
"revision" : "bad310566a9f86cc5f41b0a4e29618f7f7d5d5f6",
117+
"version" : "1.5.1"
118118
}
119119
},
120120
{
@@ -140,8 +140,8 @@
140140
"kind" : "remoteSourceControl",
141141
"location" : "https://github.com/pCloud/pcloud-sdk-swift.git",
142142
"state" : {
143-
"revision" : "ad1a7d8b3a59f12185d7bc89ff7a1b8c087ed0c0",
144-
"version" : "3.2.2"
143+
"revision" : "cc81e0250a9f378019470c78ce9a8bb501dcaeda",
144+
"version" : "3.2.3"
145145
}
146146
},
147147
{
@@ -158,8 +158,8 @@
158158
"kind" : "remoteSourceControl",
159159
"location" : "https://github.com/apple/swift-log",
160160
"state" : {
161-
"revision" : "9cb486020ebf03bfa5b5df985387a14a98744537",
162-
"version" : "1.6.1"
161+
"revision" : "3d8596ed08bd13520157f0355e35caed215ffbfa",
162+
"version" : "1.6.3"
163163
}
164164
}
165165
],

‎Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import PackageDescription
1313
let appExtensionUnsafeSources = [
1414
"Dropbox/DropboxAuthenticator.swift",
1515
"GoogleDrive/GoogleDriveAuthenticator.swift",
16-
"OneDrive/OneDriveAuthenticator.swift",
16+
"MicrosoftGraph/MicrosoftGraphAuthenticator.swift",
1717
"PCloud/PCloudAuthenticator.swift",
1818
"Box/BoxAuthenticator.swift"
1919
]

0 commit comments

Comments
 (0)