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.

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

Prepare the repository as Maps SDK vendor #324

Merged
merged 1 commit into from
Jan 15, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
build:
working_directory: ~/code
docker:
- image: mbgl/61abee1674:android-ndk-r18
- image: mbgl/android-ndk-r17c:dd161efed6
environment:
JVM_OPTS: -Xmx3200m
BUILDTYPE: Debug
Expand Down Expand Up @@ -78,7 +78,7 @@ jobs:
only:
- master
docker:
- image: mbgl/61abee1674:android-ndk-r18
- image: mbgl/android-ndk-r17c:dd161efed6
working_directory: ~/code
environment:
BUILDTYPE: Release
Expand Down
22 changes: 22 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,28 @@ subprojects {
}
}

def TESTABLE_MODULES = ["libcore", "libtelemetry", "liblocation"]
def RELEASE_MODULES = ["libcore", "libtelemetry"]

subprojects { subproject ->

if (TESTABLE_MODULES.contains(subproject.name)) {
apply from: "${rootDir}/gradle/checkstyle.gradle"
apply from: "${rootDir}/gradle/jacoco.gradle"
}

if (RELEASE_MODULES.contains(subproject.name)) {
subproject.afterEvaluate {
subproject.apply from: "javadoc.gradle"
}
subproject.apply from: "${rootDir}/gradle/mvn-push-android.gradle"
}

if (subproject.name == "libtelemetry") {
subproject.apply from: "${rootDir}/gradle/download-schema.gradle"
}
}

task clean(type: Delete) {
delete rootProject.buildDir
}
Expand Down
2 changes: 1 addition & 1 deletion gradle/dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ext {
minSdkVersion : 14,
targetSdkVersion : 28,
compileSdkVersion: 28,
buildToolsVersion: '28.0.3'
buildToolsVersion: '28.0.2'
]

version = [
Expand Down
11 changes: 5 additions & 6 deletions libcore/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
apply plugin: 'com.android.library'

// Re-apply runtime required subproject gradle scripts and classpaths,
// so that Maps SDK doesn't rely on them being served from the top level build.gradle
apply from: "../gradle/dependencies.gradle"

version = VERSION_NAME

android {
Expand Down Expand Up @@ -35,9 +39,4 @@ dependencies {
androidTestImplementation(dependenciesList.testEspressoCore, {
exclude group: 'com.android.support', module: 'support-annotations'
})
}

apply from: 'javadoc.gradle'
apply from: "${rootDir}/gradle/mvn-push-android.gradle"
apply from: "${rootDir}/gradle/checkstyle.gradle"
apply from: "${rootDir}/gradle/jacoco.gradle"
}
5 changes: 1 addition & 4 deletions liblocation/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,4 @@ dependencies {
exclude group: 'com.android.support', module: 'support-annotations'
})
androidTestImplementation dependenciesList.gmsLocation
}

apply from: "${rootDir}/gradle/checkstyle.gradle"
apply from: "${rootDir}/gradle/jacoco.gradle"
}
12 changes: 5 additions & 7 deletions libtelemetry/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
apply plugin: 'com.android.library'

// Re-apply runtime required subproject gradle scripts and classpaths,
// so that Maps SDK doesn't rely on them being served from the top level build.gradle
apply from: "../gradle/dependencies.gradle"

version = VERSION_NAME

android {
Expand Down Expand Up @@ -49,10 +53,4 @@ dependencies {
androidTestImplementation dependenciesList.testRunner
androidTestImplementation dependenciesList.testRules
androidTestImplementation dependenciesList.gmsLocation
}

apply from: 'javadoc.gradle'
apply from: "${rootDir}/gradle/mvn-push-android.gradle"
apply from: "${rootDir}/gradle/checkstyle.gradle"
apply from: "${rootDir}/gradle/download-schema.gradle"
apply from: "${rootDir}/gradle/jacoco.gradle"
}