Merge pull request #69 from HunkD/hunkd-upgrade-gradle

HunkD · HunkD · commit 9670517c1dbc · 2016-04-23T22:22:46.000+08:00
Upgrade gradle
diff --git a/.travis.yml b/.travis.yml
@@ -1,3 +1,10 @@
+before_install:
+# Gradle
+- wget http://services.gradle.org/distributions/gradle-2.10-bin.zip
+- unzip gradle-2.10-bin.zip
+- export GRADLE_HOME=$PWD/gradle-2.10
+- export PATH=$GRADLE_HOME/bin:$PATH
+
 language: android
 jdk: oraclejdk7
 
@@ -10,4 +17,17 @@ android:
   - extra-google-m2repository
   - extra-android-m2repository
   
-script: gradle -b "NobankCore/build.gradle" -q clean :noBank:testDebugUnitTest assembleDebug -Pproguard
+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 -b "NobankCore/build.gradle" -q clean :noBank:testDebugUnitTest jacocoTestReport assembleDebug -Pproguard -PtestCoverage
diff --git a/NobankCore/astub/build.gradle b/NobankCore/astub/build.gradle
@@ -25,6 +25,11 @@ android {
                     "astub-${project.branchName}-v${variant.versionName}-b${project.buildNumber}-${variant.buildType.name}.apk".replaceAll("/", "-"))
         }
     }
+
+    dexOptions {
+        maxProcessCount 4 // this is the default value
+        javaMaxHeapSize "2g"
+    }
 }
 
 dependencies {
diff --git a/NobankCore/build.gradle b/NobankCore/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:1.3.1"
+        classpath "com.android.tools.build:gradle:2.0.0"
     }
 }
 
diff --git a/NobankCore/gradle.properties b/NobankCore/gradle.properties
@@ -0,0 +1,26 @@
+#org.gradle.jvmargs=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5013
+
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+
+# The Gradle daemon aims to improve the startup and execution time of Gradle.
+# When set to true the Gradle daemon is to run the build.
+# TODO: disable daemon on CI, since builds should be clean and reliable on servers
+#org.gradle.daemon=true
+
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+# Default value: -Xmx10248m -XX:MaxPermSize=256m
+org.gradle.jvmargs=-Xms512m -Xmx1024m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+org.gradle.parallel=true
+
+# Enables new incubating mode that makes Gradle selective when configuring projects.
+# Only relevant projects are configured which results in faster builds for large multi-projects.
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:configuration_on_demand
+org.gradle.configureondemand=true
+
+org.gradle.workers.max=4
diff --git a/NobankCore/noBank/build-library.gradle b/NobankCore/noBank/build-library.gradle
@@ -15,6 +15,11 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
     }
+
+    dexOptions {
+        maxProcessCount 4 // this is the default value
+        javaMaxHeapSize "2g"
+    }
 }
 
 dependencies {
diff --git a/NobankCore/noBank/build.gradle b/NobankCore/noBank/build.gradle
@@ -31,7 +31,7 @@ android {
             debuggable true
             proguardFile getDefaultProguardFile('proguard-android-optimize.txt')
             proguardFile 'proguard.cfg'
-            testCoverageEnabled true
+            testCoverageEnabled project.hasProperty("testCoverage")? true : false
         }
     }
 
@@ -46,6 +46,11 @@ android {
     lintOptions {
         abortOnError false
     }
+
+    dexOptions {
+        maxProcessCount 4 // this is the default value
+        javaMaxHeapSize "2g"
+    }
 }
 
 def coverageSourceDirs = [

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,11 @@ android {`
`25`	`25`	`"astub-${project.branchName}-v${variant.versionName}-b${project.buildNumber}-${variant.buildType.name}.apk".replaceAll("/", "-"))`
`26`	`26`	`}`
`27`	`27`	`}`
	`28`	`+`
	`29`	`+ dexOptions {`
	`30`	`+ maxProcessCount 4 // this is the default value`
	`31`	`+ javaMaxHeapSize "2g"`
	`32`	`+ }`
`28`	`33`	`}`
`29`	`34`
`30`	`35`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ buildscript {`
`6`	`6`	`mavenCentral()`
`7`	`7`	`}`
`8`	`8`	`dependencies {`
`9`		`- classpath "com.android.tools.build:gradle:1.3.1"`
	`9`	`+ classpath "com.android.tools.build:gradle:2.0.0"`
`10`	`10`	`}`
`11`	`11`	`}`
`12`	`12`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,11 @@ android {`
`15`	`15`	`proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'`
`16`	`16`	`}`
`17`	`17`	`}`
	`18`	`+`
	`19`	`+ dexOptions {`
	`20`	`+ maxProcessCount 4 // this is the default value`
	`21`	`+ javaMaxHeapSize "2g"`
	`22`	`+ }`
`18`	`23`	`}`
`19`	`24`
`20`	`25`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ android {`
`31`	`31`	`debuggable true`
`32`	`32`	`proguardFile getDefaultProguardFile('proguard-android-optimize.txt')`
`33`	`33`	`proguardFile 'proguard.cfg'`
`34`		`- testCoverageEnabled true`
	`34`	`+ testCoverageEnabled project.hasProperty("testCoverage")? true : false`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`
`@@ -46,6 +46,11 @@ android {`
`46`	`46`	`lintOptions {`
`47`	`47`	`abortOnError false`
`48`	`48`	`}`
	`49`	`+`
	`50`	`+ dexOptions {`
	`51`	`+ maxProcessCount 4 // this is the default value`
	`52`	`+ javaMaxHeapSize "2g"`
	`53`	`+ }`
`49`	`54`	`}`
`50`	`55`
`51`	`56`	`def coverageSourceDirs = [`