diff options
| author | tobrun <tobrun.van.nuland@gmail.com> | 2019-05-28 09:40:40 +0200 |
|---|---|---|
| committer | Tobrun <tobrun.van.nuland@gmail.com> | 2019-05-28 10:12:36 +0200 |
| commit | ddb6f749ec8992c363c067b6ad5871b31ccb7b8a (patch) | |
| tree | 5349cf6dcfdf1b3d544abd00f31339c3401872eb /platform | |
| parent | 1e974804adf8cadcb3b90fb5658e054c080889e6 (diff) | |
| download | qtlocation-mapboxgl-ddb6f749ec8992c363c067b6ad5871b31ccb7b8a.tar.gz | |
[android] - update maven publishing script to enable aar packaging vs pom packaging, update gradle tools and wrapper
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/android/build.gradle | 4 | ||||
| -rw-r--r-- | platform/android/gradle/gradle-bintray.gradle | 1 | ||||
| -rw-r--r-- | platform/android/gradle/wrapper/gradle-wrapper.properties | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/platform/android/build.gradle b/platform/android/build.gradle index 0be1d73a5c..947e5adb1a 100644 --- a/platform/android/build.gradle +++ b/platform/android/build.gradle @@ -6,7 +6,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.0' + classpath 'com.android.tools.build:gradle:3.4.1' classpath dependenciesList.licensesPlugin classpath dependenciesList.kotlinPlugin classpath dependenciesList.bintrayPlugin @@ -24,7 +24,7 @@ allprojects { // For publishing Maps SDK files to Bintray maven { url 'https://mapbox.bintray.com/mapbox' } // Snapshot repository - // maven { url "http://oss.sonatype.org/content/repositories/snapshots/" } + // maven { url 'https://oss.jfrog.org/artifactory/oss-snapshot-local/' } } } diff --git a/platform/android/gradle/gradle-bintray.gradle b/platform/android/gradle/gradle-bintray.gradle index ac08866a63..538b924774 100644 --- a/platform/android/gradle/gradle-bintray.gradle +++ b/platform/android/gradle/gradle-bintray.gradle @@ -16,7 +16,6 @@ publishing { version this.version afterEvaluate { - artifact("$buildDir/outputs/aar/mapbox-android-sdk-release.aar") artifact(androidSourcesJar) artifact(androidJavadocsJar) } diff --git a/platform/android/gradle/wrapper/gradle-wrapper.properties b/platform/android/gradle/wrapper/gradle-wrapper.properties index ff890c2349..588169cdf4 100644 --- a/platform/android/gradle/wrapper/gradle-wrapper.properties +++ b/platform/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Jan 20 13:53:14 CET 2019 +#Tue May 28 09:39:37 CEST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip |