Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve build performance #298

Merged
merged 16 commits into from
Feb 10, 2017
+59 −57
Merged

Improve build performance #298

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
8237f09
Test debug build only and reduce output
ecgreb Feb 7, 2017
a53aaad
Gradle 3.3 and android-maven plugin 1.5
ecgreb Feb 7, 2017
95cf8ae
Adds --configure-on-demand option to circle.yml
ecgreb Feb 8, 2017
ffb2ca4
Adds -PdisablePreDex option to circle.yml
ecgreb Feb 8, 2017
230b0da
Build and test modules in parallel
ecgreb Feb 8, 2017
521ecac
Deploy sample apps to AWS on release build only
ecgreb Feb 8, 2017
7e6a2a5
Publish docs on release build only
ecgreb Feb 8, 2017
a7401d9
Install core lib to local .m2 repo before resolving dependencies
ecgreb Feb 8, 2017
0a0a125
Copy test results into archive folder
ecgreb Feb 8, 2017
3ca4ec4
Disable Javadoc tasks
ecgreb Feb 8, 2017
7bc8690
Build sample app but do not deploy to s3. Archive APKs on Circle CI.
ecgreb Feb 8, 2017
c652e24
Update gradle options to limit memory use and dump heap on OOM error
ecgreb Feb 8, 2017
fc11f1a
Relative path for artifacts folder
ecgreb Feb 8, 2017
6e4c8bf
Circle CI syntax for "artifacts"
ecgreb Feb 8, 2017
3ede105
Test deployment on non-master branch
ecgreb Feb 8, 2017
a0f95ad
Revert full build including sample apps to master only
ecgreb Feb 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,21 @@ allprojects {
}
}

subprojects {
task verify(dependsOn: ['compileDebugSources',
'testDebugUnitTest',
'checkstyle',
'lint'])

tasks.withType(Test) {
testLogging {
exceptionFormat "full"
events "skipped", "passed", "failed"
showStandardStreams true
}
}
}

task clean(type: Delete) {
delete rootProject.buildDir
}
Expand Down
2 changes: 1 addition & 1 deletion circle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ dependencies:

test:
override:
- ./gradlew clean :core:install :core:verify :mapzen-android-sdk:verify :mapzen-places-api:verify
- ./gradlew clean :core:install :core:verify :mapzen-android-sdk:verify :mapzen-places-api:verify --configure-on-demand
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 Nicely documented in gradle docs (which sometimes are very convoluted, at least for me): https://docs.gradle.org/current/userguide/multi_project_builds.html#sec:configuration_on_demand


deployment:
master:
Expand Down
15 changes: 1 addition & 14 deletions core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
}
}
dependencies {
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
classpath 'net.researchgate:gradle-release:2.4.0'
}
}
Expand Down Expand Up @@ -60,14 +60,6 @@ android {
}
}

tasks.withType(Test) {
testLogging {
exceptionFormat "full"
events "started", "skipped", "passed", "failed"
showStandardStreams true
}
}

task checkstyle(type: Checkstyle) {
configFile file("${project.rootDir}/config/checkstyle/checkstyle.xml")
source 'src'
Expand All @@ -77,11 +69,6 @@ task checkstyle(type: Checkstyle) {
classpath = files()
}

task verify(dependsOn: ['compileDebugSources',
'test',
'checkstyle',
'lint'])

apply from: rootProject.file('gradle/gradle-mvn-push.gradle')

task submodules {
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
15 changes: 1 addition & 14 deletions mapzen-android-sdk/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
}
}
dependencies {
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
classpath 'net.researchgate:gradle-release:2.4.0'
classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.6.1'
}
Expand Down Expand Up @@ -58,14 +58,6 @@ android {
}
}

tasks.withType(Test) {
testLogging {
exceptionFormat "full"
events "started", "skipped", "passed", "failed"
showStandardStreams true
}
}

task checkstyle(type: Checkstyle) {
configFile file("${project.rootDir}/config/checkstyle/checkstyle.xml")
source 'src'
Expand All @@ -75,11 +67,6 @@ task checkstyle(type: Checkstyle) {
classpath = files()
}

task verify(dependsOn: ['compileDebugSources',
'test',
'checkstyle',
'lint'])

dependencies {
compile 'com.mapzen:mapzen-core:1.3.0-SNAPSHOT'
compile ('com.mapzen:on-the-road:1.2.0-SNAPSHOT') {
Expand Down
15 changes: 1 addition & 14 deletions mapzen-places-api/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
}
}
dependencies {
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
classpath 'net.researchgate:gradle-release:2.4.0'
classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.6.1'
}
Expand Down Expand Up @@ -55,14 +55,6 @@ android {
}
}

tasks.withType(Test) {
testLogging {
exceptionFormat "full"
events "started", "skipped", "passed", "failed"
showStandardStreams true
}
}

task checkstyle(type: Checkstyle) {
configFile file("${project.rootDir}/config/checkstyle/checkstyle.xml")
source 'src'
Expand All @@ -72,11 +64,6 @@ task checkstyle(type: Checkstyle) {
classpath = files()
}

task verify(dependsOn: ['compileDebugSources',
'test',
'checkstyle',
'lint'])

dependencies {
compile 'com.android.support:appcompat-v7:25.1.0'
compile 'com.mapzen:mapzen-core:1.3.0-SNAPSHOT'
Expand Down
5 changes: 0 additions & 5 deletions samples/mapzen-android-sdk-sample/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,6 @@ task checkstyle(type: Checkstyle) {
classpath = files()
}

task verify(dependsOn: ['compileDebugSources',
'test',
'checkstyle',
'lint'])

dependencies {
compile(project(':mapzen-android-sdk')) {
transitive = true;
Expand Down