aggregate functions (average , min , max)

.travis.yml

@@ -1,14 +1,30 @@
 language: android
+jdk: oraclejdk7
 
+env:
+  global:
+    - TERM=dumb
 android:
   components:
     - sys-img-armeabi-v7a-android-23
     - tools
-    - build-tools-23.0.2
+    - build-tools-23.0.3
     - android-23
-
+    - extra-android-m2repository
+before_script:
+  - sudo service postgresql stop || true
+  - sudo service mysql stop || true
+  - sudo service memcached stop || true
+  - sudo service bootlogd stop || true
+  - sudo service elasticsearch stop || true
+  - sudo service mongodb stop || true
+  - sudo service neo4j stop || true
+  - sudo service cassandra stop || true
+  - sudo service riak stop || true
+  - sudo service rsync stop || true
+  - sudo service x11-common stop || true
 script:
-  - gradle clean build connectedCheck coveralls
+  - ./gradlew clean build connectedCheck coveralls
 
 cache:
   directories:

CHANGELOG.md

@@ -1,7 +1,12 @@
 # Sugar Releases
 
 ## [Unreleased]
+
+
+## v1.5
 ### Added
+* [#328](https://github.com/satyan/sugar/pull/328) @jedid auto add new columns during database upgrade, fix [#299](https://github.com/satyan/sugar/issues/299) and [#151](https://github.com/satyan/sugar/issues/151)
+* [#389](https://github.com/satyan/sugar/pull/389) @alfmatos MultiUnique DSL to handle MultiColumn Unique Table constraint
 * @sibeliusseraphini update, updateInTx methods based on Unique values of SugarRecord
 * [#155](https://github.com/satyan/sugar/issues/155) @benohalloran adding Cursors for Cursor Adapters [Pull 312](https://github.com/satyan/sugar/pull/312)
 * [#430](https://github.com/satyan/sugar/pull/430) @sibeliusseraphini update to roboelectric 3.0 and target android-32
@@ -11,6 +16,8 @@
 * [#423](https://github.com/satyan/sugar/pull/423) @sibeliusseraphini moving changelog of README.md to CHANGELOG.md
 
 ### Fixed
+* [#362](https://github.com/satyan/sugar/pull/362) @mitchyboy9 fixed NoClassDefFoundError
+* [#455](https://github.com/satyan/sugar/pull/455) @nurolopher fixed travis and coveralls config 
 * [#434](https://github.com/satyan/sugar/pull/434) @bendaniel10 fix multi-dex
 * [#410](https://github.com/satyan/sugar/pull/410) [#408](https://github.com/satyan/sugar/pull/408) @RoyMontoya simplify code
 * [#327](https://github.com/satyan/sugar/pull/327) @tracytheron support multi-dex

README.md

@@ -1,8 +1,15 @@
-# Sugar ORM [![Build Status](https://travis-ci.org/satyan/sugar.svg?branch=master)](https://travis-ci.org/satyan/sugar) [![Coverage Status](https://coveralls.io/repos/satyan/sugar/badge.svg?branch=master)](https://coveralls.io/r/satyan/sugar?branch=master)
+# Sugar ORM [![Build Status](https://travis-ci.org/satyan/sugar.svg?branch=master)](https://travis-ci.org/satyan/sugar) [![Coverage Status](https://coveralls.io/repos/satyan/sugar/badge.svg?branch=master)](https://coveralls.io/r/satyan/sugar?branch=master) [![Code Triagers Badge](http://www.codetriage.com/satyan/sugar/badges/users.svg)](http://www.codetriage.com/satyan/sugar)
+
+[![Join the chat at https://gitter.im/satyan/sugar](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/satyan/sugar?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 Insanely easy way to work with Android databases.
 
-Official documentation can be found [here](http://satyan.github.io/sugar). The example application is provided in the **example** folder in the source.
+Official documentation can be found [here](http://satyan.github.io/sugar) - Check some examples below. The example application is provided in the **example** folder in the source.
+
+## Looking for contributors
+We need contributors to help maintain this project, ask @satyan for repo permission
+
+Otherwise you can use another ORM, like https://github.com/requery/requery or https://realm.io/
 
 ## Features
 
@@ -21,7 +28,7 @@ There are four ways to install Sugar:
 This is the preferred way. Simply add:
 
 ```groovy
-compile 'com.github.satyan:sugar:1.4'
+compile 'com.github.satyan:sugar:1.5'
 ```
 
 to your project dependencies and run `gradle build` or `gradle assemble`.
@@ -34,7 +41,7 @@ Declare the dependency in Maven:
 <dependency>
     <groupId>com.github.satyan</groupId>
     <artifactId>sugar</artifactId>
-    <version>1.4</version>
+    <version>1.5</version>
 </dependency>
 ```
 
@@ -46,13 +53,52 @@ Download the source code and import it as a library project in Eclipse. The proj
 
 Visit the [releases](https://github.com/satyan/sugar/releases) page to download jars directly. You can drop them into your `libs` folder and configure the Java build path to include the library. See this [tutorial](http://www.vogella.com/tutorials/AndroidLibraryProjects/article.html) for an excellent guide on how to do this.
 
+
+### How to use master version
+First, download sugar repository
+```
+git clone [email protected]:satyan/sugar.git
+```
+
+include this in your **settings.gradle**
+```gradle
+include ':app' // your module app
+include ':sugar'
+
+def getLocalProperty(prop) {
+	Properties properties = new Properties()
+	properties.load(new File(rootDir.absolutePath + '/local.properties').newDataInputStream())
+	return properties.getProperty(prop, '')
+}
+
+project(':sugar').projectDir = new File(getLocalProperty('sugar.dir'))
+
+```
+
+include this in your **local.properties**
+```
+sugar.dir=/path/to/sugar/library
+```
+
+add sugar project to the dependencies of your main project (build.gradle)
+```gradle
+dependencies {
+    compile project(':sugar')
+}
+```
+
+You should also comment this line just comment this line (library/build.gradle): https://github.com/satyan/sugar/blob/master/library%2Fbuild.gradle#L2
+
+```gradle
+// apply from: '../maven_push.gradle'
+```
 ===================
 
-After installing, check out how to set up your first database and models [here](http://satyan.github.io/sugar/getting-started.html).
+After installing, check out how to set up your first database and models [here](http://satyan.github.io/sugar/getting-started.html) **Outdated**. Check examples of 1.4 and master below: 
 
 ## Examples
 ### SugarRecord
-```
+```java
 public class Book extends SugarRecord {
   @Unique
   String isbn;
@@ -72,38 +118,49 @@ public class Book extends SugarRecord {
 }
 ```
 or
-```
+```java
 @Table
 public class Book { ... }
 ```
 
 ### Save Entity
-```
+```java
 Book book = new Book("isbn123", "Title here", "2nd edition")
 book.save();
 ```
 
-### Load Entity
+or
+```java
+SugarRecord.save(book); // if using the @Table annotation 
 ```
+
+### Load Entity
+```java
 Book book = Book.findById(Book.class, 1);
 ```
 
 ### Update Entity
-```
+```java
 Book book = Book.findById(Book.class, 1);
 book.title = "updated title here"; // modify the values
 book.edition = "3rd edition";
 book.save(); // updates the previous entry with new values.
 ```
 
+
 ### Delete Entity
-```
+```java
 Book book = Book.findById(Book.class, 1);
 book.delete();
 ```
 
-### Update Entity based on Unique values
+or
+```java
+SugarRecord.delete(book); // if using the @Table annotation 
 ```
+
+### Update Entity based on Unique values
+```java
 Book book = new Book("isbn123", "Title here", "2nd edition")
 book.save();
 
@@ -114,15 +171,28 @@ sameBook.update();
 book.getId() == sameBook.getId(); // true
 ```
 
-### Bulk Insert
+or
+```java
+SugarRecord.update(sameBook); // if using the @Table annotation 
 ```
+
+### Bulk Insert
+```java
 List<Book> books = new ArrayList<>();
 books.add(new Book("isbn123", "Title here", "2nd edition"))
 books.add(new Book("isbn456", "Title here 2", "3nd edition"))
 books.add(new Book("isbn789", "Title here 3", "4nd edition"))
 SugarRecord.saveInTx(books);
 ```
 
+### When using ProGuard
+```java
+# Ensures entities remain un-obfuscated so table and columns are named correctly
+-keep class com.yourpackage.yourapp.domainclasspackage.** { *; }
+```
+
+## [CHANGELOG](https://github.com/satyan/sugar/blob/master/CHANGELOG.md)
+
 ## Contributing
 
 Please fork this repository and contribute back using [pull requests](https://github.com/satyan/sugar/pulls). Features can be requested using [issues](https://github.com/satyan/sugar/issues). All code, comments, and critiques are greatly appreciated.

build.gradle

@@ -1,20 +1,25 @@
 apply plugin: 'jacoco'
 apply plugin: 'com.github.kt3k.coveralls'
+apply plugin: 'java'
 
 buildscript {
     repositories {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.0'
+        classpath 'com.android.tools.build:gradle:2.0.0'
         classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.3.1'
     }
 }
 
 def isReleaseBuild() {
     return version.contains("SNAPSHOT") == false
 }
-
+test{
+    testLogging{
+        exceptionFormat = 'full'
+    }
+}
 allprojects {
     version = VERSION_NAME
     group = GROUP
@@ -33,7 +38,7 @@ subprojects { proj ->
         version "0.7.1.201405082137"
     }
 
-    task jacocoTestReport(type: JacocoReport, dependsOn: "testDebug") {
+    task jacocoTestReport(type: JacocoReport) {
         group = "Reporting"
         description = "Generate Jacoco coverage reports after running tests."
         reports {
@@ -45,7 +50,7 @@ subprojects { proj ->
             excludes: ['**/R*.class',
                        '**/BuildConfig*'])
         sourceDirectories = files('src/main/java')
-        executionData = files('build/jacoco/testDebug.exec')
+        executionData = files('build/jacoco/testDebugUnitTest.exec')
         doFirst {
             files('build/intermediates/classes/debug').getFiles().each { file ->
                 if (file.name.contains('$$')) {
@@ -65,23 +70,27 @@ task jacocoRootReport(type: JacocoReport, group: 'Coverage reports') {
     description = 'Generates an aggregate report from all subprojects'
     dependsOn(subprojects.jacocoTestReport)
 
-    additionalSourceDirs = files('example/src/main/java') + files('library/src/main/java')
-    sourceDirectories = files('example/src/main/java') + files('library/src/main/java')
-    classDirectories = files('example/build/intermediates/classes/debug') + files('library/build/intermediates/classes/debug')
+    additionalSourceDirs = files('library/src/main/java')
+    sourceDirectories = files('library/src/main/java')
+    classDirectories = files('library/build/intermediates/classes/debug')
     executionData = files(subprojects.jacocoTestReport.executionData)
 
     reports {
         html.enabled = true
         xml.enabled = true
     }
 
+    onlyIf = {
+        true
+    }
+
     doFirst {
         executionData = files(executionData.findAll { it.exists() })
     }
 }
 
 coveralls {
-    sourceDirs = files('example/src/main/java').flatten() + files('library/src/main/java').flatten()
+    sourceDirs = files('library/src/main/java').flatten()
     jacocoReportPath = "${buildDir}/reports/jacoco/jacocoRootReport/jacocoRootReport.xml"
 }
 
@@ -91,4 +100,4 @@ tasks.coveralls {
 
     dependsOn jacocoRootReport
     onlyIf { System.env.'CI' }
-}
+}

example/build.gradle

@@ -2,44 +2,24 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "23.0.2"
+    buildToolsVersion "23.0.3"
 
     defaultConfig {
         applicationId "com.example"
         minSdkVersion 9
         targetSdkVersion 23
     }
-
     buildTypes {
         release {
             minifyEnabled false
         }
     }
+    lintOptions {
+        abortOnError false
+    }
 }
 
 dependencies {
     compile project (':library')
-    compile 'com.android.support:appcompat-v7:23.1.1'
-    testCompile 'org.robolectric:robolectric:3.0'
-    testCompile 'junit:junit:4.12'
+    compile 'com.android.support:appcompat-v7:23.3.0'
 }
-
-//robolectric {
-//    // Configure includes / excludes
-//    include '**/*Tests.class'
-//    exclude '**/espresso/**/*.class'
-//
-//    // Configure max heap size of the test JVM
-//    maxHeapSize = '2048m'
-//
-//    // Configure the test JVM arguments - Does not apply to Java 8
-//    jvmArgs '-XX:MaxPermSize=512m', '-XX:-UseSplitVerifier'
-//
-//    // configure whether failing tests should fail the build
-//    ignoreFailures true
-//
-//    // use afterTest to listen to the test execution results
-//    afterTest { descriptor, result ->
-//        println "Executing test for ${descriptor.name} with result: ${result.resultType}"
-//    }
-//}

example/src/main/java/com/example/activities/SugarActivity.java

@@ -1,7 +1,6 @@
 package com.example.activities;
 
 import android.app.Activity;
-import android.content.Intent;
 import android.os.Bundle;
 
 import com.example.R;