diff options
Diffstat (limited to 'platform/android/gradle')
| -rw-r--r-- | platform/android/gradle/dependencies.gradle | 29 | ||||
| -rw-r--r-- | platform/android/gradle/gradle-javadoc.gradle | 1 | ||||
| -rw-r--r-- | platform/android/gradle/jacoco-report.gradle | 6 | ||||
| -rw-r--r-- | platform/android/gradle/wrapper/gradle-wrapper.properties | 2 |
4 files changed, 19 insertions, 19 deletions
diff --git a/platform/android/gradle/dependencies.gradle b/platform/android/gradle/dependencies.gradle index d0036ebc8b..0bd5a67c9c 100644 --- a/platform/android/gradle/dependencies.gradle +++ b/platform/android/gradle/dependencies.gradle @@ -2,8 +2,8 @@ ext { androidVersions = [ minSdkVersion : 14, - targetSdkVersion : 27, - compileSdkVersion: 27, + targetSdkVersion : 28, + compileSdkVersion: 28, ] versions = [ @@ -12,29 +12,30 @@ ext { mapboxCore : '1.3.0', mapboxGestures : '0.4.2', mapboxAccounts : '0.2.0', - supportLib : '27.1.1', + supportLib : '28.0.0', constraintLayout: '1.1.2', uiAutomator : '2.1.3', espresso : '3.0.2', testRunner : '1.0.2', - leakCanary : '1.6.2', + leakCanary : '1.6.3', junit : '4.12', - mockito : '2.23.4', - mockk : '1.9', - robolectric : '4.1', + mockito : '3.0.0', + mockk : '1.9.3', + robolectric : '4.3', timber : '4.7.1', okhttp : '3.12.3', - kotlin : '1.3.11', - licenses : '0.8.42', + kotlin : '1.3.41', + licenses : '0.8.5', bintray : '1.8.4', artifactory : '4.9.3', androidPublish : '3.6.2', - lint : '26.1.4', + lint : '26.4.2', gms : '16.0.0', - soLoader : '0.6.0', - jacoco : '0.8.3', + soLoader : '0.6.1', + jacoco : '0.8.4', appcenter : '1.4', - ktlint : '0.33.0' + ktlint : '0.34.0', + commonsIO : '2.6' ] dependenciesList = [ @@ -56,7 +57,7 @@ ext { testEspressoContrib : "com.android.support.test.espresso:espresso-contrib:${versions.espresso}", testUiAutomator : "com.android.support.test.uiautomator:uiautomator-v18:${versions.uiAutomator}", appCenter : "com.microsoft.appcenter:espresso-test-extension:${versions.appcenter}", - commonsIO : 'commons-io:commons-io:2.5', + commonsIO : "commons-io:commons-io:${versions.commonsIO}", supportAnnotations : "com.android.support:support-annotations:${versions.supportLib}", supportAppcompatV7 : "com.android.support:appcompat-v7:${versions.supportLib}", supportFragmentV4 : "com.android.support:support-fragment:${versions.supportLib}", diff --git a/platform/android/gradle/gradle-javadoc.gradle b/platform/android/gradle/gradle-javadoc.gradle index 3a634433b5..ba530a9b62 100644 --- a/platform/android/gradle/gradle-javadoc.gradle +++ b/platform/android/gradle/gradle-javadoc.gradle @@ -4,7 +4,6 @@ android.libraryVariants.all { variant -> description = "Generates javadoc for build $name" destinationDir = new File(destinationDir, variant.baseName) source = variant.sourceSets.collect { it.java.sourceFiles }.inject { m, i -> m + i } - classpath += variant.javaCompile.classpath classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) options.windowTitle("Mapbox Maps SDK for Android $VERSION_NAME Reference") options.docTitle("Mapbox Maps SDK for Android $VERSION_NAME") diff --git a/platform/android/gradle/jacoco-report.gradle b/platform/android/gradle/jacoco-report.gradle index e50facb683..c4e0bb9131 100644 --- a/platform/android/gradle/jacoco-report.gradle +++ b/platform/android/gradle/jacoco-report.gradle @@ -27,7 +27,7 @@ task jacocoTestReport(type: JacocoReport, dependsOn: ['testDebugUnitTest']) { files.each { file -> println file } } - sourceDirectories = files([mainSrc]) - classDirectories = files([debugTree]) - executionData = files([ecSrc, execSrc]) + sourceDirectories.from = files([mainSrc]) + classDirectories.from = files([debugTree]) + executionData.from = files([ecSrc, execSrc]) }
\ No newline at end of file diff --git a/platform/android/gradle/wrapper/gradle-wrapper.properties b/platform/android/gradle/wrapper/gradle-wrapper.properties index 588169cdf4..a60d82ac08 100644 --- a/platform/android/gradle/wrapper/gradle-wrapper.properties +++ b/platform/android/gradle/wrapper/gradle-wrapper.properties @@ -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-5.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-all.zip |