Skip to content

Commit ffa147c

Browse files
authored
Merge pull request #25 from UMC-Hackathon/feature/websocket
setting: ignore파일 수정
2 parents c671368 + c4e62b2 commit ffa147c

File tree

12 files changed

+134
-170
lines changed

12 files changed

+134
-170
lines changed

.gitignore

Lines changed: 134 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,138 @@
1-
*.iml
2-
.gradle
3-
/local.properties
4-
/.idea/caches
5-
/.idea/libraries
6-
/.idea/modules.xml
7-
/.idea/workspace.xml
8-
/.idea/navEditor.xml
9-
/.idea/assetWizardSettings.xml
1+
# Created by https://www.toptal.com/developers/gitignore/api/kotlin,androidstudio
2+
# Edit at https://www.toptal.com/developers/gitignore?templates=kotlin,androidstudio
3+
104
.DS_Store
11-
/build
125
/captures
13-
.externalNativeBuild
146
.cxx
7+
8+
### Kotlin ###
9+
# Compiled class file
10+
*.class
11+
12+
# Log file
13+
*.log
14+
15+
# BlueJ files
16+
*.ctxt
17+
18+
# Mobile Tools for Java (J2ME)
19+
.mtj.tmp/
20+
21+
# Package Files #
22+
*.jar
23+
*.war
24+
*.nar
25+
*.ear
26+
*.zip
27+
*.tar.gz
28+
*.rar
29+
30+
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
31+
hs_err_pid*
32+
replay_pid*
33+
34+
### AndroidStudio ###
35+
# Covers files to be ignored for android development using Android Studio.
36+
37+
# Built application files
38+
*.apk
39+
*.ap_
40+
*.aab
41+
42+
# Files for the ART/Dalvik VM
43+
*.dex
44+
45+
# Java class files
46+
47+
# Generated files
48+
bin/
49+
gen/
50+
out/
51+
52+
# Gradle files
53+
.gradle
54+
.gradle/
55+
build/
56+
57+
# Signing files
58+
.signing/
59+
60+
# Local configuration file (sdk path, etc)
1561
local.properties
62+
63+
# Proguard folder generated by Eclipse
64+
proguard/
65+
66+
# Log Files
67+
68+
# Android Studio
69+
/build
70+
/*/build/
71+
/*/local.properties
72+
/*/out
73+
/*/*/build
74+
/*/*/production
75+
captures/
76+
.navigation/
77+
*.ipr
78+
*~
79+
*.swp
80+
81+
# Keystore files
82+
*.jks
83+
*.keystore
84+
85+
# Google Services (e.g. APIs or Firebase)
86+
# google-services.json
87+
88+
# Android Patch
89+
gen-external-apklibs
90+
91+
# External native build folder generated in Android Studio 2.2 and later
92+
.externalNativeBuild
93+
94+
# NDK
95+
obj/
96+
97+
# IntelliJ IDEA
98+
*.iml
99+
*.iws
100+
/out/
101+
102+
# User-specific configurations
103+
.idea/
104+
105+
# Legacy Eclipse project files
106+
.classpath
107+
.project
108+
.cproject
109+
.settings/
110+
111+
# Mobile Tools for Java (J2ME)
112+
113+
# Package Files #
114+
115+
# virtual machine crash logs (Reference: http://www.java.com/en/download/help/error_hotspot.xml)
116+
117+
## Plugin-specific files:
118+
119+
# mpeltonen/sbt-idea plugin
120+
.idea_modules/
121+
122+
# JIRA plugin
123+
atlassian-ide-plugin.xml
124+
125+
# Mongo Explorer plugin
126+
.idea/mongoSettings.xml
127+
128+
# Crashlytics plugin (for Android Studio and IntelliJ)
129+
com_crashlytics_export_strings.xml
130+
crashlytics.properties
131+
crashlytics-build.properties
132+
fabric.properties
133+
134+
### AndroidStudio Patch ###
135+
136+
!/gradle/wrapper/gradle-wrapper.jar
137+
138+
# End of https://www.toptal.com/developers/gitignore/api/kotlin,androidstudio

.idea/.gitignore

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

.idea/.name

Lines changed: 0 additions & 1 deletion
This file was deleted.

.idea/codeStyles/Project.xml

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

.idea/codeStyles/codeStyleConfig.xml

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

.idea/compiler.xml

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

.idea/deploymentTargetDropDown.xml

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

.idea/gradle.xml

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

.idea/inspectionProfiles/Project_Default.xml

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

.idea/kotlinc.xml

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

0 commit comments

Comments
 (0)