From 65c8099d2dc5741853326c80eea25c52928f59a5 Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Tue, 9 Jun 2020 21:56:37 +0100
Subject: [PATCH] Bintray deploy (#7)

* update shprint. update arm build.gradle
* use environ.get to retrieve bintray variables
* Set MIT license. Add override parameter.
---
 .gitignore                                          |  1 -
 .../lbry/build/templates/build.tmpl.gradle          | 13 +++++++++++++
 .../lbry/build/templates/build.tmpl.gradle.arm      | 13 +++++++++++++
 p4a/pythonforandroid/logger.py                      |  1 +
 p4a/pythonforandroid/toolchain.py                   |  8 +++++++-
 5 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index fb5fa04..96477a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,4 +18,3 @@ p4a/pythonforandroid/bootstraps/lbry/build/templates/google-services.json
 
 p4a/*.apk
 p4a/*.aar
-
diff --git a/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle b/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle
index e5ff643..455e610 100644
--- a/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle
+++ b/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle
@@ -7,6 +7,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.4.2'
+        classpath 'com.novoda:bintray-release:0.9.2'
     }
 }
 
@@ -23,6 +24,7 @@ allprojects {
 }
 
 apply plugin: 'com.android.library'
+apply plugin: 'com.novoda.bintray-release'
 
 android {
     compileSdkVersion {{ android_api }}
@@ -94,6 +96,17 @@ subprojects {
     }
 }
 
+publish {
+    userOrg = 'lbryio'
+    repoName = 'io.lbry'
+    groupId = 'io.lbry'
+    artifactId = 'lbrysdk64'
+    publishVersion = '{{args.version}}'
+    licences = ['MIT']
+    desc = 'LBRY SDK packaged as Android AAR (64-bit)'
+    website = 'https://github.com/lbryio/lbry-android-sdk'
+}
+
 dependencies {
     {%- for aar in aars %}
     compile(name: '{{ aar }}', ext: 'aar')
diff --git a/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle.arm b/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle.arm
index 3053a42..22e415f 100644
--- a/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle.arm
+++ b/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle.arm
@@ -7,6 +7,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.4.2'
+        classpath 'com.novoda:bintray-release:0.9.2'
     }
 }
 
@@ -23,6 +24,7 @@ allprojects {
 }
 
 apply plugin: 'com.android.library'
+apply plugin: 'com.novoda.bintray-release'
 
 android {
     compileSdkVersion {{ android_api }}
@@ -94,6 +96,17 @@ subprojects {
     }
 }
 
+publish {
+    userOrg = 'lbryio'
+    repoName = 'io.lbry'
+    groupId = 'io.lbry'
+    artifactId = 'lbrysdk32'
+    publishVersion = '{{args.version}}'
+    licences = ['MIT']
+    desc = 'LBRY SDK packaged as Android AAR (32-bit)'
+    website = 'https://github.com/lbryio/lbry-android-sdk'
+}
+
 dependencies {
     {%- for aar in aars %}
     compile(name: '{{ aar }}', ext: 'aar')
diff --git a/p4a/pythonforandroid/logger.py b/p4a/pythonforandroid/logger.py
index 4aba39f..b25b94c 100644
--- a/p4a/pythonforandroid/logger.py
+++ b/p4a/pythonforandroid/logger.py
@@ -159,6 +159,7 @@ def shprint(command, *args, **kwargs):
     columns = get_console_width()
     command_path = str(command).split('/')
     command_string = command_path[-1]
+
     string = ' '.join(['{}->{} running'.format(Out_Fore.LIGHTBLACK_EX,
                                                Out_Style.RESET_ALL),
                        command_string] + list(args))
diff --git a/p4a/pythonforandroid/toolchain.py b/p4a/pythonforandroid/toolchain.py
index 6c2e13c..be5e14a 100644
--- a/p4a/pythonforandroid/toolchain.py
+++ b/p4a/pythonforandroid/toolchain.py
@@ -845,6 +845,8 @@ class ToolchainCL(object):
                 # gradle-based build
                 env["ANDROID_NDK_HOME"] = self.ctx.ndk_dir
                 env["ANDROID_HOME"] = self.ctx.sdk_dir
+                env["ORG_GRADLE_PROJECT_bintrayUser"] = environ.get("BINTRAY_USER")
+                env["ORG_GRADLE_PROJECT_bintrayKey"] = environ.get("BINTRAY_KEY")
 
                 gradlew = sh.Command('./gradlew')
                 if exists('/usr/bin/dos2unix'):
@@ -862,7 +864,11 @@ class ToolchainCL(object):
                 else:
                     raise BuildInterruptingException(
                         "Unknown build mode {} for apk()".format(args.build_mode))
-                output = shprint(gradlew, "--console=plain", gradle_task, _tail=20,
+                output = shprint(gradlew, "--console=plain", gradle_task,
+                                 "bintrayUpload",
+                                 "-PdryRun=false",
+                                 "-Poverride=true",
+                                 _tail=20,
                                  _critical=True, _env=env)
 
                 # gradle output apks somewhere else