Skip to content

Commit 75f1b31

Browse files
tobihagemanntobihagemann
committed
Merge branch 'release/2.0.0-alpha1'
2 parents b08be7c + be8c5a5 commit 75f1b31

File tree

329 files changed

+11640
-11545
lines changed

Some content is hidden

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

329 files changed

+11640
-11545
lines changed

‎.github/CODE_OF_CONDUCT.md‎

Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
# Contributor Covenant Code of Conduct
2+
3+
## Our Pledge
4+
5+
We as members, contributors, and leaders pledge to make participation in our
6+
community a harassment-free experience for everyone, regardless of age, body
7+
size, visible or invisible disability, ethnicity, sex characteristics, gender
8+
identity and expression, level of experience, education, socio-economic status,
9+
nationality, personal appearance, race, religion, or sexual identity
10+
and orientation.
11+
12+
We pledge to act and interact in ways that contribute to an open, welcoming,
13+
diverse, inclusive, and healthy community.
14+
15+
## Our Standards
16+
17+
Examples of behavior that contributes to a positive environment for our
18+
community include:
19+
20+
* Demonstrating empathy and kindness toward other people
21+
* Being respectful of differing opinions, viewpoints, and experiences
22+
* Giving and gracefully accepting constructive feedback
23+
* Accepting responsibility and apologizing to those affected by our mistakes,
24+
and learning from the experience
25+
* Focusing on what is best not just for us as individuals, but for the
26+
overall community
27+
28+
Examples of unacceptable behavior include:
29+
30+
* The use of sexualized language or imagery, and sexual attention or
31+
advances of any kind
32+
* Trolling, insulting or derogatory comments, and personal or political attacks
33+
* Public or private harassment
34+
* Publishing others' private information, such as a physical or email
35+
address, without their explicit permission
36+
* Other conduct which could reasonably be considered inappropriate in a
37+
professional setting
38+
39+
## Enforcement Responsibilities
40+
41+
Community leaders are responsible for clarifying and enforcing our standards of
42+
acceptable behavior and will take appropriate and fair corrective action in
43+
response to any behavior that they deem inappropriate, threatening, offensive,
44+
or harmful.
45+
46+
Community leaders have the right and responsibility to remove, edit, or reject
47+
comments, commits, code, wiki edits, issues, and other contributions that are
48+
not aligned to this Code of Conduct, and will communicate reasons for moderation
49+
decisions when appropriate.
50+
51+
## Scope
52+
53+
This Code of Conduct applies within all community spaces, and also applies when
54+
an individual is officially representing the community in public spaces.
55+
Examples of representing our community include using an official e-mail address,
56+
posting via an official social media account, or acting as an appointed
57+
representative at an online or offline event.
58+
59+
## Enforcement
60+
61+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
62+
reported to the community leaders responsible for enforcement at
63+
[email protected].
64+
All complaints will be reviewed and investigated promptly and fairly.
65+
66+
All community leaders are obligated to respect the privacy and security of the
67+
reporter of any incident.
68+
69+
## Enforcement Guidelines
70+
71+
Community leaders will follow these Community Impact Guidelines in determining
72+
the consequences for any action they deem in violation of this Code of Conduct:
73+
74+
### 1. Correction
75+
76+
**Community Impact**: Use of inappropriate language or other behavior deemed
77+
unprofessional or unwelcome in the community.
78+
79+
**Consequence**: A private, written warning from community leaders, providing
80+
clarity around the nature of the violation and an explanation of why the
81+
behavior was inappropriate. A public apology may be requested.
82+
83+
### 2. Warning
84+
85+
**Community Impact**: A violation through a single incident or series
86+
of actions.
87+
88+
**Consequence**: A warning with consequences for continued behavior. No
89+
interaction with the people involved, including unsolicited interaction with
90+
those enforcing the Code of Conduct, for a specified period of time. This
91+
includes avoiding interactions in community spaces as well as external channels
92+
like social media. Violating these terms may lead to a temporary or
93+
permanent ban.
94+
95+
### 3. Temporary Ban
96+
97+
**Community Impact**: A serious violation of community standards, including
98+
sustained inappropriate behavior.
99+
100+
**Consequence**: A temporary ban from any sort of interaction or public
101+
communication with the community for a specified period of time. No public or
102+
private interaction with the people involved, including unsolicited interaction
103+
with those enforcing the Code of Conduct, is allowed during this period.
104+
Violating these terms may lead to a permanent ban.
105+
106+
### 4. Permanent Ban
107+
108+
**Community Impact**: Demonstrating a pattern of violation of community
109+
standards, including sustained inappropriate behavior, harassment of an
110+
individual, or aggression toward or disparagement of classes of individuals.
111+
112+
**Consequence**: A permanent ban from any sort of public interaction within
113+
the community.
114+
115+
## Attribution
116+
117+
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
118+
version 2.0, available at
119+
https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
120+
121+
Community Impact Guidelines were inspired by [Mozilla's code of conduct
122+
enforcement ladder](https://github.com/mozilla/diversity).
123+
124+
[homepage]: https://www.contributor-covenant.org
125+
126+
For answers to common questions about this code of conduct, see the FAQ at
127+
https://www.contributor-covenant.org/faq. Translations are available at
128+
https://www.contributor-covenant.org/translations.

‎.github/CONTRIBUTING.md‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Contributing to Cryptomator for iOS
2+
3+
## Did you find a bug?
4+
5+
- Ensure the bug was not [already reported](https://github.com/cryptomator/ios/issues).
6+
- If you're unable to find an open issue addressing the problem, [submit a new one](https://github.com/cryptomator/ios/issues/new).
7+
8+
## Did you write a patch that fixes a bug?
9+
10+
- Open a new pull request with the patch.
11+
- Ensure the PR description clearly describes the problem and solution. Include the relevant issue number if applicable.
12+
13+
## Do you intend to add a new feature or change an existing one?
14+
15+
- Suggest your change by [submitting a new issue](https://github.com/cryptomator/ios/issues/new) and start writing code.
16+
17+
## Code of Conduct
18+
19+
Help us keep Cryptomator open and inclusive. Please read and follow our [Code of Conduct](CODE_OF_CONDUCT.md).
20+
21+
## Above all, thank you for your contributions
22+
23+
Thank you for taking the time to contribute to the project! :+1:
24+
25+
Cryptomator Team

‎.github/FUNDING.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
github: [cryptomator]
2+
custom: https://cryptomator.org/sponsors/

‎.github/workflows/build.yml‎

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,25 +18,13 @@ jobs:
1818
${{ runner.os }}-spm-
1919
- name: Run process.sh script
2020
run: |
21-
./Scripts/process.sh --fail-on-errors
22-
failed=$?
23-
exit $failed
21+
./Scripts/process.sh
22+
exit $?
2423
- name: Create CloudAccessSecrets
2524
run: ./create-cloud-access-secrets-file.sh
26-
env:
27-
GOOGLE_DRIVE_CLIENT_ID: ${{ secrets.GOOGLE_DRIVE_CLIENT_ID }}
28-
GOOGLE_DRIVE_REDIRECT_URL: ${{ secrets.GOOGLE_DRIVE_REDIRECT_URL }}
29-
DROPBOX_APP_KEY: ${{ secrets.DROPBOX_APP_KEY }}
30-
- name: Build and test CloudAccessPrivateCore
31-
run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild -scheme 'CloudAccessPrivateCore' -destination 'name=iPhone 12 Pro' -enableCodeCoverage YES clean test | xcpretty
32-
- name: Run CryptomatorIntegrationTests
33-
if: startsWith(github.ref, 'refs/tags/')
34-
run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild -scheme 'CryptomatorIntegrationTests' -destination 'name=iPhone 12 Pro' test | xcpretty
35-
env:
36-
GOOGLE_DRIVE_REFRESH_TOKEN: ${{ secrets.GOOGLE_DRIVE_REFRESH_TOKEN }}
37-
DROPBOX_ACCESS_TOKEN: ${{ secrets.DROPBOX_ACCESS_TOKEN }}
38-
WEBDAV_BASE_URL: ${{ secrets.WEBDAV_BASE_URL }}
39-
WEBDAV_USERNAME: ${{ secrets.WEBDAV_USERNAME }}
40-
WEBDAV_PASSWORD: ${{ secrets.WEBDAV_PASSWORD }}
25+
- name: Build and test CryptomatorCommonCore
26+
run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild -scheme 'CryptomatorCommonCore' -destination 'name=iPhone 12 Pro' -enableCodeCoverage YES clean test | xcpretty
27+
- name: Build and test CryptomatorFileProvider
28+
run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild -scheme 'CryptomatorFileProvider' -destination 'name=iPhone 12 Pro' test | xcpretty
4129
- name: Build and test Cryptomator
4230
run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild -scheme 'Cryptomator' -destination 'name=iPhone 12 Pro' test | xcpretty

‎.gitignore‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
# Secrets
22
.cloud-access-secrets.sh
3-
CryptomatorEnvironmentVariables.h
4-
CloudAccessPrivate/Sources/CloudAccessPrivateCore/CloudAccessSecrets.swift
5-
.integration-test-secrets.sh
6-
CryptomatorIntegrationTests/IntegrationTestSecrets.swift
3+
CryptomatorCommon/Sources/CryptomatorCommonCore/CloudAccessSecrets.swift
74

85
# macOS
96
.DS_Store

‎.swiftlint.yml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
disabled_rules:
2+
- file_length
3+
- line_length
4+
- todo
5+
- type_body_length
6+
7+
included:
8+
- Cryptomator
9+
- CryptomatorTests
10+
- CryptomatorCommon
11+
- CryptomatorCommonHostedTests
12+
- CryptomatorFileProvider
13+
- CryptomatorFileProviderTests
14+
- FileProviderExtension
15+
- FileProviderExtensionUI
16+
17+
identifier_name:
18+
min_length: 1
19+
max_length: 50
20+
inclusive_language:
21+
override_allowed_terms: ["masterkey"]
22+
type_name:
23+
max_length: 50
24+
allowed_symbols: "_"

‎CloudAccessPrivate/Package.swift‎

Lines changed: 0 additions & 54 deletions
This file was deleted.

‎CloudAccessPrivate/Sources/CloudAccessPrivate/Dropbox/DropboxCloudAuthenticator.swift‎

Lines changed: 0 additions & 52 deletions
This file was deleted.

0 commit comments

Comments
 (0)