Skip to content

Commit

Permalink
Merge branch 'release/1.2.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
G00fY2 committed Jul 25, 2021
2 parents 2d2537a + cd443ce commit 07300d9
Show file tree
Hide file tree
Showing 85 changed files with 474 additions and 685 deletions.
15 changes: 15 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
root=true

[*.{kt,kts}]
charset=utf-8
end_of_line=lf
insert_final_newline=false

max_line_length=120

indent_size=2
indent_style=space

ij_kotlin_name_count_to_use_star_import=2147483647
ij_kotlin_name_count_to_use_star_import_for_members=2147483647
ij_kotlin_imports_layout=*,java.**,javax.**,kotlin.**,^
38 changes: 2 additions & 36 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

# Built application files
*.apk
*.aar
*.ap_
*.aab

Expand Down Expand Up @@ -58,42 +59,7 @@ captures/
# IntelliJ
*.iml
*.iws
.idea/artifacts
.idea/modules
.idea/modules.xml
.idea/workspace.xml
.idea/navEditor.xml
.idea/tasks.xml
.idea/gradle.xml
.idea/assetWizardSettings.xml
.idea/libraries
.idea/caches
.idea/shelf
.idea/.name
.idea/compiler.xml
.idea/copyright/profiles_settings.xml
.idea/encodings.xml
.idea/misc.xml
.idea/scopes/scope_settings.xml
.idea/vcs.xml
.idea/jsLibraryMappings.xml
.idea/dataSources
.idea/datasources.xml
.idea/dataSources.local.xml
.idea/dataSources.ids
.idea/sqlDataSources.xml
.idea/dbnavigator.xml
.idea/dynamic.xml
.idea/uiDesigner.xml
.idea/usage.statistics.xml
.idea/contentModel.xml
.idea/kotlinc.xml
.idea/jarRepositories.xml
# optional
.idea/dictionaries
.idea/inspectionProfiles
.idea/runConfigurations
.idea/runConfigurations.xml
.idea/*

# Keystore files
*.jks
Expand Down
Loading

0 comments on commit 07300d9

Please sign in to comment.