gradle fixes

eprst · Oct 31, 2018 · a346605 · a346605
1 parent 7125846
commit a346605
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,8 +4,9 @@ java.keystore
 gradle
 *.apk
 *.patch
-local.properties
-.idea
+/local.properties
+/.idea/workspace.xml
+/.idea/libraries
+/.idea/.name
 .DS_Store
-build
-*/*.iml
+/build
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,4 @@
+[submodule "app/libs/ColorPickerPreference"]
+	path = app/libs/ColorPickerPreference
+	url = https://github.com/attenzione/android-ColorPickerPreference.git
+	ignore = dirty
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/app/libs/ColorPickerPreference b/app/libs/ColorPickerPreference
diff --git a/settings.gradle b/settings.gradle
@@ -1 +1,2 @@
-include ':app'
+include ':app', ':ColorPickerPreference'
+project(':ColorPickerPreference').projectDir = new File('app/libs/ColorPickerPreference/ColorPickerPreference')