Merge pull request #33 from sdsmdg/gitignore-fixes

Fixes #32 : gitignore fixes
harjot-oberai · Jan 22, 2017 · 0a78201 · 0a78201
2 parents b8bb98d + 5296e25
commit 0a78201
Show file tree

Hide file tree

Showing 10 changed files with 53 additions and 133 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,10 +1,54 @@
-*.iml
-.gradle
-/local.properties
-/.idea/workspace.xml
-/.idea/libraries
-.DS_Store
-/build
-/captures
+
+### Android ###
+# Built application files
 *.apk
-app/src/main/java/com/sdsmdg/harjot/MusicDNA/Config.java
+*.ap_
+
+# Files for the ART/Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+out/
+
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+
+# Android Studio Navigation editor temp files
+.navigation/
+
+# Android Studio captures folder
+captures/
+
+# Intellij
+*.iml
+.idea/
+
+# Keystore files
+*.jks
+
+# External native build folder generated in Android Studio 2.2 and later
+.externalNativeBuild
+
+# Google Services (e.g. APIs or Firebase)
+google-services.json
+
+### Android Patch ###
+gen-external-apklibs
+
+# Configuration file containing API Key
+app/src/main/java/com/sdsmdg/harjot/MusicDNA/Config.java
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml