diff options
Diffstat (limited to 'platform/android/gradle')
| -rw-r--r-- | platform/android/gradle/dependencies.gradle | 12 | ||||
| -rw-r--r-- | platform/android/gradle/gradle-javadoc.gradle | 13 |
2 files changed, 11 insertions, 14 deletions
diff --git a/platform/android/gradle/dependencies.gradle b/platform/android/gradle/dependencies.gradle index 695cca3a29..69b0c4b97f 100644 --- a/platform/android/gradle/dependencies.gradle +++ b/platform/android/gradle/dependencies.gradle @@ -8,9 +8,9 @@ ext { ] versions = [ - mapboxServices : '3.0.0-beta.2', - mapboxTelemetry: '3.0.0-beta.1', - mapboxGestures : '0.1.0-20180227.133736-12', + mapboxServices : '3.0.1', + mapboxTelemetry: '3.0.2', + mapboxGestures : '0.2.0', supportLib : '25.4.0', espresso : '3.0.1', testRunner : '1.0.1', @@ -20,14 +20,14 @@ ext { mockito : '2.10.0', robolectric : '3.5.1', timber : '4.5.1', - okhttp : '3.9.1' + okhttp : '3.10.0' ] dependenciesList = [ mapboxJavaServices : "com.mapbox.mapboxsdk:mapbox-sdk-services:${versions.mapboxServices}", mapboxJavaGeoJSON : "com.mapbox.mapboxsdk:mapbox-sdk-geojson:${versions.mapboxServices}", mapboxAndroidTelemetry: "com.mapbox.mapboxsdk:mapbox-android-telemetry:${versions.mapboxTelemetry}", - mapboxAndroidGestures : "com.mapbox.mapboxsdk:mapbox-android-gestures:${versions.mapboxGestures}@aar", + mapboxAndroidGestures : "com.mapbox.mapboxsdk:mapbox-android-gestures:${versions.mapboxGestures}", // for testApp mapboxJavaTurf : "com.mapbox.mapboxsdk:mapbox-sdk-turf:${versions.mapboxServices}", @@ -55,4 +55,4 @@ ext { leakCanaryDebug : "com.squareup.leakcanary:leakcanary-android:${versions.leakCanary}", leakCanaryRelease : "com.squareup.leakcanary:leakcanary-android-no-op:${versions.leakCanary}" ] -}
\ No newline at end of file +} diff --git a/platform/android/gradle/gradle-javadoc.gradle b/platform/android/gradle/gradle-javadoc.gradle index 39372b4378..cf7f8f743b 100644 --- a/platform/android/gradle/gradle-javadoc.gradle +++ b/platform/android/gradle/gradle-javadoc.gradle @@ -1,21 +1,18 @@ android.libraryVariants.all { variant -> def name = variant.name - // noinspection GroovyAssignabilityCheck task "javadoc$name"(type: Javadoc) { description = "Generates javadoc for build $name" failOnError = false destinationDir = new File(destinationDir, variant.baseName) - source = files(variant.javaCompile.source) - classpath = files(variant.javaCompile.classpath.files) + files(android.bootClasspath) - options.windowTitle("Mapbox Android SDK $VERSION_NAME Reference") - options.docTitle("Mapbox Android SDK $VERSION_NAME") - options.header("Mapbox Android SDK $VERSION_NAME Reference") + source = variant.javaCompile.source + options.windowTitle("Mapbox Maps SDK for Android $VERSION_NAME Reference") + options.docTitle("Mapbox Maps SDK for Android $VERSION_NAME") + options.header("Mapbox Maps SDK for Android $VERSION_NAME Reference") options.bottom("© 2015–2018 Mapbox. All rights reserved.") options.links("http://docs.oracle.com/javase/7/docs/api/") options.linksOffline("http://d.android.com/reference/", "$System.env.ANDROID_HOME/docs/reference") options.overview("src/main/java/overview.html") options.group("Mapbox Android SDK", "com.mapbox.*") - options.group("Third Party Libraries", "com.almeros.*") - exclude '**/R.java', '**/BuildConfig.java', 'com/almeros/**' + exclude '**/R.java', '**/BuildConfig.java' } } |