diff options
| author | Tobrun <tobrun.van.nuland@gmail.com> | 2017-02-15 19:56:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-15 19:56:31 +0100 |
| commit | 0c0d7ceaebf822ababc7147c494e88f4c16e18e3 (patch) | |
| tree | 024437c194098cd9c8049cb0573c026df50e4328 /platform/android/MapboxGLAndroidSDK/build.gradle | |
| parent | 8f1c580ea164b47644e4dd935e7d30afe5872a96 (diff) | |
| download | qtlocation-mapboxgl-0c0d7ceaebf822ababc7147c494e88f4c16e18e3.tar.gz | |
[android] - use project wide configurations for all modules + fixup wear compile error (#8066)
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/build.gradle')
| -rw-r--r-- | platform/android/MapboxGLAndroidSDK/build.gradle | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/build.gradle b/platform/android/MapboxGLAndroidSDK/build.gradle index 112350aaf2..6dc7df7281 100644 --- a/platform/android/MapboxGLAndroidSDK/build.gradle +++ b/platform/android/MapboxGLAndroidSDK/build.gradle @@ -1,9 +1,5 @@ apply plugin: 'com.android.library' -ext { - supportLibVersion = '25.1.0' -} - dependencies { compile "com.android.support:support-annotations:${supportLibVersion}" compile "com.android.support:support-v4:${supportLibVersion}" @@ -24,29 +20,23 @@ dependencies { } android { - compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION) - buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION + compileSdkVersion rootProject.ext.compileSdkVersion + buildToolsVersion rootProject.ext.buildToolsVersion defaultConfig { - minSdkVersion Integer.parseInt(project.ANDROID_MIN_SDK) - targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION) + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion buildConfigField "String", "GIT_REVISION_SHORT", String.format("\"%s\"", getGitRevision()) } - android { - // avoid naming conflicts, force usage of prefix - resourcePrefix 'mapbox_' - } + // avoid naming conflicts, force usage of prefix + resourcePrefix 'mapbox_' sourceSets { // limit amount of exposed library resources main.res.srcDirs += 'src/main/res-public' } - repositories { - mavenCentral() - } - compileOptions { sourceCompatibility JavaVersion.VERSION_1_7 targetCompatibility JavaVersion.VERSION_1_7 |