Bintray deploy (#7)
* update shprint. update arm build.gradle * use environ.get to retrieve bintray variables * Set MIT license. Add override parameter.
This commit is contained in:
parent
5e1f864898
commit
65c8099d2d
5 changed files with 34 additions and 2 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -18,4 +18,3 @@ p4a/pythonforandroid/bootstraps/lbry/build/templates/google-services.json
|
||||||
|
|
||||||
p4a/*.apk
|
p4a/*.apk
|
||||||
p4a/*.aar
|
p4a/*.aar
|
||||||
|
|
||||||
|
|
|
@ -7,6 +7,7 @@ buildscript {
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'com.android.tools.build:gradle:3.4.2'
|
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.android.library'
|
||||||
|
apply plugin: 'com.novoda.bintray-release'
|
||||||
|
|
||||||
android {
|
android {
|
||||||
compileSdkVersion {{ android_api }}
|
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 {
|
dependencies {
|
||||||
{%- for aar in aars %}
|
{%- for aar in aars %}
|
||||||
compile(name: '{{ aar }}', ext: 'aar')
|
compile(name: '{{ aar }}', ext: 'aar')
|
||||||
|
|
|
@ -7,6 +7,7 @@ buildscript {
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'com.android.tools.build:gradle:3.4.2'
|
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.android.library'
|
||||||
|
apply plugin: 'com.novoda.bintray-release'
|
||||||
|
|
||||||
android {
|
android {
|
||||||
compileSdkVersion {{ android_api }}
|
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 {
|
dependencies {
|
||||||
{%- for aar in aars %}
|
{%- for aar in aars %}
|
||||||
compile(name: '{{ aar }}', ext: 'aar')
|
compile(name: '{{ aar }}', ext: 'aar')
|
||||||
|
|
|
@ -159,6 +159,7 @@ def shprint(command, *args, **kwargs):
|
||||||
columns = get_console_width()
|
columns = get_console_width()
|
||||||
command_path = str(command).split('/')
|
command_path = str(command).split('/')
|
||||||
command_string = command_path[-1]
|
command_string = command_path[-1]
|
||||||
|
|
||||||
string = ' '.join(['{}->{} running'.format(Out_Fore.LIGHTBLACK_EX,
|
string = ' '.join(['{}->{} running'.format(Out_Fore.LIGHTBLACK_EX,
|
||||||
Out_Style.RESET_ALL),
|
Out_Style.RESET_ALL),
|
||||||
command_string] + list(args))
|
command_string] + list(args))
|
||||||
|
|
|
@ -845,6 +845,8 @@ class ToolchainCL(object):
|
||||||
# gradle-based build
|
# gradle-based build
|
||||||
env["ANDROID_NDK_HOME"] = self.ctx.ndk_dir
|
env["ANDROID_NDK_HOME"] = self.ctx.ndk_dir
|
||||||
env["ANDROID_HOME"] = self.ctx.sdk_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')
|
gradlew = sh.Command('./gradlew')
|
||||||
if exists('/usr/bin/dos2unix'):
|
if exists('/usr/bin/dos2unix'):
|
||||||
|
@ -862,7 +864,11 @@ class ToolchainCL(object):
|
||||||
else:
|
else:
|
||||||
raise BuildInterruptingException(
|
raise BuildInterruptingException(
|
||||||
"Unknown build mode {} for apk()".format(args.build_mode))
|
"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)
|
_critical=True, _env=env)
|
||||||
|
|
||||||
# gradle output apks somewhere else
|
# gradle output apks somewhere else
|
||||||
|
|
Loading…
Reference in a new issue