diff options
| author | Łukasz Paczos <lukasz.paczos@mapbox.com> | 2019-11-14 19:00:08 +0100 |
|---|---|---|
| committer | Łukasz Paczos <lukasz.paczos@mapbox.com> | 2019-11-14 19:13:37 +0100 |
| commit | 8f1212e1a2b352b8244421e4d763c46ad94415c0 (patch) | |
| tree | 95c533b5945c4bb80f0efa30c55b4e0d24de7f29 | |
| parent | 4c1d03c257754ecc1555f3e31b3c6ccf45c4bf7b (diff) | |
| download | qtlocation-mapboxgl-8f1212e1a2b352b8244421e4d763c46ad94415c0.tar.gz | |
temp
| -rw-r--r-- | platform/android/MapboxGLAndroidSDK/build.gradle | 21 | ||||
| -rw-r--r-- | platform/android/gradle/native-build.gradle | 1 |
2 files changed, 4 insertions, 18 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/build.gradle b/platform/android/MapboxGLAndroidSDK/build.gradle index 5ee3af61e2..8409eec3f1 100644 --- a/platform/android/MapboxGLAndroidSDK/build.gradle +++ b/platform/android/MapboxGLAndroidSDK/build.gradle @@ -1,10 +1,9 @@ apply plugin: 'com.android.library' -apply plugin: "com.jaredsburrows.license" apply plugin: 'kotlin-android' -apply from: "${rootDir}/gradle/native-build.gradle" +apply from: "../gradle/native-build.gradle" +apply from: "../gradle/dependencies.gradle" dependencies { - lintChecks project(":MapboxGLAndroidSDKLint") api dependenciesList.mapboxAndroidTelemetry api dependenciesList.mapboxJavaGeoJSON api dependenciesList.mapboxAndroidGestures @@ -78,13 +77,6 @@ android { } } -licenseReport { - generateHtmlReport = false - generateJsonReport = true - copyHtmlReportToAssets = false - copyJsonReportToAssets = false -} - def static getGitRevision() { def cmd = "git rev-parse --short HEAD" def proc = cmd.execute() @@ -95,11 +87,4 @@ def static getGitRevision() { configurations { all*.exclude group: 'commons-logging', module: 'commons-logging' all*.exclude group: 'commons-collections', module: 'commons-collections' -} -apply from: "${rootDir}/gradle/gradle-javadoc.gradle" -apply from: "${rootDir}/gradle/gradle-checkstyle.gradle" -apply from: "${rootDir}/gradle/gradle-dependencies-graph.gradle" -apply from: "${rootDir}/gradle/gradle-update-vendor-modules.gradle" -apply from: "${rootDir}/gradle/android-nitpick.gradle" -apply from: "${rootDir}/gradle/gradle-bintray.gradle" -apply from: "${rootDir}/gradle/jacoco-report.gradle"
\ No newline at end of file +}
\ No newline at end of file diff --git a/platform/android/gradle/native-build.gradle b/platform/android/gradle/native-build.gradle index 0c16c379dd..af7b409158 100644 --- a/platform/android/gradle/native-build.gradle +++ b/platform/android/gradle/native-build.gradle @@ -1,3 +1,4 @@ +apply from: "../gradle/configuration.gradle" ext.nativeBuild = { nativeTargets -> android { defaultPublishConfig project.hasProperty("mapbox.buildtype") ? project.getProperty("mapbox.buildtype") : "debug" |