Merge remote-tracking branch 'origin/master' into dev_3.0

yahoo · Jun 3, 2016 · 5992606 · 5992606
2 parents 76030ff + 00beba9
commit 5992606
Show file tree

Hide file tree

Showing 26 changed files with 8 additions and 58 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,6 +14,9 @@ gen/
 out/
 intermediate/
 .apt_generated/
+*.so
+*.o
+*.o.d
 
 # lint
 lint.xml

diff --git a/build.gradle b/build.gradle
@@ -21,6 +21,11 @@ allprojects {
     }
 }
 
+subprojects {
+    group = 'com.yahoo.squidb'
+    version = '3.0.0-beta.1'
+}
+
 if (JavaVersion.current().isJava8Compatible()) {
     allprojects {
         tasks.withType(Javadoc) {

diff --git a/samples/squidb-android-sample/.gitignore b/samples/squidb-android-sample/.gitignore
diff --git a/samples/squidb-android-sample/build.gradle b/samples/squidb-android-sample/build.gradle
@@ -26,7 +26,6 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
     compile project(':squidb')
     compile project(':squidb-android')
     compile project(':squidb-annotations')

diff --git a/samples/squidb-sample-core/.gitignore b/samples/squidb-sample-core/.gitignore
diff --git a/squidb-addons/squidb-json/squidb-json-annotations/build.gradle b/squidb-addons/squidb-json/squidb-json-annotations/build.gradle
@@ -3,9 +3,6 @@
  * Copyrights licensed under the Apache 2.0 License.
  * See the accompanying LICENSE file for terms.
  */
-project.ext.artifactId = 'squidb-json-annotations'
-group = 'com.yahoo.squidb'
-version = '3.0.0-beta.1'
 
 apply plugin: 'java'
 apply plugin: 'maven'

diff --git a/squidb-addons/squidb-json/squidb-json-compiler/build.gradle b/squidb-addons/squidb-json/squidb-json-compiler/build.gradle
@@ -3,9 +3,6 @@
  * Copyrights licensed under the Apache 2.0 License.
  * See the accompanying LICENSE file for terms.
  */
-project.ext.artifactId = 'squidb-json-compiler'
-group = 'com.yahoo.squidb'
-version = '3.0.0-beta.1'
 
 apply plugin: 'java'
 apply plugin: 'maven'

diff --git a/squidb-addons/squidb-json/squidb-json-plugin/build.gradle b/squidb-addons/squidb-json/squidb-json-plugin/build.gradle
@@ -3,9 +3,6 @@
  * Copyrights licensed under the Apache 2.0 License.
  * See the accompanying LICENSE file for terms.
  */
-project.ext.artifactId = 'squidb-json-plugin'
-group = 'com.yahoo.squidb'
-version = '3.0.0-beta.1'
 
 apply plugin: 'java'
 apply plugin: 'maven'

diff --git a/squidb-addons/squidb-reactive/.gitignore b/squidb-addons/squidb-reactive/.gitignore
diff --git a/squidb-addons/squidb-reactive/build.gradle b/squidb-addons/squidb-reactive/build.gradle
@@ -3,9 +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 = '3.0.0-beta.1'
 
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'

diff --git a/squidb-addons/squidb-recyclerview/.gitignore b/squidb-addons/squidb-recyclerview/.gitignore
diff --git a/squidb-addons/squidb-recyclerview/build.gradle b/squidb-addons/squidb-recyclerview/build.gradle
@@ -3,9 +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 = '3.0.0-beta.1'
 
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'

diff --git a/squidb-addons/squidb-sqlite-bindings/.gitignore b/squidb-addons/squidb-sqlite-bindings/.gitignore
diff --git a/squidb-addons/squidb-sqlite-bindings/build.gradle b/squidb-addons/squidb-sqlite-bindings/build.gradle
@@ -3,9 +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 = '3.0.0-beta.1'
 
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'

diff --git a/squidb-addons/squidb-support-loader/.gitignore b/squidb-addons/squidb-support-loader/.gitignore
diff --git a/squidb-addons/squidb-support-loader/build.gradle b/squidb-addons/squidb-support-loader/build.gradle
@@ -3,9 +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 = '3.0.0-beta.1'
 
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'

diff --git a/squidb-android/.gitignore b/squidb-android/.gitignore
diff --git a/squidb-android/build.gradle b/squidb-android/build.gradle
@@ -3,9 +3,6 @@
  * Copyrights licensed under the Apache 2.0 License.
  * See the accompanying LICENSE file for terms.
  */
-project.ext.artifactId = 'squidb-android'
-group = 'com.yahoo.squidb'
-version = '3.0.0-beta.1'
 
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'

diff --git a/squidb-annotations/build.gradle b/squidb-annotations/build.gradle
@@ -3,9 +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 = '3.0.0-beta.1'
 
 apply plugin: 'java'
 apply plugin: 'maven'

diff --git a/squidb-ios/.gitignore b/squidb-ios/.gitignore
diff --git a/squidb-ios/build.gradle b/squidb-ios/build.gradle
@@ -3,9 +3,6 @@
  * Copyrights licensed under the Apache 2.0 License.
  * See the accompanying LICENSE file for terms.
  */
-project.ext.artifactId = 'squidb-ios'
-group = 'com.yahoo.squidb'
-version = '3.0.0-beta.1'
 
 apply plugin: 'java'
 apply plugin: 'maven'

diff --git a/squidb-processor/.gitignore b/squidb-processor/.gitignore
diff --git a/squidb-processor/build.gradle b/squidb-processor/build.gradle
@@ -3,9 +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 = '3.0.0-beta.1'
 
 apply plugin: 'java'
 apply plugin: 'maven'

diff --git a/squidb-tests/.gitignore b/squidb-tests/.gitignore
diff --git a/squidb/.gitignore b/squidb/.gitignore
diff --git a/squidb/build.gradle b/squidb/build.gradle
@@ -3,9 +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 = '3.0.0-beta.1'
 
 apply plugin: 'java'
 apply plugin: 'maven'