From a618f8ca4f6228b008af914202a463cefb181720 Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Thu, 24 Jun 2021 21:17:19 +0100
Subject: [PATCH 1/7] configure maven central publishing

---
 .gitlab-ci.yml                                |   2 ++
 .../lbry/build/templates/build.tmpl.gradle    |  22 +++++++++---------
 .../build/templates/build.tmpl.gradle.arm     |  22 +++++++++---------
 .../lbry/build/templates/gradle.properties    |   9 ++++++-
 signing.pgp                                   | Bin 0 -> 3792 bytes
 5 files changed, 32 insertions(+), 23 deletions(-)
 create mode 100644 signing.pgp

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 500ba17..e26a755 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,6 +14,7 @@ build arm64 aar:
       - bin/lbrysdk-*-release__arm64.aar
     expire_in: 1 week
   script:
+    - export NEXUS_SIGNING_KEYRING_FILE=$CI_PROJECT_DIR/signing.pgp
     - export PATH=/usr/bin:$PATH
     - wget -q 'https://eu.crystax.net/download/crystax-ndk-10.3.2-linux-x86_64.tar.xz' -P ~/.buildozer/android/
     - tar -xf ~/.buildozer/android/crystax-ndk-10.3.2-linux-x86_64.tar.xz -C ~/.buildozer/android/
@@ -38,6 +39,7 @@ build arm aar:
       - bin/lbrysdk-*-release__arm.aar
     expire_in: 1 week
   script:
+    - export NEXUS_SIGNING_KEYRING_FILE=$CI_PROJECT_DIR/signing.pgp
     - export PATH=/usr/bin:$PATH
     - wget -q 'https://eu.crystax.net/download/crystax-ndk-10.3.2-linux-x86_64.tar.xz' -P ~/.buildozer/android/
     - tar -xf ~/.buildozer/android/crystax-ndk-10.3.2-linux-x86_64.tar.xz -C ~/.buildozer/android/
diff --git a/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle b/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle
index 455e610..fcac5cd 100644
--- a/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle
+++ b/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle
@@ -3,11 +3,12 @@ buildscript {
     repositories {
         jcenter()
         google()
+        mavenCentral()
         maven { url "https://jitpack.io" }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.4.2'
-        classpath 'com.novoda:bintray-release:0.9.2'
+        classpath 'com.bmuschko:gradle-nexus-plugin:2.3.1'
     }
 }
 
@@ -24,7 +25,11 @@ allprojects {
 }
 
 apply plugin: 'com.android.library'
-apply plugin: 'com.novoda.bintray-release'
+apply plugin: 'com.bmuschko.nexus'
+
+archivesBaseName = 'lbrysdk64'
+group = "io.lbry"
+version = "{{ args.version }}"
 
 android {
     compileSdkVersion {{ android_api }}
@@ -96,15 +101,10 @@ 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'
+nexus {
+    sign = true
+    repositoryUrl = 'https://oss.sonatype.org/service/local/staging/deploy/maven2/'
+    snapshotRepositoryUrl = 'https://oss.sonatype.org/content/repositories/snapshots/'
 }
 
 dependencies {
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 22e415f..95f85b9 100644
--- a/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle.arm
+++ b/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle.arm
@@ -3,11 +3,12 @@ buildscript {
     repositories {
         jcenter()
         google()
+        mavenCentral()
         maven { url "https://jitpack.io" }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.4.2'
-        classpath 'com.novoda:bintray-release:0.9.2'
+        classpath 'com.bmuschko:gradle-nexus-plugin:2.3.1'
     }
 }
 
@@ -24,7 +25,11 @@ allprojects {
 }
 
 apply plugin: 'com.android.library'
-apply plugin: 'com.novoda.bintray-release'
+apply plugin: 'com.bmuschko.nexus'
+
+archivesBaseName = 'lbrysdk32'
+group = "io.lbry"
+version = "{{ args.version }}"
 
 android {
     compileSdkVersion {{ android_api }}
@@ -96,15 +101,10 @@ 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'
+nexus {
+    sign = true
+    repositoryUrl = 'https://oss.sonatype.org/service/local/staging/deploy/maven2/'
+    snapshotRepositoryUrl = 'https://oss.sonatype.org/content/repositories/snapshots/'
 }
 
 dependencies {
diff --git a/p4a/pythonforandroid/bootstraps/lbry/build/templates/gradle.properties b/p4a/pythonforandroid/bootstraps/lbry/build/templates/gradle.properties
index d015431..709347b 100644
--- a/p4a/pythonforandroid/bootstraps/lbry/build/templates/gradle.properties
+++ b/p4a/pythonforandroid/bootstraps/lbry/build/templates/gradle.properties
@@ -1,2 +1,9 @@
 android.useAndroidX=true
-android.enableJetifier=true
\ No newline at end of file
+android.enableJetifier=true
+
+nexusUsername=${env.SONATYPE_USERNAME}
+nexusPassword=${env.SONATYPE_PASSWORD}
+
+signing.keyId=${env.NEXUS_SIGNING_KEY_ID}
+signing.password=${env.NEXUS_SIGNING_KEY_PASSWORD}
+signing.secretKeyRingFile=${env.NEXUS_SIGNING_KEYRING_FILE}
diff --git a/signing.pgp b/signing.pgp
new file mode 100644
index 0000000000000000000000000000000000000000..9f58bb2e322e1377adf3166e6354046b087bdab5
GIT binary patch
literal 3792
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

literal 0
HcmV?d00001

-- 
2.45.2


From 5b20ed413d39a8b5d18e5eb6bc3739a6a091c4f6 Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Thu, 24 Jun 2021 21:38:23 +0100
Subject: [PATCH 2/7] remove bintrayUpload argument

---
 p4a/pythonforandroid/toolchain.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/p4a/pythonforandroid/toolchain.py b/p4a/pythonforandroid/toolchain.py
index be5e14a..02a79f0 100644
--- a/p4a/pythonforandroid/toolchain.py
+++ b/p4a/pythonforandroid/toolchain.py
@@ -865,9 +865,6 @@ class ToolchainCL(object):
                     raise BuildInterruptingException(
                         "Unknown build mode {} for apk()".format(args.build_mode))
                 output = shprint(gradlew, "--console=plain", gradle_task,
-                                 "bintrayUpload",
-                                 "-PdryRun=false",
-                                 "-Poverride=true",
                                  _tail=20,
                                  _critical=True, _env=env)
 
-- 
2.45.2


From 24a2d2a95ee38a497142f02a84ac0f165f753608 Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Thu, 24 Jun 2021 21:50:45 +0100
Subject: [PATCH 3/7] update nexus repository url

---
 .../bootstraps/lbry/build/templates/build.tmpl.gradle         | 4 ++--
 .../bootstraps/lbry/build/templates/build.tmpl.gradle.arm     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle b/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle
index fcac5cd..45c3e0b 100644
--- a/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle
+++ b/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle
@@ -103,8 +103,8 @@ subprojects {
 
 nexus {
     sign = true
-    repositoryUrl = 'https://oss.sonatype.org/service/local/staging/deploy/maven2/'
-    snapshotRepositoryUrl = 'https://oss.sonatype.org/content/repositories/snapshots/'
+    repositoryUrl = 'https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/'
+    snapshotRepositoryUrl = 'https://s01.oss.sonatype.org/content/repositories/snapshots/'
 }
 
 dependencies {
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 95f85b9..2d4e05d 100644
--- a/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle.arm
+++ b/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle.arm
@@ -103,8 +103,8 @@ subprojects {
 
 nexus {
     sign = true
-    repositoryUrl = 'https://oss.sonatype.org/service/local/staging/deploy/maven2/'
-    snapshotRepositoryUrl = 'https://oss.sonatype.org/content/repositories/snapshots/'
+    repositoryUrl = 'https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/'
+    snapshotRepositoryUrl = 'https://s01.oss.sonatype.org/content/repositories/snapshots/'
 }
 
 dependencies {
-- 
2.45.2


From e993c0e3976cc496316accb40a7e95c99cedb97d Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Thu, 24 Jun 2021 21:56:03 +0100
Subject: [PATCH 4/7] change archivesBaseName

---
 .../bootstraps/lbry/build/templates/build.tmpl.gradle           | 2 +-
 .../bootstraps/lbry/build/templates/build.tmpl.gradle.arm       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle b/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle
index 45c3e0b..aaf72aa 100644
--- a/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle
+++ b/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle
@@ -27,7 +27,7 @@ allprojects {
 apply plugin: 'com.android.library'
 apply plugin: 'com.bmuschko.nexus'
 
-archivesBaseName = 'lbrysdk64'
+archivesBaseName = 'lbrysdk'
 group = "io.lbry"
 version = "{{ args.version }}"
 
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 2d4e05d..e5eaa35 100644
--- a/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle.arm
+++ b/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle.arm
@@ -27,7 +27,7 @@ allprojects {
 apply plugin: 'com.android.library'
 apply plugin: 'com.bmuschko.nexus'
 
-archivesBaseName = 'lbrysdk32'
+archivesBaseName = 'lbrysdk'
 group = "io.lbry"
 version = "{{ args.version }}"
 
-- 
2.45.2


From 2eb913cb629552c37347c5e62a82aea6abd1c5b6 Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Thu, 24 Jun 2021 22:11:16 +0100
Subject: [PATCH 5/7] add uploadArchives task argument

---
 .../bootstraps/lbry/build/templates/build.tmpl.gradle     | 8 ++++++++
 .../bootstraps/lbry/build/templates/build.tmpl.gradle.arm | 8 ++++++++
 p4a/pythonforandroid/toolchain.py                         | 1 +
 3 files changed, 17 insertions(+)

diff --git a/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle b/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle
index aaf72aa..553ac07 100644
--- a/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle
+++ b/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle
@@ -107,6 +107,14 @@ nexus {
     snapshotRepositoryUrl = 'https://s01.oss.sonatype.org/content/repositories/snapshots/'
 }
 
+uploadArchives {
+    repositories {
+        mavenDeployer {
+            pom.artifactId = "lbrysdk64"
+        }
+    }
+}
+
 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 e5eaa35..49168f3 100644
--- a/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle.arm
+++ b/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle.arm
@@ -107,6 +107,14 @@ nexus {
     snapshotRepositoryUrl = 'https://s01.oss.sonatype.org/content/repositories/snapshots/'
 }
 
+uploadArchives {
+    repositories {
+        mavenDeployer {
+            pom.artifactId = "lbrysdk32"
+        }
+    }
+}
+
 dependencies {
     {%- for aar in aars %}
     compile(name: '{{ aar }}', ext: 'aar')
diff --git a/p4a/pythonforandroid/toolchain.py b/p4a/pythonforandroid/toolchain.py
index 02a79f0..a310723 100644
--- a/p4a/pythonforandroid/toolchain.py
+++ b/p4a/pythonforandroid/toolchain.py
@@ -865,6 +865,7 @@ class ToolchainCL(object):
                     raise BuildInterruptingException(
                         "Unknown build mode {} for apk()".format(args.build_mode))
                 output = shprint(gradlew, "--console=plain", gradle_task,
+                                 "uploadArchives",
                                  _tail=20,
                                  _critical=True, _env=env)
 
-- 
2.45.2


From bfc95cc1304ffca447a6948cc10d86edc7fd03ac Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Thu, 24 Jun 2021 22:55:44 +0100
Subject: [PATCH 6/7] fix template rendering

---
 p4a/pythonforandroid/bootstraps/lbry/build/build.py    |  5 ++++-
 .../bootstraps/lbry/build/templates/gradle.properties  | 10 +++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/p4a/pythonforandroid/bootstraps/lbry/build/build.py b/p4a/pythonforandroid/bootstraps/lbry/build/build.py
index 21da781..59857a9 100755
--- a/p4a/pythonforandroid/bootstraps/lbry/build/build.py
+++ b/p4a/pythonforandroid/bootstraps/lbry/build/build.py
@@ -404,7 +404,10 @@ main.py that loads it.''')
         android_api=android_api,
         build_tools_version=build_tools_version)
 
-    render('gradle.properties', 'gradle.properties')
+    render(
+        'gradle.properties',
+        'gradle.properties',
+        env=os.environ)
 
     # copy icon drawables
     for folder in ('drawable-hdpi', 'drawable-mdpi', 'drawable-xhdpi', 'drawable-xxhdpi', 'drawable-xxxhdpi'):
diff --git a/p4a/pythonforandroid/bootstraps/lbry/build/templates/gradle.properties b/p4a/pythonforandroid/bootstraps/lbry/build/templates/gradle.properties
index 709347b..f7a8396 100644
--- a/p4a/pythonforandroid/bootstraps/lbry/build/templates/gradle.properties
+++ b/p4a/pythonforandroid/bootstraps/lbry/build/templates/gradle.properties
@@ -1,9 +1,9 @@
 android.useAndroidX=true
 android.enableJetifier=true
 
-nexusUsername=${env.SONATYPE_USERNAME}
-nexusPassword=${env.SONATYPE_PASSWORD}
+nexusUsername={{ env["SONATYPE_USERNAME"] }}
+nexusPassword={{ env["SONATYPE_PASSWORD"] }}
 
-signing.keyId=${env.NEXUS_SIGNING_KEY_ID}
-signing.password=${env.NEXUS_SIGNING_KEY_PASSWORD}
-signing.secretKeyRingFile=${env.NEXUS_SIGNING_KEYRING_FILE}
+signing.keyId={{ env["NEXUS_SIGNING_KEY_ID"] }}
+signing.password={{ env["NEXUS_SIGNING_KEY_PASSWORD"] }}
+signing.secretKeyRingFile={{ env["NEXUS_SIGNING_KEYRING_FILE"] }}
-- 
2.45.2


From ec4044647c81b7926f2ea3c2499fa2aedef957b3 Mon Sep 17 00:00:00 2001
From: Akinwale Ariwodola <akinwale@gmail.com>
Date: Fri, 25 Jun 2021 00:01:42 +0100
Subject: [PATCH 7/7] use modifyPom to update artifactId

---
 .../bootstraps/lbry/build/templates/build.tmpl.gradle | 11 ++++++-----
 .../lbry/build/templates/build.tmpl.gradle.arm        | 11 ++++++-----
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle b/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle
index 553ac07..34d5198 100644
--- a/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle
+++ b/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle
@@ -107,11 +107,12 @@ nexus {
     snapshotRepositoryUrl = 'https://s01.oss.sonatype.org/content/repositories/snapshots/'
 }
 
-uploadArchives {
-    repositories {
-        mavenDeployer {
-            pom.artifactId = "lbrysdk64"
-        }
+modifyPom {
+    project {
+        name 'LBRY SDK for Android'
+        description 'The LBRY SDK packaged as an Android AAR'
+        groupId 'io.lbry'
+        artifactId 'lbrysdk64'
     }
 }
 
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 49168f3..b418f27 100644
--- a/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle.arm
+++ b/p4a/pythonforandroid/bootstraps/lbry/build/templates/build.tmpl.gradle.arm
@@ -107,11 +107,12 @@ nexus {
     snapshotRepositoryUrl = 'https://s01.oss.sonatype.org/content/repositories/snapshots/'
 }
 
-uploadArchives {
-    repositories {
-        mavenDeployer {
-            pom.artifactId = "lbrysdk32"
-        }
+modifyPom {
+    project {
+        name 'LBRY SDK for Android'
+        description 'The LBRY SDK packaged as an Android AAR'
+        groupId 'io.lbry'
+        artifactId 'lbrysdk32'
     }
 }
 
-- 
2.45.2