From 575362bf2f65f75f3d9490dd0755802392ee6571 Mon Sep 17 00:00:00 2001
From: Ismael Henchi <ish@proxy.co>
Date: Fri, 30 Jul 2021 15:39:55 -0700
Subject: [PATCH] ci: Publish RxAndroidBle fork to Artifactory (DROID-1123)
 (#6)

* ci: Publish RxAndroidBle fork to Artifactory (DROID-1123)

* remove artifactory credentials
---
 .DS_Store                           | Bin 0 -> 6148 bytes
 build.gradle                        |   3 +-
 dagger-compiler-shadow/build.gradle |   3 --
 dagger-library-shadow/build.gradle  |   4 +--
 gradle.properties                   |   5 +++-
 gradle/.DS_Store                    | Bin 0 -> 6148 bytes
 gradle/artifactory-publish.gradle   |  43 ++++++++++++++++++++++++++++
 mockrxandroidble/build.gradle       |   4 +--
 rxandroidble/build.gradle           |   4 +--
 sample-kotlin/build.gradle          |   3 --
 sample/build.gradle                 |   4 ---
 11 files changed, 52 insertions(+), 21 deletions(-)
 create mode 100644 .DS_Store
 create mode 100644 gradle/.DS_Store
 create mode 100644 gradle/artifactory-publish.gradle

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..b923c817416c48f3df2c122fb4a347f889cd659a
GIT binary patch
literal 6148
zcmeHK%}N6?5Kh{vX+_+FV2`<Y>!I}zdJvXc58i|oJ*c$1Y-tzP-O}A!v{v>t^o@K1
zU&omwEiBc87ZE!HlW#JaNyxWLCSi>6*4S?_W--PDC}N=u%@=~>s7q2X9z?F@2wBgY
zBttKZy`^Y!{6z-v+pV)c8!?ypEdTx9y<r$6X}$iz3&qmf`i2k{QQ4~8IfHoOq;5J+
zTJGoudlzmx@Qi&K$Kk?uy{n)%=~z3bag@42)ElYf!0$oG?R60O@uU@xBR^5|IC?;c
zvM6_~>U4T|a9oo|_2#T5r_KF(O@d=KD~sK|#>sj2{_$!0JbQW7%yRe%m24ZF!y6d6
zO+GlID2$^%_~$wESVCfe7$62#fB|##iOm(*D{YY&AO?QM0G<yL6wx-AX;eoCG<bc)
z@e(2m*!Y$}lm=~snMN1^;W`yir*iYe;5r@r(!|*YGmSc(akVncV^-$og~HY9;Fl_#
zaa$v`!~ijnXP~IN7S{i>@8AFVB<c|Z#K6B|fS1}%y9HY^wRLH8SZgI{7Ze5KGL4HA
jFjOgqSS-a=P$l4(XaL#<GmYQ@p^Jc`ff{1qR~h&OlipH6

literal 0
HcmV?d00001

diff --git a/build.gradle b/build.gradle
index b533eea4d..990c78f54 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,7 @@ buildscript {
         classpath 'com.github.ben-manes:gradle-versions-plugin:0.21.0'
         classpath 'gradle.plugin.org.codehaus.groovy:groovy-android-gradle-plugin:3.0.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
+        classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.17.2'
     }
 }
 
@@ -33,6 +33,7 @@ allprojects {
         repositories {
             google()
             jcenter()
+            maven { url 'https://jitpack.io' }
         }
     }
 
diff --git a/dagger-compiler-shadow/build.gradle b/dagger-compiler-shadow/build.gradle
index 6fa3809f2..d75356448 100644
--- a/dagger-compiler-shadow/build.gradle
+++ b/dagger-compiler-shadow/build.gradle
@@ -9,9 +9,6 @@ buildscript {
 
 apply plugin: 'java'
 apply plugin: 'com.github.johnrengelman.shadow'
-apply plugin: 'com.github.dcendents.android-maven'
-
-group='com.github.proxyco'
 
 def buildSrcDir = '../gradle'
 apply from: "${buildSrcDir}/shadow.gradle"
diff --git a/dagger-library-shadow/build.gradle b/dagger-library-shadow/build.gradle
index 1bdfb042b..e529dab6d 100644
--- a/dagger-library-shadow/build.gradle
+++ b/dagger-library-shadow/build.gradle
@@ -11,9 +11,7 @@ apply plugin: 'java'
 apply plugin: 'com.github.johnrengelman.shadow'
 //apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
 
-apply plugin: 'com.github.dcendents.android-maven'
-
-group='com.github.proxyco'
+apply from: rootProject.file('gradle/artifactory-publish.gradle')
 
 def buildSrcDir = '../gradle'
 apply from: "${buildSrcDir}/shadow.gradle"
diff --git a/gradle.properties b/gradle.properties
index ffac552a3..c9c523cf6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-GROUP=com.polidea.rxandroidble2
+GROUP=co.proxy
 VERSION_NAME=1.13.0
 
 POM_DESCRIPTION=RxJava backed support for Bluetooth Low Energy in Android
@@ -19,3 +19,6 @@ POM_DEVELOPER_NAME2=Paweł Urban
 
 android.useAndroidX=true
 android.enableJetifier=false
+
+artifactoryUsername={1password}
+artifactoryPassword={1password}
\ No newline at end of file
diff --git a/gradle/.DS_Store b/gradle/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..a2aab0c728cc09f0244ae0342e292c89edf34780
GIT binary patch
literal 6148
zcmeHK%Wl&^6ur|1>I5OOKx)Ox8+L)FyrfpDWK6n1LI`0f3qY-nO=HRNSoXLkgjD_w
z_#?i6-{H(7s3owe1fpoJG;{8A9w!=4hKQJ7$6G{wB683qc6#W3Au=x8lB^g{2guYI
z?<u5rB#2YFlx-cB0n5O@#(+G#H*ji8oZ6I5pWi9nqJnCQC_|*8G2Nyk<b@Q&lN2I)
zQddHr^BoFkiVQ&sO=y$$asD$@PGDECN2n2KoAeTPf-$7GMAjJIT<Hns;>!P=KF~vW
zW0jEteK{YpPR$PM{Of*d)_tyhW8O7t6b}W~jNL>{RYVz&5cwJvSz3wV@EcoM?OeLN
z<~Tj4ceVF681p6&p{OfAEMH6OSt!Pl(O+<${m{c`KTVp0{`E&Z7h#$wr7BM21SxM`
zrFqO7pVxU@sc`}waGb8wJ?L-DX7}zs7`XR`+w*}t+rBd#xNywpU1$B~*6!oO$@Jsw
z)BNN!77JncY%95DZ~<SS{It#Epv*I#A0e`+T4Y<ikPMig(YbOVS8o?>8L$leNe1Ni
z!9|nk8EiGGPX{{n1OUpv5lW!Tw}h;54SEJ!jfg;)E(PjRW}X;Km&5OxJkMaOQI``l
zj}K;MX6A*$)a)4FRq4b$jkdQ8SO(5Au&T|zy#M!p|NcK)WG%~pW#GSJfOST}$j6q<
z-MX|ndDpsVhiFn{UaL`+pflI8Qsh;<fu;m8S1LfyV5<=xi2Wm=Xt14S;IA_99r1RK
A2><{9

literal 0
HcmV?d00001

diff --git a/gradle/artifactory-publish.gradle b/gradle/artifactory-publish.gradle
new file mode 100644
index 000000000..6316282b1
--- /dev/null
+++ b/gradle/artifactory-publish.gradle
@@ -0,0 +1,43 @@
+apply plugin: 'com.jfrog.artifactory'
+apply plugin: 'maven-publish'
+
+def isAndroidProject() {
+    return project.getPlugins().hasPlugin('com.android.application') || project.getPlugins().hasPlugin('com.android.library')
+}
+
+afterEvaluate {
+    publishing {
+        publications {
+            aar(MavenPublication) {
+                if (isAndroidProject()) {
+                    from components.release
+                }
+                else {
+                    from components.java
+                }
+
+                groupId = GROUP
+                artifactId = POM_ARTIFACT_ID
+                version = VERSION_NAME
+            }
+        }
+    }
+
+    artifactory {
+        contextUrl = 'https://proxyco.jfrog.io/proxyco'
+        publish {
+            repository {
+                repoKey = 'android-apps'
+                username = artifactoryUsername
+                password = artifactoryPassword
+                maven = true
+                publishArtifacts = true
+                publishPom = true
+            }
+        }
+    }
+
+    artifactoryPublish {
+        publications(publishing.publications.aar)
+    }
+}
\ No newline at end of file
diff --git a/mockrxandroidble/build.gradle b/mockrxandroidble/build.gradle
index 5bcd2b9bc..b0e0d2646 100644
--- a/mockrxandroidble/build.gradle
+++ b/mockrxandroidble/build.gradle
@@ -2,9 +2,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'groovyx.android'
 //apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
 
-apply plugin: 'com.github.dcendents.android-maven'
-
-group='com.github.proxyco'
+apply from: rootProject.file('gradle/artifactory-publish.gradle')
 
 android {
     compileSdkVersion 31
diff --git a/rxandroidble/build.gradle b/rxandroidble/build.gradle
index f79fa8a39..f6b91282e 100644
--- a/rxandroidble/build.gradle
+++ b/rxandroidble/build.gradle
@@ -2,9 +2,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'groovyx.android'
 //apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
 
-apply plugin: 'com.github.dcendents.android-maven'
-
-group='com.github.proxyco'
+apply from: rootProject.file('gradle/artifactory-publish.gradle')
 
 android {
     compileSdkVersion 31
diff --git a/sample-kotlin/build.gradle b/sample-kotlin/build.gradle
index ed9afbda3..f42dd3847 100644
--- a/sample-kotlin/build.gradle
+++ b/sample-kotlin/build.gradle
@@ -1,9 +1,6 @@
 apply plugin: 'com.android.application'
 apply plugin: 'org.jetbrains.kotlin.android'
 apply plugin: 'org.jetbrains.kotlin.android.extensions'
-apply plugin: 'com.github.dcendents.android-maven'
-
-group='com.github.proxyco'
 
 android {
     compileSdkVersion 31
diff --git a/sample/build.gradle b/sample/build.gradle
index c7ba516fc..74ab034a9 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -1,9 +1,5 @@
 apply plugin: 'com.android.application'
 
-apply plugin: 'com.github.dcendents.android-maven'
-
-group='com.github.proxyco'
-
 buildscript {
     repositories {
         mavenCentral()