From cf55713d03ab0afb2bb3c323eb61640d35e05300 Mon Sep 17 00:00:00 2001 From: langsmith Date: Tue, 2 Jul 2019 12:17:25 -0700 Subject: [PATCH] adding artifactory to publishable plugins --- gradle/gradle-bintray.gradle | 5 ++--- plugin-annotation/build.gradle | 1 + plugin-building/build.gradle | 1 + plugin-localization/build.gradle | 1 + plugin-markerview/build.gradle | 1 + plugin-offline/build.gradle | 1 + plugin-places/build.gradle | 1 + plugin-scalebar/build.gradle | 1 + plugin-traffic/build.gradle | 3 ++- 9 files changed, 11 insertions(+), 4 deletions(-) diff --git a/gradle/gradle-bintray.gradle b/gradle/gradle-bintray.gradle index 170728676..a7c015787 100644 --- a/gradle/gradle-bintray.gradle +++ b/gradle/gradle-bintray.gradle @@ -85,7 +85,6 @@ artifactory { task androidSourcesJar(type: Jar) { classifier "sources" - extension "aar" from android.sourceSets.main.java.srcDirs } @@ -111,10 +110,10 @@ tasks.withType(Javadoc) { options.addStringOption('charset', 'UTF-8') } -/*artifacts { +artifacts { archives androidSourcesJar archives androidJavadocsJar -}*/ +} afterEvaluate { project -> android.libraryVariants.all { variant -> diff --git a/plugin-annotation/build.gradle b/plugin-annotation/build.gradle index ffec75f3c..0663cca67 100644 --- a/plugin-annotation/build.gradle +++ b/plugin-annotation/build.gradle @@ -1,5 +1,6 @@ apply plugin: 'com.android.library' apply plugin: 'com.jfrog.bintray' +apply plugin: 'com.jfrog.artifactory' android { compileSdkVersion androidVersions.compileSdkVersion diff --git a/plugin-building/build.gradle b/plugin-building/build.gradle index f2fad5073..88f883971 100644 --- a/plugin-building/build.gradle +++ b/plugin-building/build.gradle @@ -1,5 +1,6 @@ apply plugin: 'com.android.library' apply plugin: 'com.jfrog.bintray' +apply plugin: 'com.jfrog.artifactory' android { compileSdkVersion androidVersions.compileSdkVersion diff --git a/plugin-localization/build.gradle b/plugin-localization/build.gradle index c5f84bcb1..5201d0845 100644 --- a/plugin-localization/build.gradle +++ b/plugin-localization/build.gradle @@ -1,5 +1,6 @@ apply plugin: 'com.android.library' apply plugin: 'com.jfrog.bintray' +apply plugin: 'com.jfrog.artifactory' android { compileSdkVersion androidVersions.compileSdkVersion diff --git a/plugin-markerview/build.gradle b/plugin-markerview/build.gradle index afd8962ef..bb6134f24 100644 --- a/plugin-markerview/build.gradle +++ b/plugin-markerview/build.gradle @@ -1,5 +1,6 @@ apply plugin: 'com.android.library' apply plugin: 'com.jfrog.bintray' +apply plugin: 'com.jfrog.artifactory' android { compileSdkVersion androidVersions.compileSdkVersion diff --git a/plugin-offline/build.gradle b/plugin-offline/build.gradle index 84dc809ad..1a1b9877f 100644 --- a/plugin-offline/build.gradle +++ b/plugin-offline/build.gradle @@ -1,5 +1,6 @@ apply plugin: 'com.android.library' apply plugin: 'com.jfrog.bintray' +apply plugin: 'com.jfrog.artifactory' android { compileSdkVersion androidVersions.compileSdkVersion diff --git a/plugin-places/build.gradle b/plugin-places/build.gradle index 6b1ba2ffd..973f3cf57 100644 --- a/plugin-places/build.gradle +++ b/plugin-places/build.gradle @@ -1,5 +1,6 @@ apply plugin: 'com.android.library' apply plugin: 'com.jfrog.bintray' +apply plugin: 'com.jfrog.artifactory' android { compileSdkVersion androidVersions.compileSdkVersion diff --git a/plugin-scalebar/build.gradle b/plugin-scalebar/build.gradle index 7817e1c20..34ba8bb7d 100644 --- a/plugin-scalebar/build.gradle +++ b/plugin-scalebar/build.gradle @@ -1,5 +1,6 @@ apply plugin: 'com.android.library' apply plugin: 'com.jfrog.bintray' +apply plugin: 'com.jfrog.artifactory' android { compileSdkVersion androidVersions.compileSdkVersion diff --git a/plugin-traffic/build.gradle b/plugin-traffic/build.gradle index 185a63eee..65fbb1f8d 100644 --- a/plugin-traffic/build.gradle +++ b/plugin-traffic/build.gradle @@ -1,5 +1,6 @@ apply plugin: 'com.android.library' apply plugin: 'com.jfrog.bintray' +apply plugin: 'com.jfrog.artifactory' android { compileSdkVersion androidVersions.compileSdkVersion @@ -34,4 +35,4 @@ dependencies { apply from: "${rootDir}/gradle/javadoc.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 +apply from: "${rootDir}/gradle/gradle-bintray.gradle"