From 09d77311643e514284771b70b31a676eec232dd6 Mon Sep 17 00:00:00 2001 From: Cameron Mace Date: Thu, 31 May 2018 17:11:53 -0400 Subject: [PATCH 1/3] rename publish gradle script --- gradle/publish.gradle | 123 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 123 insertions(+) create mode 100644 gradle/publish.gradle diff --git a/gradle/publish.gradle b/gradle/publish.gradle new file mode 100644 index 000000000..9dd7e36f3 --- /dev/null +++ b/gradle/publish.gradle @@ -0,0 +1,123 @@ +apply plugin: 'maven' +apply plugin: 'signing' + +def isReleaseBuild() { + return VERSION_NAME.contains("SNAPSHOT") == false +} + +static 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/" +} + +def getSnapshotRepositoryUrl() { + return hasProperty('SNAPSHOT_REPOSITORY_URL') ? SNAPSHOT_REPOSITORY_URL + : "https://oss.sonatype.org/content/repositories/snapshots/" +} + +def obtainMavenLocalUrl() { + return getRepositories().mavenLocal().getUrl() +} + +def getRepositoryUsername() { + return hasProperty('NEXUS_USERNAME') ? NEXUS_USERNAME : "" +} + +def getRepositoryPassword() { + return hasProperty('NEXUS_PASSWORD') ? NEXUS_PASSWORD : "" +} + +afterEvaluate { project -> + uploadArchives { + repositories { + mavenDeployer { + beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) } + + pom.groupId = GROUP + pom.artifactId = POM_ARTIFACT_ID + pom.version = VERSION_NAME + + 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 + packaging POM_PACKAGING + description POM_DESCRIPTION + url POM_URL + + scm { + url POM_SCM_URL + connection POM_SCM_CONNECTION + developerConnection POM_SCM_DEV_CONNECTION + } + + licenses { + license { + name POM_LICENCE_NAME + url POM_LICENCE_URL + distribution POM_LICENCE_DIST + } + } + + developers { + developer { + id POM_DEVELOPER_ID + name POM_DEVELOPER_NAME + } + } + } + } + } + } + + signing { + required { isReleaseBuild() && gradle.taskGraph.hasTask("uploadArchives") } + sign configurations.archives + } + + task androidJavadocs(type: Javadoc) { + source = android.sourceSets.main.java.srcDirs + classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) + } + + task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) { + classifier = 'dokka' + from androidJavadocs.destinationDir + } + + task androidSourcesJar(type: Jar) { + classifier = 'sources' + from android.sourceSets.main.java.sourceFiles + } + + artifacts { + archives androidSourcesJar + 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) + classpath += configurations.javadocDeps + } + } +} \ No newline at end of file From cd4ce5e053c54f7258bca272d6916f66a26971c1 Mon Sep 17 00:00:00 2001 From: Cameron Mace Date: Thu, 31 May 2018 17:14:14 -0400 Subject: [PATCH 2/3] Cleaned up gradle things and bumped versions --- app/build.gradle | 2 - circle.yml | 2 +- gradle/dependencies.gradle | 101 +++++++--------- {plugin-traffic => gradle}/javadoc.gradle | 14 ++- gradle/mvn-push-android.gradle | 139 ---------------------- gradle/wrapper/gradle-wrapper.properties | 3 +- plugin-building/build.gradle | 4 +- plugin-building/javadoc.gradle | 17 --- plugin-localization/build.gradle | 4 +- plugin-localization/javadoc.gradle | 17 --- plugin-locationlayer/build.gradle | 4 +- plugin-locationlayer/gradle.properties | 6 +- plugin-locationlayer/javadoc.gradle | 18 --- plugin-offline/build.gradle | 4 +- plugin-offline/javadoc.gradle | 17 --- plugin-places/build.gradle | 4 +- plugin-places/javadoc.gradle | 17 --- plugin-traffic/build.gradle | 4 +- 18 files changed, 66 insertions(+), 311 deletions(-) rename {plugin-traffic => gradle}/javadoc.gradle (51%) delete mode 100644 gradle/mvn-push-android.gradle delete mode 100644 plugin-building/javadoc.gradle delete mode 100644 plugin-localization/javadoc.gradle delete mode 100644 plugin-locationlayer/javadoc.gradle delete mode 100644 plugin-offline/javadoc.gradle delete mode 100644 plugin-places/javadoc.gradle diff --git a/app/build.gradle b/app/build.gradle index 0433a925c..b4149f0e9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -99,8 +99,6 @@ dependencies { exclude group: 'net.bytebuddy' }) - implementation dependenciesList.materialDialogs - // Square crew implementation dependenciesList.timber implementation dependenciesList.butterKnife diff --git a/circle.yml b/circle.yml index 77b54ae04..1e403d92d 100644 --- a/circle.yml +++ b/circle.yml @@ -10,7 +10,7 @@ jobs: build: working_directory: ~/code docker: - - image: mbgl/7d2403f42e:android-ndk-r16b + - image: mbgl/feb0443038:android-ndk-r17 environment: JVM_OPTS: -Xmx3200m BUILDTYPE: Debug diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 5653d91b6..c6f4c6fed 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -4,44 +4,47 @@ ext { minSdkVersion : 14, targetSdkVersion : 27, compileSdkVersion: 27, - buildToolsVersion: '27.0.2' + buildToolsVersion: '27.0.3' ] version = [ mapboxMapSdk : '6.1.3', - mapboxGeocoding : '3.0.1', - mapboxGeoJson : '3.0.1', - playLocation : '11.8.0', - autoValue : '1.5.3', + mapboxJava : '3.2.0', + playLocation : '15.0.1', + autoValue : '1.5.4', autoValueParcel : '0.2.6', junit : '4.12', - supportLibVersion : '27.0.2', - constraintLayout : '1.0.2', - mockito : '2.13.0', - hamcrest : '2.0.0.0', - errorprone : '2.1.3', + supportLib : '27.1.1', + constraintLayout : '1.1.0', + mockito : '2.18.3', + errorprone : '2.3.1', butterknife : '8.8.1', - leakCanaryVersion : '1.5.4', - timber : '4.6.0', - testRunnerVersion : '1.0.1', - espressoVersion : '3.0.1', - spoonRunner : '1.6.2', - commonsIO : '2.5', - robolectric : '3.6.1', + leakCanary : '1.5.4', + timber : '4.7.0', + testRunner : '1.0.2', + espresso : '3.0.2', lifecycleCompiler : '1.1.1', lifecycleExtensions: '1.1.1', lifecycleLiveData : '1.1.1', - room : '1.0.0', - androidArchCore : '1.0.0', - okhttp : '3.9.1', - materialDialogs : '0.9.6.0' + room : '1.1.0', + androidArchCore : '1.1.0' + ] + + pluginVersion = [ + checkstyle: '8.10.1', + jacoco : '0.8.1', + errorprone: '0.0.14', + sonarqube : '2.6.2', + gradle : '3.1.0', + kotlin : '1.2.41', + dokka : '0.9.17' ] dependenciesList = [ // mapbox mapboxMapSdk : "com.mapbox.mapboxsdk:mapbox-android-sdk:${version.mapboxMapSdk}", - mapboxGeoJson : "com.mapbox.mapboxsdk:mapbox-sdk-geojson:${version.mapboxGeoJson}", - mapboxGeocoding : "com.mapbox.mapboxsdk:mapbox-sdk-services:${version.mapboxGeocoding}", + mapboxGeoJson : "com.mapbox.mapboxsdk:mapbox-sdk-geojson:${version.mapboxJava}", + mapboxGeocoding : "com.mapbox.mapboxsdk:mapbox-sdk-services:${version.mapboxJava}", // Google Play Location playLocation : "com.google.android.gms:play-services-location:${version.playLocation}", @@ -51,20 +54,17 @@ ext { autoValuesParcel : "com.ryanharter.auto.value:auto-value-parcel:${version.autoValueParcel}", autoValuesParcelAdapter: "com.ryanharter.auto.value:auto-value-parcel-adapter:${version.autoValueParcel}", - // Material dialogs - materialDialogs : "com.afollestad.material-dialogs:commons:${version.materialDialogs}", - // butterknife butterKnife : "com.jakewharton:butterknife:${version.butterknife}", butterKnifeProcessor : "com.jakewharton:butterknife-compiler:${version.butterknife}", // support - supportAnnotation : "com.android.support:support-annotations:${version.supportLibVersion}", - supportAppcompatV7 : "com.android.support:appcompat-v7:${version.supportLibVersion}", - supportV4 : "com.android.support:support-v4:${version.supportLibVersion}", - supportDesign : "com.android.support:design:${version.supportLibVersion}", - supportRecyclerView : "com.android.support:recyclerview-v7:${version.supportLibVersion}", - supportCardView : "com.android.support:cardview-v7:${version.supportLibVersion}", + supportAnnotation : "com.android.support:support-annotations:${version.supportLib}", + supportAppcompatV7 : "com.android.support:appcompat-v7:${version.supportLib}", + supportV4 : "com.android.support:support-v4:${version.supportLib}", + supportDesign : "com.android.support:design:${version.supportLib}", + supportRecyclerView : "com.android.support:recyclerview-v7:${version.supportLib}", + supportCardView : "com.android.support:cardview-v7:${version.supportLib}", supportConstraintLayout: "com.android.support.constraint:constraint-layout:${version.constraintLayout}", // architecture @@ -76,16 +76,15 @@ ext { // square crew timber : "com.jakewharton.timber:timber:${version.timber}", - leakCanaryDebug : "com.squareup.leakcanary:leakcanary-android:${version.leakCanaryVersion}", - leakCanaryRelease : "com.squareup.leakcanary:leakcanary-android-no-op:${version.leakCanaryVersion}", - leakCanaryTest : "com.squareup.leakcanary:leakcanary-android-no-op:${version.leakCanaryVersion}", + leakCanaryDebug : "com.squareup.leakcanary:leakcanary-android:${version.leakCanary}", + leakCanaryRelease : "com.squareup.leakcanary:leakcanary-android-no-op:${version.leakCanary}", + leakCanaryTest : "com.squareup.leakcanary:leakcanary-android-no-op:${version.leakCanary}", // instrumentation test - testSpoonRunner : "com.squareup.spoon:spoon-client:${version.spoonRunner}", - testRunner : "com.android.support.test:runner:${version.testRunnerVersion}", - testRules : "com.android.support.test:rules:${version.testRunnerVersion}", - testEspressoCore : "com.android.support.test.espresso:espresso-core:${version.espressoVersion}", - testEspressoIntents : "com.android.support.test.espresso:espresso-intents:${version.espressoVersion}", + testRunner : "com.android.support.test:runner:${version.testRunner}", + testRules : "com.android.support.test:rules:${version.testRunner}", + testEspressoCore : "com.android.support.test.espresso:espresso-core:${version.espresso}", + testEspressoIntents : "com.android.support.test.espresso:espresso-intents:${version.espresso}", testRoom : "android.arch.persistence.room:testing:${version.room}", testArchCore : "android.arch.core:core-testing:${version.androidArchCore}", mockitoCore : "org.mockito:mockito-core:${version.mockito}", @@ -94,36 +93,18 @@ ext { // unit test junit : "junit:junit:${version.junit}", mockito : "org.mockito:mockito-inline:${version.mockito}", - hamcrest : "org.hamcrest:hamcrest-junit:${version.hamcrest}", - commonsIO : "commons-io:commons-io:${version.commonsIO}", - robolectric : "org.robolectric:robolectric:${version.robolectric}", androidArchCore : "android.arch.core:core-testing:${version.androidArchCore}", - // okhttp - okhttp : "com.squareup.okhttp3:okhttp:${version.okhttp}", - - // aws polly - polly : "com.amazonaws:aws-android-sdk-polly:${version.awsPolly}", - // errorprone errorprone : "com.google.errorprone:error_prone_core:${version.errorprone}" ] - pluginVersion = [ - checkstyle: '8.5', - pmd : '6.0.0', - jacoco : '0.8.0', - errorprone: '0.0.13', - sonarqube : '2.6.2', - gradle : '3.0.1', - kotlin : '1.2.40' - ] - pluginDependencies = [ gradle : "com.android.tools.build:gradle:${pluginVersion.gradle}", checkstyle: "com.puppycrawl.tools:checkstyle:${pluginVersion.checkstyle}", sonarqube : "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:${pluginVersion.sonarqube}", errorprone: "net.ltgt.gradle:gradle-errorprone-plugin:${pluginVersion.errorprone}", - kotlin : "org.jetbrains.kotlin:kotlin-gradle-plugin:${pluginVersion.kotlin}" + kotlin : "org.jetbrains.kotlin:kotlin-gradle-plugin:${pluginVersion.kotlin}", + dokka : "org.jetbrains.dokka:dokka-android-gradle-plugin:${pluginVersion.dokka}" ] } diff --git a/plugin-traffic/javadoc.gradle b/gradle/javadoc.gradle similarity index 51% rename from plugin-traffic/javadoc.gradle rename to gradle/javadoc.gradle index f23257e29..7a0d35664 100644 --- a/plugin-traffic/javadoc.gradle +++ b/gradle/javadoc.gradle @@ -1,15 +1,17 @@ +apply from: "${rootDir}/gradle/dependencies.gradle" + android.libraryVariants.all { variant -> def name = variant.name 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) + configurations.javadocDeps - options.windowTitle("Mapbox Android Plugins $VERSION_NAME Reference") - options.docTitle("Mapbox Android Plugins $VERSION_NAME") - options.header("Mapbox Android Plugins $VERSION_NAME Reference") - options.bottom("© 2017 Mapbox. All rights reserved.") + source = variant.javaCompile.source + classpath = files(android.bootClasspath) + options.windowTitle("$POM_NAME $VERSION_NAME Reference") + options.docTitle("$POM_NAME $VERSION_NAME") + options.header("$POM_NAME $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") exclude '**/R.java', '**/BuildConfig.java' diff --git a/gradle/mvn-push-android.gradle b/gradle/mvn-push-android.gradle deleted file mode 100644 index 47657ed62..000000000 --- a/gradle/mvn-push-android.gradle +++ /dev/null @@ -1,139 +0,0 @@ -/* - * Copyright 2013 Chris Banes - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -apply plugin: 'maven' -apply plugin: 'signing' - -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/" -} - -def getSnapshotRepositoryUrl() { - return hasProperty('SNAPSHOT_REPOSITORY_URL') ? SNAPSHOT_REPOSITORY_URL - : "https://oss.sonatype.org/content/repositories/snapshots/" -} - -def obtainMavenLocalUrl() { - return getRepositories().mavenLocal().getUrl() -} - -def getRepositoryUsername() { - return hasProperty('NEXUS_USERNAME') ? NEXUS_USERNAME : "" -} - -def getRepositoryPassword() { - return hasProperty('NEXUS_PASSWORD') ? NEXUS_PASSWORD : "" -} - -afterEvaluate { project -> - uploadArchives { - repositories { - mavenDeployer { - beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) } - - pom.groupId = GROUP - pom.artifactId = POM_ARTIFACT_ID - pom.version = VERSION_NAME - - 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 - packaging POM_PACKAGING - description POM_DESCRIPTION - url POM_URL - - scm { - url POM_SCM_URL - connection POM_SCM_CONNECTION - developerConnection POM_SCM_DEV_CONNECTION - } - - licenses { - license { - name POM_LICENCE_NAME - url POM_LICENCE_URL - distribution POM_LICENCE_DIST - } - } - - developers { - developer { - id POM_DEVELOPER_ID - name POM_DEVELOPER_NAME - } - } - } - } - } - } - - signing { - required { isReleaseBuild() && gradle.taskGraph.hasTask("uploadArchives") } - sign configurations.archives - } - - task androidJavadocs(type: Javadoc) { - source = android.sourceSets.main.java.srcDirs - classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) - } - - task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) { - classifier = 'javadoc' - from androidJavadocs.destinationDir - } - - task androidSourcesJar(type: Jar) { - classifier = 'sources' - from android.sourceSets.main.java.sourceFiles - } - - artifacts { - archives androidSourcesJar - 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) - classpath += configurations.javadocDeps - } - } -} diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 25609741e..b6517bb1d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Wed Nov 01 15:26:55 PDT 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip diff --git a/plugin-building/build.gradle b/plugin-building/build.gradle index 35f65bc46..0b4bb2194 100644 --- a/plugin-building/build.gradle +++ b/plugin-building/build.gradle @@ -38,7 +38,7 @@ dependencies { javadocDeps dependenciesList.mapboxMapSdk } -apply from: 'javadoc.gradle' -apply from: "${rootDir}/gradle/mvn-push-android.gradle" +apply from: "${rootDir}/gradle/javadoc.gradle" +apply from: "${rootDir}/gradle/publish.gradle" apply from: "${rootDir}/gradle/checkstyle.gradle" apply from: "${rootDir}/gradle/jacoco.gradle" diff --git a/plugin-building/javadoc.gradle b/plugin-building/javadoc.gradle deleted file mode 100644 index 7cfdda206..000000000 --- a/plugin-building/javadoc.gradle +++ /dev/null @@ -1,17 +0,0 @@ -android.libraryVariants.all { variant -> - def name = variant.name - 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) + configurations.javadocDeps - options.windowTitle("Mapbox Android Building Plugin $VERSION_NAME Reference") - options.docTitle("Mapbox Android Building Plugin $VERSION_NAME") - options.header("Mapbox Android Building Plugin $VERSION_NAME Reference") - options.bottom("© 2017 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") - exclude '**/R.java', '**/BuildConfig.java' - } -} \ No newline at end of file diff --git a/plugin-localization/build.gradle b/plugin-localization/build.gradle index 081e8da40..1f6bc8daa 100644 --- a/plugin-localization/build.gradle +++ b/plugin-localization/build.gradle @@ -38,7 +38,7 @@ dependencies { testImplementation dependenciesList.mockito } -apply from: 'javadoc.gradle' -apply from: "${rootDir}/gradle/mvn-push-android.gradle" +apply from: "${rootDir}/gradle/javadoc.gradle" +apply from: "${rootDir}/gradle/publish.gradle" apply from: "${rootDir}/gradle/checkstyle.gradle" apply from: "${rootDir}/gradle/jacoco.gradle" \ No newline at end of file diff --git a/plugin-localization/javadoc.gradle b/plugin-localization/javadoc.gradle deleted file mode 100644 index e401fa558..000000000 --- a/plugin-localization/javadoc.gradle +++ /dev/null @@ -1,17 +0,0 @@ -android.libraryVariants.all { variant -> - def name = variant.name - 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) + configurations.javadocDeps - options.windowTitle("Mapbox Android Plugins $VERSION_NAME Reference") - options.docTitle("Mapbox Android Plugins $VERSION_NAME") - options.header("Mapbox Android Plugins $VERSION_NAME Reference") - options.bottom("© 2017 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") - exclude '**/R.java', '**/BuildConfig.java' - } -} \ No newline at end of file diff --git a/plugin-locationlayer/build.gradle b/plugin-locationlayer/build.gradle index 2e7df175a..58c2844e1 100644 --- a/plugin-locationlayer/build.gradle +++ b/plugin-locationlayer/build.gradle @@ -57,7 +57,7 @@ dependencies { javadocDeps dependenciesList.mapboxMapSdk } -apply from: 'javadoc.gradle' -apply from: "${rootDir}/gradle/mvn-push-android.gradle" +apply from: "${rootDir}/gradle/javadoc.gradle" +apply from: "${rootDir}/gradle/publish.gradle" apply from: "${rootDir}/gradle/checkstyle.gradle" apply from: "${rootDir}/gradle/jacoco.gradle" \ No newline at end of file diff --git a/plugin-locationlayer/gradle.properties b/plugin-locationlayer/gradle.properties index 561dd55f1..f8b5986f7 100644 --- a/plugin-locationlayer/gradle.properties +++ b/plugin-locationlayer/gradle.properties @@ -1,5 +1,5 @@ VERSION_NAME=0.5.3 POM_ARTIFACT_ID=mapbox-android-plugin-locationlayer -POM_NAME=Mapbox Android Plugins -POM_DESCRIPTION=Mapbox Android Plugins (Location Layer) -POM_PACKAGING=aar +POM_NAME=Mapbox Android Location Layer Plugin +POM_DESCRIPTION=Mapbox Android Location Layer Plugin +POM_PACKAGING=aar \ No newline at end of file diff --git a/plugin-locationlayer/javadoc.gradle b/plugin-locationlayer/javadoc.gradle deleted file mode 100644 index 79502c2ee..000000000 --- a/plugin-locationlayer/javadoc.gradle +++ /dev/null @@ -1,18 +0,0 @@ -android.libraryVariants.all { variant -> - def name = variant.name - 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) + configurations.javadocDeps - options.windowTitle("Mapbox Android Plugins $VERSION_NAME Reference") - options.docTitle("Mapbox Android Plugins $VERSION_NAME") - options.tags("attr") - options.header("Mapbox Android Plugins $VERSION_NAME Reference") - options.bottom("© 2017 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") - exclude '**/R.java', '**/BuildConfig.java' - } -} \ No newline at end of file diff --git a/plugin-offline/build.gradle b/plugin-offline/build.gradle index 87f83773a..20d99a0ae 100644 --- a/plugin-offline/build.gradle +++ b/plugin-offline/build.gradle @@ -54,7 +54,7 @@ dependencies { javadocDeps dependenciesList.mapboxMapSdk } -apply from: 'javadoc.gradle' -apply from: "${rootDir}/gradle/mvn-push-android.gradle" +apply from: "${rootDir}/gradle/javadoc.gradle" +apply from: "${rootDir}/gradle/publish.gradle" apply from: "${rootDir}/gradle/checkstyle.gradle" apply from: "${rootDir}/gradle/jacoco.gradle" \ No newline at end of file diff --git a/plugin-offline/javadoc.gradle b/plugin-offline/javadoc.gradle deleted file mode 100644 index c1610b304..000000000 --- a/plugin-offline/javadoc.gradle +++ /dev/null @@ -1,17 +0,0 @@ -android.libraryVariants.all { variant -> - def name = variant.name - 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) + configurations.javadocDeps - options.windowTitle("Mapbox Android Offline Plugin $VERSION_NAME Reference") - options.docTitle("Mapbox Android Offline Plugin $VERSION_NAME") - options.header("Mapbox Android Offline Plugin $VERSION_NAME Reference") - options.bottom("© 2017 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") - exclude '**/R.java', '**/BuildConfig.java' - } -} \ No newline at end of file diff --git a/plugin-places/build.gradle b/plugin-places/build.gradle index 3d95c9228..57d1dbcea 100644 --- a/plugin-places/build.gradle +++ b/plugin-places/build.gradle @@ -77,7 +77,7 @@ dependencies { javadocDeps dependenciesList.mapboxMapSdk } -apply from: 'javadoc.gradle' -apply from: "${rootDir}/gradle/mvn-push-android.gradle" +apply from: "${rootDir}/gradle/javadoc.gradle" +apply from: "${rootDir}/gradle/publish.gradle" apply from: "${rootDir}/gradle/checkstyle.gradle" apply from: "${rootDir}/gradle/jacoco.gradle" \ No newline at end of file diff --git a/plugin-places/javadoc.gradle b/plugin-places/javadoc.gradle deleted file mode 100644 index 2f1f1e721..000000000 --- a/plugin-places/javadoc.gradle +++ /dev/null @@ -1,17 +0,0 @@ -android.libraryVariants.all { variant -> - def name = variant.name - 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) + configurations.javadocDeps - options.windowTitle("Mapbox Android Places Plugin $VERSION_NAME Reference") - options.docTitle("Mapbox Android Places Plugin $VERSION_NAME") - options.header("Mapbox Android Places Plugin $VERSION_NAME Reference") - options.bottom("© 2017 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") - exclude '**/R.java', '**/BuildConfig.java' - } -} \ No newline at end of file diff --git a/plugin-traffic/build.gradle b/plugin-traffic/build.gradle index 0562db93b..d1e629a17 100644 --- a/plugin-traffic/build.gradle +++ b/plugin-traffic/build.gradle @@ -39,7 +39,7 @@ dependencies { javadocDeps dependenciesList.mapboxMapSdk } -apply from: 'javadoc.gradle' -apply from: "${rootDir}/gradle/mvn-push-android.gradle" +apply from: "${rootDir}/gradle/javadoc.gradle" +apply from: "${rootDir}/gradle/publish.gradle" apply from: "${rootDir}/gradle/checkstyle.gradle" apply from: "${rootDir}/gradle/jacoco.gradle" \ No newline at end of file From 297e11f6ba6e6bd8c67ded54f009205639b6a5f4 Mon Sep 17 00:00:00 2001 From: Cameron Mace Date: Fri, 1 Jun 2018 14:17:25 -0400 Subject: [PATCH 3/3] fix fromCarmenFeature_doesSerializeCorrectly test --- circle.yml | 2 +- .../data/converter/CarmenFeatureConverterTest.java | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/circle.yml b/circle.yml index 1e403d92d..1584f95a9 100644 --- a/circle.yml +++ b/circle.yml @@ -65,7 +65,7 @@ jobs: # ------------------------------------------------------------------------------ release: docker: - - image: mbgl/7d2403f42e:android-ndk-r16b + - image: mbgl/feb0443038:android-ndk-r17 working_directory: ~/code environment: BUILDTYPE: Release diff --git a/plugin-places/src/test/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/data/converter/CarmenFeatureConverterTest.java b/plugin-places/src/test/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/data/converter/CarmenFeatureConverterTest.java index 6e8de7c3b..7de1c418e 100644 --- a/plugin-places/src/test/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/data/converter/CarmenFeatureConverterTest.java +++ b/plugin-places/src/test/java/com/mapbox/mapboxsdk/plugins/places/autocomplete/data/converter/CarmenFeatureConverterTest.java @@ -42,11 +42,14 @@ public void toCarmenFeature_successfullyConvertsToFeature() throws Exception { } @Test - public void fromCarmenFeature_doesSerializeCorrectly() throws Exception { + public void fromCarmenFeature_doesSerializeCorrectly() { String json = "{\"type\":\"Feature\",\"id\":\"id\",\"geometry\":{\"type\":\"Point\"," - + "\"coordinates\":[1.0, 2.0]},\"properties\":{},\"address\":\"address\"," + + "\"coordinates\":[1.0, 2.0]},\"properties\":{\"hello\":\"world\"},\"address\":\"address\"," + "\"matching_place_name\":\"matchingPlaceName\",\"language\":\"language\"}"; + JsonObject obj = new JsonObject(); + obj.addProperty("hello", "world"); + CarmenFeature carmenFeature = CarmenFeature.builder() .geometry(Point.fromLngLat(1.0, 2.0)) .address("address") @@ -54,7 +57,7 @@ public void fromCarmenFeature_doesSerializeCorrectly() throws Exception { .id("id") .language("language") .matchingPlaceName("matchingPlaceName") - .properties(new JsonObject()) + .properties(obj) .build(); String serializedFeature = CarmenFeatureConverter.fromCarmenFeature(carmenFeature); assertThat(serializedFeature, equalTo(json));