From 34d693b455c621781a88c4ac35f3ee5f548be40b Mon Sep 17 00:00:00 2001 From: Langston Smith Date: Tue, 21 May 2019 11:17:29 -0700 Subject: [PATCH] initial additions --- Makefile | 17 +++-- build.gradle | 11 ++- circle.yml | 72 ++++++++++++++---- gradle/artifact-settings.gradle | 20 +++++ gradle/dependencies.gradle | 27 ++++--- gradle/gradle-bintray.gradle | 124 +++++++++++++++++++++++++++++++ gradle/publish.gradle | 123 ------------------------------ ktx-mapbox-maps/build.gradle | 1 - plugin-annotation/build.gradle | 7 +- plugin-building/build.gradle | 5 +- plugin-localization/build.gradle | 7 +- plugin-markerview/build.gradle | 7 +- plugin-offline/build.gradle | 7 +- plugin-places/build.gradle | 7 +- plugin-scalebar/build.gradle | 7 +- plugin-traffic/build.gradle | 7 +- 16 files changed, 280 insertions(+), 169 deletions(-) create mode 100644 gradle/artifact-settings.gradle create mode 100644 gradle/gradle-bintray.gradle delete mode 100644 gradle/publish.gradle diff --git a/Makefile b/Makefile index 6d00ca34b..d298f39f3 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,10 @@ MBGL_ANDROID_PLUGINS += traffic;plugin-traffic -MBGL_ANDROID_PLUGINS += locationlayer;plugin-locationlayer MBGL_ANDROID_PLUGINS += building;plugin-building MBGL_ANDROID_PLUGINS += offline;plugin-offline MBGL_ANDROID_PLUGINS += places;plugin-places +MBGL_ANDROID_PLUGINS += annotation;plugin-annotation MBGL_ANDROID_PLUGINS += localization;plugin-localization +MBGL_ANDROID_PLUGINS += markerview;plugin-markerview MBGL_ANDROID_PLUGINS += scalebar;plugin-scalebar checkstyle: @@ -24,11 +25,14 @@ javadoc: ./gradlew javadocrelease publish: - export IS_LOCAL_DEVELOPMENT=false; ./gradlew uploadArchives + export IS_LOCAL_DEVELOPMENT=false; ./gradlew bintrayUpload + +publish-snapshot: + export IS_LOCAL_DEVELOPMENT=false; ./gradlew artifactoryPublish publish-local: # This publishes to ~/.m2/repository/com/mapbox/mapboxsdk - export IS_LOCAL_DEVELOPMENT=true; ./gradlew uploadArchives + export IS_LOCAL_DEVELOPMENT=true; ./gradlew bintrayUpload generate-sanity-test: npm install && node scripts/generate-activity-test.js @@ -54,11 +58,14 @@ javadoc-$1: ./gradlew :$2:javadocrelease publish-$1: - export IS_LOCAL_DEVELOPMENT=false; ./gradlew :$2:uploadArchives + export IS_LOCAL_DEVELOPMENT=false; ./gradlew :$2:bintrayUpload + +publish-snapshot-$1: + export IS_LOCAL_DEVELOPMENT=false; ./gradlew :$2:artifactoryPublish publish-local-$1: # This publishes to ~/.m2/repository/com/mapbox/mapboxsdk - export IS_LOCAL_DEVELOPMENT=true; ./gradlew :$2:uploadArchives + export IS_LOCAL_DEVELOPMENT=true; ./gradlew :$2:bintrayUpload endef diff --git a/build.gradle b/build.gradle index 595702304..95bb31d68 100644 --- a/build.gradle +++ b/build.gradle @@ -6,12 +6,18 @@ buildscript { jcenter() maven { url "https://maven.google.com" } maven { url "https://plugins.gradle.org/m2/" } + maven { url 'https://oss.jfrog.org/artifactory/oss-snapshot-local/' } } dependencies { classpath pluginDependencies.gradle classpath pluginDependencies.kotlin classpath pluginDependencies.kotlinLint + + // These plugins are for publishing to Bintray + classpath pluginDependencies.bintray + classpath pluginDependencies.androidPublishPlugin + classpath pluginDependencies.artifactory } } @@ -22,6 +28,9 @@ allprojects { // SNAPSHOT repository // maven { url "http://oss.sonatype.org/content/repositories/snapshots/" } // maven { url 'https://oss.jfrog.org/artifactory/oss-snapshot-local/' } + + // For publishing to Bintray + maven { url 'https://mapbox.bintray.com/mapbox' } } } @@ -32,4 +41,4 @@ subprojects { task clean(type: Delete) { delete rootProject.buildDir -} \ No newline at end of file +} diff --git a/circle.yml b/circle.yml index d84849ce0..1f52ce409 100644 --- a/circle.yml +++ b/circle.yml @@ -14,7 +14,6 @@ jobs: environment: JVM_OPTS: -Xmx3200m BUILDTYPE: Debug - IS_LOCAL_DEVELOPMENT: false steps: - checkout - restore_cache: @@ -85,33 +84,78 @@ jobs: working_directory: ~/code environment: BUILDTYPE: Release - IS_LOCAL_DEVELOPMENT: false steps: - checkout - run: name: Init submodules command: git submodule update --init --recursive - run: - name: Generate Maven credentials + name: Generate Bintray credentials shell: /bin/bash -euo pipefail command: | - if [ -n "${PUBLISH_NEXUS_USERNAME}" ]; then - aws s3 cp s3://mapbox/android/signing-credentials/secring.gpg secring.gpg - echo "NEXUS_USERNAME=$PUBLISH_NEXUS_USERNAME - NEXUS_PASSWORD=$PUBLISH_NEXUS_PASSWORD - signing.keyId=$SIGNING_KEYID - signing.password=$SIGNING_PASSWORD - signing.secretKeyRingFile=../secring.gpg" >> gradle.properties + if [ -n "${BINTRAY_USER}" ]; then + echo "BINTRAY_USER=$BINTRAY_USER + BINTRAY_API_KEY=$BINTRAY_API_KEY + GPG_PASSPHRASE=$GPG_PASSPHRASE" + fi + - run: + name: Add bash environment variable to set which plugin is being released + command: | + if [[ $CIRCLE_TAG == v*-annotation ]]; then + echo 'export PLUGIN_BEING_RELEASED="annotation"' >> $BASH_ENV + source $PLUGIN_BEING_RELEASED + fi + if [[ $CIRCLE_TAG == v*-localization ]]; then + echo 'export PLUGIN_BEING_RELEASED="localization"' >> $BASH_ENV + source $PLUGIN_BEING_RELEASED + fi + if [[ $CIRCLE_TAG == v*-building ]]; then + echo 'export PLUGIN_BEING_RELEASED="building"' >> $BASH_ENV + source $PLUGIN_BEING_RELEASED + fi + if [[ $CIRCLE_TAG == v*-markerview ]]; then + echo 'export PLUGIN_BEING_RELEASED="markerview"' >> $BASH_ENV + source $PLUGIN_BEING_RELEASED + fi + if [[ $CIRCLE_TAG == v*-offline ]]; then + echo 'export PLUGIN_BEING_RELEASED="offline"' >> $BASH_ENV + source $PLUGIN_BEING_RELEASED + fi + if [[ $CIRCLE_TAG == v*-places ]]; then + echo 'export PLUGIN_BEING_RELEASED="places"' >> $BASH_ENV + source $PLUGIN_BEING_RELEASED + fi + if [[ $CIRCLE_TAG == v*-scalebar ]]; then + echo 'export PLUGIN_BEING_RELEASED="scalebar"' >> $BASH_ENV + source $PLUGIN_BEING_RELEASED + fi + if [[ $CIRCLE_TAG == v*-traffic ]]; then + echo 'export PLUGIN_BEING_RELEASED="traffic"' >> $BASH_ENV + source $PLUGIN_BEING_RELEASED + fi + - run: + name: Print PLUGIN_BEING_RELEASED variable to confirm that right plugin is being released + command: | + echo $PLUGIN_BEING_RELEASED + - run: + name: Update the version name for the plugin being released + command: | + if [[ $CIRCLE_TAG == v* ]]; then + sed -i -e "s/^VERSION_NAME=.*/VERSION_NAME=${CIRCLE_TAG:9}/" plugin-$PLUGIN_BEING_RELEASED/gradle.properties fi - run: name: Build Plugins SDK command: make build-release - deploy: - name: Publish Plugins SDK To Maven Central + name: Publish the correct plugin to Bintray command: | - if [ -n "${PUBLISH_NEXUS_USERNAME}" ]; then - if [ "${CIRCLE_BRANCH}" == "master" ]; then - make publish + if [[ $CIRCLE_BRANCH == master ]] || [[ $CIRCLE_TAG == v*- ]]; then + version=$(cat $PLUGIN_BEING_RELEASED/gradle.properties | grep "VERSION_NAME") + if [[ $version != *"SNAPSHOT"* ]]; then + make publish-$PLUGIN_BEING_RELEASED + fi + else + make publish-snapshot-$PLUGIN_BEING_RELEASED fi fi - store_artifacts: diff --git a/gradle/artifact-settings.gradle b/gradle/artifact-settings.gradle new file mode 100644 index 000000000..a3533a110 --- /dev/null +++ b/gradle/artifact-settings.gradle @@ -0,0 +1,20 @@ +ext { + mapboxArtifactGroupId = 'com.mapbox.mapboxsdk' + mapboxArtifactId = project.hasProperty('POM_ARTIFACT_ID') ? project.property('POM_ARTIFACT_ID') : System.getenv('POM_ARTIFACT_ID') + mapboxArtifactTitle = project.hasProperty('POM_NAME') ? project.property('POM_NAME') : System.getenv('POM_NAME') + mapboxArtifactDescription = project.hasProperty('POM_DESCRIPTION') ? project.property('POM_DESCRIPTION') : System.getenv('POM_DESCRIPTION') + mapboxDeveloperName = 'Mapbox' + mapboxDeveloperId = 'mapbox' + mapboxArtifactUrl = 'https://github.com/mapbox/mapbox-plugins-android' + mapboxArtifactVcsUrl = 'https://github.com/mapbox/mapbox-plugins-android.git' + mapboxArtifactScmUrl = 'scm:git@github.com:mapbox/mapbox-plugins-android.git' + mapboxArtifactLicenseName = 'BSD 2-Clause' + mapboxArtifactLicenseUrl = 'https://opensource.org/licenses/BSD-2-Clause' + versionName = project.hasProperty('VERSION_NAME') ? project.property('VERSION_NAME') : System.getenv('VERSION_NAME') + + mapboxBintrayUserOrg = 'mapbox' + mapboxBintrayRepoName = 'mapbox' + mapboxBintrayUser = project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER') + mapboxBintrayApiKey = project.hasProperty('BINTRAY_API_KEY') ? project.property('BINTRAY_API_KEY') : System.getenv('BINTRAY_API_KEY') + mapboxGpgPassphrase = project.hasProperty('GPG_PASSPHRASE') ? project.property('GPG_PASSPHRASE') : System.getenv('GPG_PASSPHRASE') +} \ No newline at end of file diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 7ea2deeda..3822209e5 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -30,11 +30,15 @@ ] pluginVersion = [ - checkstyle: '8.10.1', - gradle : '3.4.0', - kotlin : '1.3.20', - dokka : '0.9.17', - kotlinLint: '8.1.0' + checkstyle : '8.10.1', + gradle : '3.4.0', + kotlin : '1.3.20', + dokka : '0.9.17', + kotlinLint : '8.1.0', + dependencyGraph : '0.4.0', + bintray : '1.8.4', + androidPublish : '3.6.2', + artifactory : '4.9.3' ] dependenciesList = [ @@ -92,10 +96,13 @@ ] pluginDependencies = [ - gradle : "com.android.tools.build:gradle:${pluginVersion.gradle}", - checkstyle: "com.puppycrawl.tools:checkstyle:${pluginVersion.checkstyle}", - kotlin : "org.jetbrains.kotlin:kotlin-gradle-plugin:${pluginVersion.kotlin}", - dokka : "org.jetbrains.dokka:dokka-android-gradle-plugin:${pluginVersion.dokka}", - kotlinLint: "org.jlleitschuh.gradle:ktlint-gradle:${pluginVersion.kotlinLint}" + gradle : "com.android.tools.build:gradle:${pluginVersion.gradle}", + checkstyle : "com.puppycrawl.tools:checkstyle:${pluginVersion.checkstyle}", + kotlin : "org.jetbrains.kotlin:kotlin-gradle-plugin:${pluginVersion.kotlin}", + dokka : "org.jetbrains.dokka:dokka-android-gradle-plugin:${pluginVersion.dokka}", + kotlinLint : "org.jlleitschuh.gradle:ktlint-gradle:${pluginVersion.kotlinLint}", + bintray : "com.jfrog.bintray.gradle:gradle-bintray-plugin:${pluginVersion.bintray}", + androidPublishPlugin : "digital.wup:android-maven-publish:${pluginVersion.androidPublish}", + artifactory : "org.jfrog.buildinfo:build-info-extractor-gradle:${pluginVersion.artifactory}" ] } diff --git a/gradle/gradle-bintray.gradle b/gradle/gradle-bintray.gradle new file mode 100644 index 000000000..a7c015787 --- /dev/null +++ b/gradle/gradle-bintray.gradle @@ -0,0 +1,124 @@ +apply plugin: 'digital.wup.android-maven-publish' +apply plugin: 'maven-publish' +apply plugin: 'com.jfrog.bintray' +apply plugin: 'com.jfrog.artifactory' +apply from: file('../gradle/artifact-settings.gradle') + +publishing { + publications { + MapboxPluginPublication(MavenPublication) { + from components.android + groupId project.ext.mapboxArtifactGroupId + artifactId project.ext.mapboxArtifactId + version project.ext.versionName + + afterEvaluate { + artifact("$buildDir/outputs/aar/${project.name}-release.aar") + artifact(androidSourcesJar) + artifact(androidJavadocsJar) + } + + pom.withXml { + final mainNode = asNode() + mainNode.appendNode('name', project.ext.mapboxArtifactTitle) + mainNode.appendNode('description', project.ext.mapboxArtifactTitle) + mainNode.appendNode('url', project.ext.mapboxArtifactUrl) + + final licenseNode = mainNode.appendNode('licenses').appendNode('license') + licenseNode.appendNode('name', project.ext.mapboxArtifactLicenseName) + licenseNode.appendNode('url', project.ext.mapboxArtifactLicenseUrl) + licenseNode.appendNode('distribution', "repo") + + final developerNode = mainNode.appendNode('developers').appendNode('developer') + developerNode.appendNode('id', project.ext.mapboxDeveloperId) + developerNode.appendNode('name', project.ext.mapboxDeveloperName) + + final scmNode = mainNode.appendNode("scm") + scmNode.appendNode("connection", project.ext.mapboxArtifactScmUrl) + scmNode.appendNode("developerConnection", project.ext.mapboxArtifactScmUrl) + scmNode.appendNode("url", project.ext.mapboxArtifactUrl) + } + + } + } +} + +bintray { + user = mapboxBintrayUser + key = mapboxBintrayApiKey + publications = ['MapboxPluginPublication'] + pkg { + repo = project.ext.mapboxBintrayRepoName + name = project.ext.mapboxArtifactId + userOrg = project.ext.mapboxBintrayUserOrg + licenses = [project.ext.mapboxArtifactLicenseName] + vcsUrl = project.ext.mapboxArtifactVcsUrl + publish = false + version { + name = project.ext.versionName + desc = project.ext.mapboxArtifactDescription + released = new Date() + gpg { + sign = true + passphrase = mapboxGpgPassphrase + } + mavenCentralSync { + sync = false + } + } + } +} + +artifactory { + contextUrl = 'http://oss.jfrog.org' + publish { + repository { + repoKey = 'oss-snapshot-local' + username = mapboxBintrayUser + password = mapboxBintrayApiKey + } + defaults { + publications('MapboxPluginPublication') + } + } +} + +task androidSourcesJar(type: Jar) { + classifier "sources" + from android.sourceSets.main.java.srcDirs +} + +task androidJavadocs(type: Javadoc) { + source = android.sourceSets.main.java.srcDirs + classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) + android.libraryVariants.all { variant -> + if (variant.name == 'release') { + owner.classpath += variant.javaCompile.classpath + } + } + +} + +task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) { + classifier = 'javadoc' + from androidJavadocs.destinationDir +} + +tasks.withType(Javadoc) { + options.addStringOption('encoding', 'UTF-8') + options.addStringOption('docencoding', 'UTF-8') + options.addStringOption('charset', 'UTF-8') +} + +artifacts { + archives androidSourcesJar + archives androidJavadocsJar +} + +afterEvaluate { project -> + android.libraryVariants.all { variant -> + tasks.androidJavadocs.doFirst { + classpath += files(variant.javaCompile.classpath.files) + } + } +} diff --git a/gradle/publish.gradle b/gradle/publish.gradle deleted file mode 100644 index 9dd7e36f3..000000000 --- a/gradle/publish.gradle +++ /dev/null @@ -1,123 +0,0 @@ -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 diff --git a/ktx-mapbox-maps/build.gradle b/ktx-mapbox-maps/build.gradle index 6547fbd0a..304973111 100644 --- a/ktx-mapbox-maps/build.gradle +++ b/ktx-mapbox-maps/build.gradle @@ -38,5 +38,4 @@ dependencies { } apply from: "${rootDir}/gradle/javadoc.gradle" -apply from: "${rootDir}/gradle/publish.gradle" apply from: "${rootDir}/gradle/checkstyle.gradle" \ No newline at end of file diff --git a/plugin-annotation/build.gradle b/plugin-annotation/build.gradle index 314a6414f..0663cca67 100644 --- a/plugin-annotation/build.gradle +++ b/plugin-annotation/build.gradle @@ -1,4 +1,6 @@ apply plugin: 'com.android.library' +apply plugin: 'com.jfrog.bintray' +apply plugin: 'com.jfrog.artifactory' android { compileSdkVersion androidVersions.compileSdkVersion @@ -32,6 +34,7 @@ dependencies { } apply from: "${rootDir}/gradle/javadoc.gradle" -apply from: "${rootDir}/gradle/publish.gradle" apply from: "${rootDir}/gradle/checkstyle.gradle" -apply from: "${rootDir}/gradle/nitpick.gradle" \ No newline at end of file +apply from: "${rootDir}/gradle/nitpick.gradle" +apply from: "${rootDir}/gradle/artifact-settings.gradle" +apply from: "${rootDir}/gradle/gradle-bintray.gradle" \ No newline at end of file diff --git a/plugin-building/build.gradle b/plugin-building/build.gradle index ecda61445..88f883971 100644 --- a/plugin-building/build.gradle +++ b/plugin-building/build.gradle @@ -1,4 +1,6 @@ apply plugin: 'com.android.library' +apply plugin: 'com.jfrog.bintray' +apply plugin: 'com.jfrog.artifactory' android { compileSdkVersion androidVersions.compileSdkVersion @@ -30,5 +32,6 @@ dependencies { } apply from: "${rootDir}/gradle/javadoc.gradle" -apply from: "${rootDir}/gradle/publish.gradle" apply from: "${rootDir}/gradle/checkstyle.gradle" +apply from: "${rootDir}/gradle/artifact-settings.gradle" +apply from: "${rootDir}/gradle/gradle-bintray.gradle" \ No newline at end of file diff --git a/plugin-localization/build.gradle b/plugin-localization/build.gradle index 99c35e1fa..5201d0845 100644 --- a/plugin-localization/build.gradle +++ b/plugin-localization/build.gradle @@ -1,4 +1,6 @@ apply plugin: 'com.android.library' +apply plugin: 'com.jfrog.bintray' +apply plugin: 'com.jfrog.artifactory' android { compileSdkVersion androidVersions.compileSdkVersion @@ -30,5 +32,6 @@ dependencies { } apply from: "${rootDir}/gradle/javadoc.gradle" -apply from: "${rootDir}/gradle/publish.gradle" -apply from: "${rootDir}/gradle/checkstyle.gradle" \ No newline at end of file +apply from: "${rootDir}/gradle/checkstyle.gradle" +apply from: "${rootDir}/gradle/artifact-settings.gradle" +apply from: "${rootDir}/gradle/gradle-bintray.gradle" \ No newline at end of file diff --git a/plugin-markerview/build.gradle b/plugin-markerview/build.gradle index 42a13944c..bb6134f24 100644 --- a/plugin-markerview/build.gradle +++ b/plugin-markerview/build.gradle @@ -1,4 +1,6 @@ apply plugin: 'com.android.library' +apply plugin: 'com.jfrog.bintray' +apply plugin: 'com.jfrog.artifactory' android { compileSdkVersion androidVersions.compileSdkVersion @@ -31,5 +33,6 @@ dependencies { } apply from: "${rootDir}/gradle/javadoc.gradle" -apply from: "${rootDir}/gradle/publish.gradle" -apply from: "${rootDir}/gradle/checkstyle.gradle" \ No newline at end of file +apply from: "${rootDir}/gradle/checkstyle.gradle" +apply from: "${rootDir}/gradle/artifact-settings.gradle" +apply from: "${rootDir}/gradle/gradle-bintray.gradle" \ No newline at end of file diff --git a/plugin-offline/build.gradle b/plugin-offline/build.gradle index 6c7012ba1..1a1b9877f 100644 --- a/plugin-offline/build.gradle +++ b/plugin-offline/build.gradle @@ -1,4 +1,6 @@ apply plugin: 'com.android.library' +apply plugin: 'com.jfrog.bintray' +apply plugin: 'com.jfrog.artifactory' android { compileSdkVersion androidVersions.compileSdkVersion @@ -49,5 +51,6 @@ dependencies { } apply from: "${rootDir}/gradle/javadoc.gradle" -apply from: "${rootDir}/gradle/publish.gradle" -apply from: "${rootDir}/gradle/checkstyle.gradle" \ No newline at end of file +apply from: "${rootDir}/gradle/checkstyle.gradle" +apply from: "${rootDir}/gradle/artifact-settings.gradle" +apply from: "${rootDir}/gradle/gradle-bintray.gradle" \ No newline at end of file diff --git a/plugin-places/build.gradle b/plugin-places/build.gradle index 62ebdef53..973f3cf57 100644 --- a/plugin-places/build.gradle +++ b/plugin-places/build.gradle @@ -1,4 +1,6 @@ apply plugin: 'com.android.library' +apply plugin: 'com.jfrog.bintray' +apply plugin: 'com.jfrog.artifactory' android { compileSdkVersion androidVersions.compileSdkVersion @@ -75,5 +77,6 @@ dependencies { } apply from: "${rootDir}/gradle/javadoc.gradle" -apply from: "${rootDir}/gradle/publish.gradle" -apply from: "${rootDir}/gradle/checkstyle.gradle" \ No newline at end of file +apply from: "${rootDir}/gradle/checkstyle.gradle" +apply from: "${rootDir}/gradle/artifact-settings.gradle" +apply from: "${rootDir}/gradle/gradle-bintray.gradle" \ No newline at end of file diff --git a/plugin-scalebar/build.gradle b/plugin-scalebar/build.gradle index 1ba76c1b6..f78ebc3b0 100644 --- a/plugin-scalebar/build.gradle +++ b/plugin-scalebar/build.gradle @@ -1,5 +1,7 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' +apply plugin: 'com.jfrog.bintray' +apply plugin: 'com.jfrog.artifactory' android { compileSdkVersion androidVersions.compileSdkVersion @@ -32,5 +34,6 @@ dependencies { } apply from: "${rootDir}/gradle/javadoc.gradle" -apply from: "${rootDir}/gradle/publish.gradle" -apply from: "${rootDir}/gradle/checkstyle.gradle" \ No newline at end of file +apply from: "${rootDir}/gradle/checkstyle.gradle" +apply from: "${rootDir}/gradle/artifact-settings.gradle" +apply from: "${rootDir}/gradle/gradle-bintray.gradle" \ No newline at end of file diff --git a/plugin-traffic/build.gradle b/plugin-traffic/build.gradle index 7c8afcbfe..65fbb1f8d 100644 --- a/plugin-traffic/build.gradle +++ b/plugin-traffic/build.gradle @@ -1,4 +1,6 @@ apply plugin: 'com.android.library' +apply plugin: 'com.jfrog.bintray' +apply plugin: 'com.jfrog.artifactory' android { compileSdkVersion androidVersions.compileSdkVersion @@ -31,5 +33,6 @@ dependencies { } apply from: "${rootDir}/gradle/javadoc.gradle" -apply from: "${rootDir}/gradle/publish.gradle" -apply from: "${rootDir}/gradle/checkstyle.gradle" \ No newline at end of file +apply from: "${rootDir}/gradle/checkstyle.gradle" +apply from: "${rootDir}/gradle/artifact-settings.gradle" +apply from: "${rootDir}/gradle/gradle-bintray.gradle"