Skip to content

Commit 9bf1bec

Browse files
tobihagemanntobihagemann
committed
Merge branch 'release/1.0.0'
2 parents 2a5ca04 + 24f6567 commit 9bf1bec

Some content is hidden

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

50 files changed

+4841
-662
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 CryptoLib Swift
2+
3+
## Did you find a bug?
4+
5+
- Ensure the bug was not [already reported](https://github.com/cryptomator/cryptolib-swift/issues).
6+
- If you're unable to find an open issue addressing the problem, [submit a new one](https://github.com/cryptomator/cryptolib-swift/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/cryptolib-swift/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/workflows/build.yml‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
name: Build
2+
3+
on:
4+
[push]
5+
6+
jobs:
7+
build:
8+
name: Build and test
9+
runs-on: macos-latest
10+
env:
11+
DERIVED_DATA_PATH: 'DerivedData'
12+
if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
13+
steps:
14+
- uses: actions/checkout@v2
15+
- uses: actions/cache@v2
16+
with:
17+
path: .build
18+
key: ${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }}
19+
restore-keys: |
20+
${{ runner.os }}-spm-
21+
- name: Run process.sh script
22+
run: |
23+
./Scripts/process.sh
24+
exit $?
25+
- name: Build and test
26+
run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild -scheme 'CryptomatorCryptoLib' -destination 'platform=macOS' -derivedDataPath $DERIVED_DATA_PATH -enableCodeCoverage YES clean test | xcpretty
27+
- name: Upload code coverage report
28+
run: |
29+
gem install slather
30+
slather coverage -x --build-directory $DERIVED_DATA_PATH --ignore "$DERIVED_DATA_PATH/SourcePackages/*" --scheme CryptomatorCryptoLib CryptomatorCryptoLib.xcodeproj
31+
bash <(curl -Ls https://coverage.codacy.com/get.sh)
32+
env:
33+
CODACY_PROJECT_TOKEN: ${{ secrets.CODACY_PROJECT_TOKEN }}
34+
continue-on-error: true
35+
36+
release:
37+
name: Deploy and draft a release
38+
runs-on: macos-latest
39+
needs: build
40+
if: startsWith(github.ref, 'refs/tags/')
41+
steps:
42+
- uses: actions/checkout@v2
43+
- name: Draft release
44+
uses: actions/create-release@v1
45+
env:
46+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
47+
with:
48+
tag_name: ${{ github.ref }}
49+
release_name: ${{ github.ref }}
50+
body: |
51+
:construction: Work in Progress
52+
draft: true
53+
prerelease: false

‎.gitignore‎

Lines changed: 3 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,11 @@
1-
#Mac
1+
# macOS
22
.DS_Store
3+
34
# Xcode
4-
#
5-
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
65

76
## User settings
87
xcuserdata/
98

10-
## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9)
11-
*.xcscmblueprint
12-
*.xccheckout
13-
14-
## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4)
15-
build/
16-
DerivedData/
17-
*.moved-aside
18-
*.pbxuser
19-
!default.pbxuser
20-
*.mode1v3
21-
!default.mode1v3
22-
*.mode2v3
23-
!default.mode2v3
24-
*.perspectivev3
25-
!default.perspectivev3
26-
279
## Obj-C/Swift specific
2810
*.hmap
2911

@@ -46,47 +28,6 @@ playground.xcworkspace
4628
#
4729
# Xcode automatically generates this directory with a .xcworkspacedata file and xcuserdata
4830
# hence it is not needed unless you have added a package configuration file to your project
49-
# .swiftpm
31+
.swiftpm
5032

5133
.build/
52-
53-
# CocoaPods
54-
#
55-
# We recommend against adding the Pods directory to your .gitignore. However
56-
# you should judge for yourself, the pros and cons are mentioned at:
57-
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
58-
#
59-
Pods/
60-
#
61-
# Add this line if you want to avoid checking in source code from the Xcode workspace
62-
# *.xcworkspace
63-
64-
# Carthage
65-
#
66-
# Add this line if you want to avoid checking in source code from Carthage dependencies.
67-
# Carthage/Checkouts
68-
69-
Carthage/Build/
70-
71-
# Accio dependency management
72-
Dependencies/
73-
.accio/
74-
75-
# fastlane
76-
#
77-
# It is recommended to not store the screenshots in the git repo.
78-
# Instead, use fastlane to re-generate the screenshots whenever they are needed.
79-
# For more information about the recommended setup visit:
80-
# https://docs.fastlane.tools/best-practices/source-control/#source-control
81-
82-
fastlane/report.xml
83-
fastlane/Preview.html
84-
fastlane/screenshots/**/*.png
85-
fastlane/test_output
86-
87-
# Code Injection
88-
#
89-
# After new code Injection tools there's a generated folder /iOSInjectionProject
90-
# https://github.com/johnno1962/injectionforxcode
91-
92-
iOSInjectionProject/

‎.swiftformat‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
--minversion 0.49.0
2+
3+
# format options
4+
5+
--closurevoid preserve
6+
--commas inline
7+
--ifdef no-indent
8+
--importgrouping testable-bottom
9+
--indent tab
10+
--self init-only
11+
--stripunusedargs closure-only
12+
--swiftversion 5.1
13+
--tabwidth 4
14+
15+
# rules
16+
17+
--enable isEmpty
18+
--disable redundantReturn,trailingClosures

‎.swiftlint.yml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
disabled_rules:
2+
- file_length
3+
- line_length
4+
- todo
5+
- type_body_length
6+
7+
included:
8+
- Sources/CryptomatorCryptoLib
9+
- Tests/CryptomatorCryptoLibTests
10+
excluded:
11+
- Tests/CryptomatorCryptoLibTests/XCTestManifests.swift
12+
13+
identifier_name:
14+
min_length: 1
15+
max_length: 50
16+
inclusive_language:
17+
override_allowed_terms: ["masterkey"]
18+
type_name:
19+
max_length: 50
20+
allowed_symbols: "_"

‎CryptoLib.podspec‎

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

0 commit comments

Comments
 (0)