From 32151d053b7afa656feac0c37391dd6737b33050 Mon Sep 17 00:00:00 2001
From: Jared Burrows <jaredsburrows@gmail.com>
Date: Fri, 3 Jun 2016 13:59:45 -0700
Subject: [PATCH 1/3] Move versions to root build.gradle

---
 build.gradle                                          | 5 +++++
 squidb-addons/squidb-jackson-annotations/build.gradle | 4 ----
 squidb-addons/squidb-jackson-compiler/build.gradle    | 4 ----
 squidb-addons/squidb-jackson-plugin/build.gradle      | 4 ----
 squidb-addons/squidb-reactive/build.gradle            | 4 ----
 squidb-addons/squidb-recyclerview/build.gradle        | 4 ----
 squidb-addons/squidb-sqlite-bindings/build.gradle     | 4 ----
 squidb-addons/squidb-support-loader/build.gradle      | 4 ----
 squidb-annotations/build.gradle                       | 4 ----
 squidb-processor/build.gradle                         | 4 ----
 squidb-sample/build.gradle                            | 1 -
 squidb/build.gradle                                   | 4 ----
 12 files changed, 5 insertions(+), 41 deletions(-)

diff --git a/build.gradle b/build.gradle
index f8ae3650..fe15a8b5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,6 +21,11 @@ allprojects {
     }
 }
 
+subprojects {
+    group = 'com.yahoo.squidb'
+    version = '2.0.3'
+}
+
 if (JavaVersion.current().isJava8Compatible()) {
     allprojects {
         tasks.withType(Javadoc) {
diff --git a/squidb-addons/squidb-jackson-annotations/build.gradle b/squidb-addons/squidb-jackson-annotations/build.gradle
index 2c2459cf..6f259b06 100644
--- a/squidb-addons/squidb-jackson-annotations/build.gradle
+++ b/squidb-addons/squidb-jackson-annotations/build.gradle
@@ -3,10 +3,6 @@
  * Copyrights licensed under the Apache 2.0 License.
  * See the accompanying LICENSE file for terms.
  */
-project.ext.artifactId = 'squidb-jackson-annotations'
-group = 'com.yahoo.squidb'
-version = '2.0.3'
-
 apply plugin: 'java'
 apply plugin: 'maven'
 
diff --git a/squidb-addons/squidb-jackson-compiler/build.gradle b/squidb-addons/squidb-jackson-compiler/build.gradle
index 5bf34a97..6af96bdf 100644
--- a/squidb-addons/squidb-jackson-compiler/build.gradle
+++ b/squidb-addons/squidb-jackson-compiler/build.gradle
@@ -3,10 +3,6 @@
  * Copyrights licensed under the Apache 2.0 License.
  * See the accompanying LICENSE file for terms.
  */
-project.ext.artifactId = 'squidb-jackson-compiler'
-group = 'com.yahoo.squidb'
-version = '2.0.3'
-
 apply plugin: 'java'
 apply plugin: 'maven'
 
diff --git a/squidb-addons/squidb-jackson-plugin/build.gradle b/squidb-addons/squidb-jackson-plugin/build.gradle
index ea7c9e7b..34766ad3 100644
--- a/squidb-addons/squidb-jackson-plugin/build.gradle
+++ b/squidb-addons/squidb-jackson-plugin/build.gradle
@@ -3,10 +3,6 @@
  * Copyrights licensed under the Apache 2.0 License.
  * See the accompanying LICENSE file for terms.
  */
-project.ext.artifactId = 'squidb-jackson-plugin'
-group = 'com.yahoo.squidb'
-version = '2.0.3'
-
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 
diff --git a/squidb-addons/squidb-reactive/build.gradle b/squidb-addons/squidb-reactive/build.gradle
index 37c5e2b4..719622f9 100644
--- a/squidb-addons/squidb-reactive/build.gradle
+++ b/squidb-addons/squidb-reactive/build.gradle
@@ -3,10 +3,6 @@
  * Copyrights licensed under the Apache 2.0 License.
  * See the accompanying LICENSE file for terms.
  */
-project.ext.artifactId = 'squidb-reactive'
-group = 'com.yahoo.squidb'
-version = '2.0.3'
-
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 
diff --git a/squidb-addons/squidb-recyclerview/build.gradle b/squidb-addons/squidb-recyclerview/build.gradle
index 9e06cbcb..c3e85ebf 100644
--- a/squidb-addons/squidb-recyclerview/build.gradle
+++ b/squidb-addons/squidb-recyclerview/build.gradle
@@ -3,10 +3,6 @@
  * Copyrights licensed under the Apache 2.0 License.
  * See the accompanying LICENSE file for terms.
  */
-project.ext.artifactId = 'squidb-recyclerview'
-group = 'com.yahoo.squidb'
-version = '2.0.3'
-
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 
diff --git a/squidb-addons/squidb-sqlite-bindings/build.gradle b/squidb-addons/squidb-sqlite-bindings/build.gradle
index 0e34063a..27b29a5e 100644
--- a/squidb-addons/squidb-sqlite-bindings/build.gradle
+++ b/squidb-addons/squidb-sqlite-bindings/build.gradle
@@ -3,10 +3,6 @@
  * Copyrights licensed under the Apache 2.0 License.
  * See the accompanying LICENSE file for terms.
  */
-project.ext.artifactId = 'squidb-sqlite-bindings'
-group = 'com.yahoo.squidb'
-version = '2.0.3'
-
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 
diff --git a/squidb-addons/squidb-support-loader/build.gradle b/squidb-addons/squidb-support-loader/build.gradle
index 2fdfbcf7..57291b59 100644
--- a/squidb-addons/squidb-support-loader/build.gradle
+++ b/squidb-addons/squidb-support-loader/build.gradle
@@ -3,10 +3,6 @@
  * Copyrights licensed under the Apache 2.0 License.
  * See the accompanying LICENSE file for terms.
  */
-project.ext.artifactId = 'squidb-support-loader'
-group = 'com.yahoo.squidb'
-version = '2.0.3'
-
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 
diff --git a/squidb-annotations/build.gradle b/squidb-annotations/build.gradle
index 6a07c7c3..883b0859 100644
--- a/squidb-annotations/build.gradle
+++ b/squidb-annotations/build.gradle
@@ -3,10 +3,6 @@
  * Copyrights licensed under the Apache 2.0 License.
  * See the accompanying LICENSE file for terms.
  */
-project.ext.artifactId = 'squidb-annotations'
-group = 'com.yahoo.squidb'
-version = '2.0.3'
-
 apply plugin: 'java'
 apply plugin: 'maven'
 
diff --git a/squidb-processor/build.gradle b/squidb-processor/build.gradle
index 0f085b38..2f149411 100644
--- a/squidb-processor/build.gradle
+++ b/squidb-processor/build.gradle
@@ -3,10 +3,6 @@
  * Copyrights licensed under the Apache 2.0 License.
  * See the accompanying LICENSE file for terms.
  */
-project.ext.artifactId = 'squidb-processor'
-group = 'com.yahoo.squidb'
-version = '2.0.3'
-
 apply plugin: 'java'
 apply plugin: 'maven'
 
diff --git a/squidb-sample/build.gradle b/squidb-sample/build.gradle
index cd0b3d44..c1537bd2 100644
--- a/squidb-sample/build.gradle
+++ b/squidb-sample/build.gradle
@@ -26,7 +26,6 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
     compile project(':squidb')
     compile project(':squidb-annotations')
     apt project(':squidb-processor')
diff --git a/squidb/build.gradle b/squidb/build.gradle
index 20a6f7aa..5e1a9c4d 100644
--- a/squidb/build.gradle
+++ b/squidb/build.gradle
@@ -3,10 +3,6 @@
  * Copyrights licensed under the Apache 2.0 License.
  * See the accompanying LICENSE file for terms.
  */
-project.ext.artifactId = 'squidb'
-group = 'com.yahoo.squidb'
-version = '2.0.3'
-
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 

From ce99c14a2685f6f6f3d688e36da6f3a2b0c84682 Mon Sep 17 00:00:00 2001
From: Jared Burrows <jaredsburrows@gmail.com>
Date: Fri, 3 Jun 2016 14:05:15 -0700
Subject: [PATCH 2/3] Remove extra gitignores

---
 squidb-addons/squidb-reactive/.gitignore        |  1 -
 squidb-addons/squidb-recyclerview/.gitignore    |  1 -
 squidb-addons/squidb-sqlite-bindings/.gitignore |  2 --
 squidb-addons/squidb-support-loader/.gitignore  |  1 -
 squidb-processor/.gitignore                     |  1 -
 squidb-sample/.gitignore                        |  1 -
 squidb-tests/.gitignore                         |  1 -
 squidb/.gitignore                               | 10 ----------
 8 files changed, 18 deletions(-)
 delete mode 100644 squidb-addons/squidb-reactive/.gitignore
 delete mode 100644 squidb-addons/squidb-recyclerview/.gitignore
 delete mode 100644 squidb-addons/squidb-sqlite-bindings/.gitignore
 delete mode 100644 squidb-addons/squidb-support-loader/.gitignore
 delete mode 100644 squidb-processor/.gitignore
 delete mode 100644 squidb-sample/.gitignore
 delete mode 100644 squidb-tests/.gitignore
 delete mode 100644 squidb/.gitignore

diff --git a/squidb-addons/squidb-reactive/.gitignore b/squidb-addons/squidb-reactive/.gitignore
deleted file mode 100644
index 796b96d1..00000000
--- a/squidb-addons/squidb-reactive/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/squidb-addons/squidb-recyclerview/.gitignore b/squidb-addons/squidb-recyclerview/.gitignore
deleted file mode 100644
index 796b96d1..00000000
--- a/squidb-addons/squidb-recyclerview/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/squidb-addons/squidb-sqlite-bindings/.gitignore b/squidb-addons/squidb-sqlite-bindings/.gitignore
deleted file mode 100644
index d1ee0fb8..00000000
--- a/squidb-addons/squidb-sqlite-bindings/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/build
-obj/**
diff --git a/squidb-addons/squidb-support-loader/.gitignore b/squidb-addons/squidb-support-loader/.gitignore
deleted file mode 100644
index 796b96d1..00000000
--- a/squidb-addons/squidb-support-loader/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/squidb-processor/.gitignore b/squidb-processor/.gitignore
deleted file mode 100644
index 5e56e040..00000000
--- a/squidb-processor/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/bin
diff --git a/squidb-sample/.gitignore b/squidb-sample/.gitignore
deleted file mode 100644
index 796b96d1..00000000
--- a/squidb-sample/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/squidb-tests/.gitignore b/squidb-tests/.gitignore
deleted file mode 100644
index 2b539c3d..00000000
--- a/squidb-tests/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/gen_sources
diff --git a/squidb/.gitignore b/squidb/.gitignore
deleted file mode 100644
index 1975f37e..00000000
--- a/squidb/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-*~
-.metadata
-*.class
-org.eclipse.ltk.core.refactoring.prefs
-gen
-local.properties
-ecbuild
-cur_version
-yala.xml
-.settings/*

From 00beba9b9c58d0764bc7ad2faffe92b146a3a72e Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Fri, 3 Jun 2016 14:26:18 -0700
Subject: [PATCH 3/3] Ignore obj files for native builds

---
 .gitignore | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitignore b/.gitignore
index 6bd22612..a3a99b1f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,7 +12,11 @@
 bin/
 gen/
 out/
+obj/**
 .apt_generated/
+*.so
+*.o
+*.o.d
 
 # lint
 lint.xml