Merge pull request #401 from hannesa2/CleanupFromPointlessGitignore

remove pointless .gitignore files [master]
eclipse-paho · Jun 4, 2020 · 3cb8af7 · 3cb8af7
2 parents b5d5e5e + 00718c9
commit 3cb8af7
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 126 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,8 +15,7 @@ gen/
 
 # Gradle files
 .gradle/
-build/
-/*/build/
+build
 
 # Cache of project
 .gradletasknamecache
@@ -37,6 +36,7 @@ proguard/
 
 ## Directory-based project format:
 .idea/
+*.iml
 
 ## File-based project format:
 *.ipr

diff --git a/org.eclipse.paho.android.sample/.gitignore b/org.eclipse.paho.android.sample/.gitignore
diff --git a/org.eclipse.paho.android.sample/org.eclipse.paho.android.sample.iml b/org.eclipse.paho.android.sample/org.eclipse.paho.android.sample.iml
diff --git a/org.eclipse.paho.android.service/.gitignore b/org.eclipse.paho.android.service/.gitignore
diff --git a/paho.mqtt.android.example/.gitignore b/paho.mqtt.android.example/.gitignore
diff --git a/settings.gradle b/settings.gradle
@@ -1,4 +1,7 @@
-include ':org.eclipse.paho.android.service',':org.eclipse.paho.android.sample',':paho.mqtt.android.example'
+include ':org.eclipse.paho.android.service'
+include ':org.eclipse.paho.android.sample'
+include ':paho.mqtt.android.example'
+
 project(':org.eclipse.paho.android.service').projectDir = new File('org.eclipse.paho.android.service')
 project(':paho.mqtt.android.example').projectDir = new File('paho.mqtt.android.example')
 project(':org.eclipse.paho.android.sample').projectDir = new File('org.eclipse.paho.android.sample')