Skip to content

lint autocorrect and changes from main#206

Merged
kevinlind merged 7 commits intoadobe:devfrom
emdobrin:swiftlint
Jul 30, 2021
Merged

lint autocorrect and changes from main#206
kevinlind merged 7 commits intoadobe:devfrom
emdobrin:swiftlint

Conversation

@emdobrin
Copy link
Copy Markdown
Contributor

@emdobrin emdobrin commented Jul 29, 2021

Description

  • Updated deprecated swiftlint autocorrect to --fix and moved hooks under .githooks
  • Ran autocorrect on project files
  • Brought some changes from main -> dev

Related Issue

Motivation and Context

How Has This Been Tested?

Screenshots (if appropriate):

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • I have signed the Adobe Open Source CLA.
  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • All new and existing tests passed.

@emdobrin emdobrin requested a review from kevinlind July 29, 2021 19:34
@codecov
Copy link
Copy Markdown

codecov bot commented Jul 29, 2021

Codecov Report

Merging #206 (9fb27c5) into dev (69bdd94) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##              dev     #206   +/-   ##
=======================================
  Coverage   94.30%   94.30%           
=======================================
  Files          26       26           
  Lines         913      913           
=======================================
  Hits          861      861           
  Misses         52       52           


lint-autocorrect:
(swiftlint autocorrect --format)
(swiftlint --fix --format)
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will need to fix the git hook script as well as it uses autocorrect.
In addition, I think it would good to apply git hook scripts by changing the local git config to point to a .githooks folder we have in source control. It's something we did for the Edge Identity and Edge Consent projects.
https://github.com/adobe/aepsdk-edgeidentity-android/blob/dev/Makefile#L15
This allows updates to the git hook scripts without developers needing to recopy the pre-commit script to their local .git/hooks directory.

@kevinlind kevinlind merged commit ab5699f into adobe:dev Jul 30, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants