Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update .gitignore and IntelliJ settings #19

Merged
merged 1 commit into from
Sep 18, 2024
Merged

chore: update .gitignore and IntelliJ settings #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 4 additions & 18 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,19 +41,10 @@ captures/

# IntelliJ
*.iml
.idea/workspace.xml
.idea/tasks.xml
.idea/gradle.xml
.idea/assetWizardSettings.xml
.idea/dictionaries
.idea/libraries
# Android Studio 3 in .gitignore file.
.idea/caches
.idea/modules.xml
# Comment next line if keeping position of elements in Navigation Editor is relevant for you
.idea/navEditor.xml
# Local deployment targets
.idea/deploymentTargetSelector.xml
/.idea/*
!/.idea/codeStyleSettings.xml
!/.idea/codeStyles
!/.idea/dictionaries
Comment on lines +44 to +47
Copy link

Choose a reason for hiding this comment

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

Adjust patterns to correctly include directories in .gitignore

The current exception patterns for directories (!/.idea/codeStyles and !/.idea/dictionaries) may not work as intended because Git requires a trailing slash to track directories correctly. Without the trailing slash, Git treats them as files rather than directories.

Apply the following diff to fix the patterns:

/.idea/*
!/.idea/codeStyleSettings.xml
-!/.idea/codeStyles
-!/.idea/dictionaries
+!/.idea/codeStyles/
+!/.idea/dictionaries/
Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
/.idea/*
!/.idea/codeStyleSettings.xml
!/.idea/codeStyles
!/.idea/dictionaries
/.idea/*
!/.idea/codeStyleSettings.xml
!/.idea/codeStyles/
!/.idea/dictionaries/


# Keystore files
# Uncomment the following lines if you do not want to check your keystore files in.
Expand Down Expand Up @@ -91,11 +82,6 @@ lint/tmp/

publish.properties
*.gpg
/.idea/.gitignore
/.idea/compiler.xml
/.idea/jarRepositories.xml
/.idea/misc.xml
/.idea/shelf

# general
**/.DS_Store
1 change: 0 additions & 1 deletion .idea/.name
View file
Open in desktop

This file was deleted.

27 changes: 3 additions & 24 deletions .idea/codeStyles/Project.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .idea/dictionaries/shared.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 0 additions & 6 deletions .idea/kotlinc.xml
View file
Open in desktop

This file was deleted.