Skip to content

Commit ac6e2f9

Browse files
Merge pull request #8 from SomeRandomiOSDev/CodacyFixes
Fixed up Codacy issues
2 parents fac9ea9 + b9be853 commit ac6e2f9

16 files changed

+208
-209
lines changed

.github/CODE_OF_CONDUCT.md

Lines changed: 10 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,16 @@ community include:
2020
* Demonstrating empathy and kindness toward other people
2121
* Being respectful of differing opinions, viewpoints, and experiences
2222
* 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 overall
26-
community
23+
* Accepting responsibility and apologizing to those affected by our mistakes, and learning from the experience
24+
* Focusing on what is best not just for us as individuals, but for the overall community
2725

2826
Examples of unacceptable behavior include:
2927

30-
* The use of sexualized language or imagery, and sexual attention or advances of
31-
any kind
28+
* The use of sexualized language or imagery, and sexual attention or advances of any kind
3229
* Trolling, insulting or derogatory comments, and personal or political attacks
3330
* Public or private harassment
34-
* Publishing others' private information, such as a physical or email address,
35-
without their explicit permission
36-
* Other conduct which could reasonably be considered inappropriate in a
37-
professional setting
31+
* Publishing others' private information, such as a physical or email address, without their explicit permission
32+
* Other conduct which could reasonably be considered inappropriate in a professional setting
3833

3934
## Enforcement Responsibilities
4035

@@ -114,19 +109,12 @@ community.
114109

115110
## Attribution
116111

117-
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
118-
version 2.1, available at
119-
[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
112+
This Code of Conduct is adapted from the [Contributor Covenant](https://www.contributor-covenant.org),
113+
version 2.1, available at https://www.contributor-covenant.org/version/2/1/code_of_conduct.html.
120114

121115
Community Impact Guidelines were inspired by
122-
[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
116+
[Mozilla's code of conduct enforcement ladder](https://github.com/mozilla/diversity).
123117

124118
For answers to common questions about this code of conduct, see the FAQ at
125-
[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
126-
[https://www.contributor-covenant.org/translations][translations].
127-
128-
[homepage]: https://www.contributor-covenant.org
129-
[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
130-
[Mozilla CoC]: https://github.com/mozilla/diversity
131-
[FAQ]: https://www.contributor-covenant.org/faq
132-
[translations]: https://www.contributor-covenant.org/translations
119+
https://www.contributor-covenant.org/faq. Translations are available at
120+
https://www.contributor-covenant.org/translations.

.github/CONTRIBUTING.md

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ There are three main ways in which you contribute:
88

99
1. Open a [Bug Report](https://github.com/SomeRandomiOSDev/KeyValueObservation/issues/new?assignees=SomeRandomiOSDev&labels=bug&template=BUG_REPORT.yml&title=%5BBUG%5D%3A+).
1010
2. Open a [Feature Request](https://github.com/SomeRandomiOSDev/KeyValueObservation/issues/new?assignees=SomeRandomiOSDev&labels=enhancement&template=FEATURE_REQUEST.yml&title=%5BFEATURE%5D%3A+).
11-
3. Create a [Pull Request](https://github.com/SomeRandomiOSDev/KeyValueObservation/compare/main...main?expand=1&template=PULL_REQUEST_TEMPLATE.md).
11+
3. Create a [Pull Request](https://github.com/SomeRandomiOSDev/KeyValueObservation/compare).
1212

1313
> If none of these really suit your needs, you could also open a [blank issue](https://github.com/SomeRandomiOSDev/KeyValueObservation/issues/new).
1414
1515
If you need further guidance or have additional questions, you can always reach out at
1616

17-
17+
1818

1919
Please also note we have a [code of conduct](#code-of-conduct), please follow it in all your interactions with the project.
2020

@@ -26,15 +26,16 @@ For contributing via *Bug Reports* or *Feature Requests* contribuing is as simpl
2626
2727
For contributing via *Pull Requests*, we ask the following of you prior to opening a `pull request` to help maintain code standards and quality (many of these are enforced with workflows, but who wants to push subsequent commits for a single PR?):
2828

29-
- Please try and follow the implicit code conventions and naming schemes present within the project.
30-
- The builds for all platforms should succeed, along with all of the unit tests for each platform.
31-
- Any new code added should be accompanied by appropriate unit test code to cover (virtually) all cases and paths through that code. The code coverage for this project shouldn't decrease by a significant amount, but increases in code coverage are always welcome and appreciated.
32-
- Any new public APIs added should be accompanied by documentation in code, and as appropriate, in the [README](../README.md) file and in the Documentation Catalog.
33-
- Since this project is available via [CocoaPods](https://cocoapods.org), it should lint successfully for both `pod lib lint` and `pod lib lint --use-libraries` using the latest version of the `pod` utility.
29+
* Please try and follow the implicit code conventions and naming schemes present within the project.
30+
* All Swift files for this project lint successfully. The latest version of SwiftLint should be used for linting.
31+
* The builds for all platforms should succeed, along with all of the unit tests for each platform.
32+
* Any new code added should be accompanied by appropriate unit test code to cover (virtually) all cases and paths through that code. The code coverage for this project shouldn't decrease by a significant amount, but increases in code coverage are always welcome and appreciated.
33+
* Any new public APIs added should be accompanied by documentation in code, and as appropriate, in the [README](../README.md) file and in the Documentation Catalog.
34+
* Since this project is available via [CocoaPods](https://cocoapods.org), it should lint successfully for both `pod lib lint` and `pod lib lint --use-libraries` using the latest version of the `pod` utility.
3435

3536
> Tip: It's strongly recommended to use the [workflowtests.sh](../scripts/workflowtests.sh) script for testing all of the various builds & linting as this script is a mirror of the workflows that are ran for `pull requests`.
3637
37-
For further guidance about requirements for `pull requests`, please see the [Pull Request Guidelines](PULL_REQUEST_TEMPLATE/PULL_REQUEST_TEMPLATE.md) document.
38+
For further guidance about requirements for `pull requests`, please see the [Pull Request Guidelines](PULL_REQUEST_TEMPLATE.md) document.
3839

3940
## Code of Conduct
4041

.github/CONTRIBUTORS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Contributors
22

3-
## Special thanks for all the people who have contributed this project so far:
3+
## Special thanks for all the people who have contributed this project so far
44

55
I would like to give a special thanks to all of the people below who have contributed to this project and to all of those who will contribute to it moving forward.
66

.github/PULL_REQUEST_TEMPLATE/PULL_REQUEST_TEMPLATE.md renamed to .github/PULL_REQUEST_TEMPLATE.md

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,14 @@ A brief description of your `pull request`.
1212

1313
Ensure that your `pull request` has followed all the steps below:
1414

15-
- [ ] Code compilation.
16-
- [ ] All tests passing.
17-
- [ ] Added new unit tests, if applicable.
18-
- [ ] Extended the documentation (including README), if applicable.
19-
- [ ] Updated version in KeyValueObservation.podspec following [semver](https://semver.org) guidelines.
20-
- [ ] Ran [workflowtests.sh](../../scripts/workflowtests.sh) and passed.
21-
- [ ] Added myself to the [CONTRIBUTORS](../CONTRIBUTORS.md) file.
15+
* [ ] Code compilation.
16+
* [ ] All tests passing.
17+
* [ ] No new SwiftLint issues.
18+
* [ ] Added new unit tests, if applicable.
19+
* [ ] Extended the documentation (including README), if applicable.
20+
* [ ] Updated version in KeyValueObservation.podspec following [semver](https://semver.org) guidelines.
21+
* [ ] Ran [workflowtests.sh](../../scripts/workflowtests.sh) and passed.
22+
* [ ] Added myself to the [CONTRIBUTORS](../CONTRIBUTORS.md) file.
2223

2324
## Proposed changes
2425

.github/workflows/carthage.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ on:
1010
- '.github/**' # Ignore all files under '.github'
1111
- '!.github/workflows/carthage.yml' # Except for this workflow
1212
- '.gitignore'
13+
- '.remarkrc'
1314
- 'codecov.yml'
1415
- 'KeyValueObservation.podspec'
1516
- 'LICENSE'

.github/workflows/cocoapods.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ on:
1010
- '.github/**' # Ignore all files under '.github'
1111
- '!.github/workflows/cocoapods.yml' # Except for this workflow
1212
- '.gitignore'
13+
- '.remarkrc'
1314
- 'codecov.yml'
1415
- 'LICENSE'
1516
- 'README.md'

.github/workflows/xcframework.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ on:
1010
- '.github/**' # Ignore all files under '.github'
1111
- '!.github/workflows/xcframework.yml' # Except for this workflow
1212
- '.gitignore'
13+
- '.remarkrc'
1314
- 'codecov.yml'
1415
- 'KeyValueObservation.podspec'
1516
- 'LICENSE'

.github/workflows/xcodebuild.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ on:
1010
- '.github/**' # Ignore all files under '.github'
1111
- '!.github/workflows/xcodebuild.yml' # Except for this workflow
1212
- '.gitignore'
13+
- '.remarkrc'
1314
- 'KeyValueObservation.podspec'
1415
- 'LICENSE'
1516
- 'README.md'

.remarkrc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"plugins": [
3+
"remark-preset-lint-recommended",
4+
["remark-lint-list-item-indent", "space"],
5+
["remark-lint-no-undefined-references", {"allow": [" ", "x", "X"]}],
6+
["remark-lint-no-file-name-irregular-characters", "\\.a-zA-Z0-9-_"],
7+
["remark-lint-no-heading-punctuation", ".,;:"]
8+
]
9+
}

0 commit comments

Comments
 (0)