Merge pull request #455 from nurolopher/master

Fixed travis build
chennaione · Dec 3, 2015 · 0b138f6 · 0b138f6
2 parents cf5f265 + b087e0c
commit 0b138f6
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,12 +1,28 @@
 language: android
+jdk: oraclejdk7
 
+env:
+  global:
+    - TERM=dumb
 android:
   components:
     - sys-img-armeabi-v7a-android-23
     - tools
     - build-tools-23.0.2
     - 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
 

diff --git a/build.gradle b/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:1.5.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 {
@@ -92,3 +97,4 @@ tasks.coveralls {
     dependsOn jacocoRootReport
     onlyIf { System.env.'CI' }
 }
+apply plugin: 'java'
diff --git a/example/build.gradle b/example/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: 'com.android.application'
-
 android {
     compileSdkVersion 23
     buildToolsVersion "23.0.2"
@@ -15,6 +14,13 @@ android {
             minifyEnabled false
         }
     }
+
+    testOptions{
+        unitTests.returnDefaultValues = true
+    }
+    lintOptions{
+        abortOnError false
+    }
 }
 
 dependencies {

diff --git a/library/build.gradle b/library/build.gradle
@@ -15,6 +15,14 @@ android {
             minifyEnabled false
         }
     }
+
+    testOptions{
+        unitTests.returnDefaultValues = true
+    }
+
+    lintOptions{
+        abortOnError false
+    }
 }
 
 dependencies {