diff options
Diffstat (limited to 'platform')
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/gradle-publish.gradle | 74 | ||||
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/Compare.java | 2 |
2 files changed, 30 insertions, 46 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/gradle-publish.gradle b/platform/android/MapboxGLAndroidSDK/gradle-publish.gradle index c5037974c0..9805763a99 100644 --- a/platform/android/MapboxGLAndroidSDK/gradle-publish.gradle +++ b/platform/android/MapboxGLAndroidSDK/gradle-publish.gradle @@ -14,22 +14,17 @@ repositories { mavenCentral() } -// From https://raw.github.com/mcxiaoke/gradle-mvn-push/master/jar.gradle -android.libraryVariants.all { variant -> - def jarTask = project.tasks.create(name: "jar${variant.name.capitalize()}", type: Jar) { - from variant.javaCompile.destinationDir - exclude "**/R.class" - exclude "**/BuildConfig.class" - } - jarTask.dependsOn variant.javaCompile - artifacts.add('archives', jarTask); -} - -// From https://raw.github.com/mcxiaoke/gradle-mvn-push/master/gradle-mvn-push.gradle def isReleaseBuild() { return VERSION_NAME.contains("SNAPSHOT") == false } +def isLocalBuild() { + if (System.getenv('IS_LOCAL_DEVELOPMENT') != null) { + return System.getenv('IS_LOCAL_DEVELOPMENT').toBoolean() + } + return true +} + def getReleaseRepositoryUrl() { return hasProperty('RELEASE_REPOSITORY_URL') ? RELEASE_REPOSITORY_URL : "https://oss.sonatype.org/service/local/staging/deploy/maven2/" @@ -40,6 +35,10 @@ def getSnapshotRepositoryUrl() { "https://oss.sonatype.org/content/repositories/snapshots/" } +def obtainMavenLocalUrl() { + return getRepositories().mavenLocal().getUrl() +} + def getRepositoryUsername() { return hasProperty('USERNAME') ? USERNAME : (hasProperty('NEXUS_USERNAME') ? NEXUS_USERNAME : "") @@ -50,22 +49,6 @@ def getRepositoryPassword() { (hasProperty('NEXUS_PASSWORD') ? NEXUS_PASSWORD : "") } -task apklib(type: Zip) { - appendix = extension = 'apklib' - - from 'AndroidManifest.xml' - into('res') { - from 'res' - } - into('src') { - from 'src' - } -} - -artifacts { - archives apklib -} - afterEvaluate { project -> uploadArchives { repositories { @@ -76,24 +59,16 @@ afterEvaluate { project -> pom.artifactId = POM_ARTIFACT_ID pom.version = VERSION_NAME - repository(url: getReleaseRepositoryUrl()) { - authentication(userName: getRepositoryUsername(), - password: getRepositoryPassword()) - } - snapshotRepository(url: getSnapshotRepositoryUrl()) { - authentication(userName: getRepositoryUsername(), - password: getRepositoryPassword()) - } - -/* - // Leaving out as artifact was incorrectly named when found - addFilter('aar') { artifact, file -> - artifact.name == archivesBaseName - } - addFilter('apklib') { artifact, file -> - artifact.name == archivesBaseName + '-apklib' + if (isLocalBuild()) { + repository(url: obtainMavenLocalUrl()) + } else { + repository(url: getReleaseRepositoryUrl()) { + authentication(userName: getRepositoryUsername(), password: getRepositoryPassword()) + } + snapshotRepository(url: getSnapshotRepositoryUrl()) { + authentication(userName: getRepositoryUsername(), password: getRepositoryPassword()) + } } -*/ pom.project { name POM_NAME @@ -151,3 +126,12 @@ afterEvaluate { project -> archives androidJavadocsJar } } + +// See: https://github.com/chrisbanes/gradle-mvn-push/issues/43#issuecomment-84140513 +afterEvaluate { project -> + android.libraryVariants.all { variant -> + tasks.androidJavadocs.doFirst { + classpath += files(variant.javaCompile.classpath.files) + } + } +} diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/Compare.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/Compare.java index c7d7a13a3d..f17d4574d5 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/Compare.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/Compare.java @@ -1,7 +1,7 @@ package com.mapbox.mapboxsdk.utils; /** - * Comparisons from std sdk, which aren't available in API level <= 15 + * Comparisons from std sdk, which aren't available in API level 15 and below */ public class Compare { |