From 5e39e727ecca7eb5f6e021c08182c2469ddca396 Mon Sep 17 00:00:00 2001 From: Akinwale Ariwodola Date: Mon, 24 Feb 2020 16:07:02 +0100 Subject: [PATCH 1/2] sdk 0.60.1 --- buildozer.spec.arm.ci | 2 +- buildozer.spec.arm64.ci | 2 +- buildozer.spec.sample | 2 +- buildozer.spec.vagrant | 2 +- src/main/python/main.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/buildozer.spec.arm.ci b/buildozer.spec.arm.ci index 0475f8d..d614e61 100644 --- a/buildozer.spec.arm.ci +++ b/buildozer.spec.arm.ci @@ -39,7 +39,7 @@ version.filename = %(source.dir)s/main.py # (list) Application requirements # comma seperated e.g. requirements = sqlite3,kivy -requirements = python3crystax, openssl, sqlite3, hostpython3crystax, android, distro==1.4.0, pyjnius, certifi==2018.11.29, appdirs==1.4.3, docopt==0.6.2, base58==1.0.0, colorama==0.3.7, ecdsa==0.13.3, jsonschema==2.6.0, pbkdf2==1.3, pyyaml, protobuf==3.6.1, keyring==10.4.0, defusedxml, git+https://github.com/lbryio/aioupnp.git@ab7ef0048bbce6404e463d20e8a15046ea6941f0#egg=aioupnp, asn1crypto, mock, netifaces, cryptography, aiohttp==3.5.4, multidict==4.5.2, yarl==1.3.0, chardet==3.0.4, async_timeout==3.0.1, coincurve, msgpack==0.6.1, six, attrs==18.2.0, pylru, hachoir, prometheus_client==0.7.1, "git+https://github.com/lbryio/lbry-sdk@v0.60.0#egg=lbry" +requirements = python3crystax, openssl, sqlite3, hostpython3crystax, android, distro==1.4.0, pyjnius, certifi==2018.11.29, appdirs==1.4.3, docopt==0.6.2, base58==1.0.0, colorama==0.3.7, ecdsa==0.13.3, jsonschema==2.6.0, pbkdf2==1.3, pyyaml, protobuf==3.6.1, keyring==10.4.0, defusedxml, git+https://github.com/lbryio/aioupnp.git@ab7ef0048bbce6404e463d20e8a15046ea6941f0#egg=aioupnp, asn1crypto, mock, netifaces, cryptography, aiohttp==3.5.4, multidict==4.5.2, yarl==1.3.0, chardet==3.0.4, async_timeout==3.0.1, coincurve, msgpack==0.6.1, six, attrs==18.2.0, pylru, hachoir, prometheus_client==0.7.1, "git+https://github.com/lbryio/lbry-sdk@v0.60.1#egg=lbry" # (str) Custom source folders for requirements # Sets custom source for any requirements with recipes diff --git a/buildozer.spec.arm64.ci b/buildozer.spec.arm64.ci index 7c57366..1355b0f 100644 --- a/buildozer.spec.arm64.ci +++ b/buildozer.spec.arm64.ci @@ -39,7 +39,7 @@ version.filename = %(source.dir)s/main.py # (list) Application requirements # comma seperated e.g. requirements = sqlite3,kivy -requirements = python3crystax, openssl, sqlite3, hostpython3crystax, android, distro==1.4.0, pyjnius, certifi==2018.11.29, appdirs==1.4.3, docopt==0.6.2, base58==1.0.0, colorama==0.3.7, ecdsa==0.13.3, jsonschema==2.6.0, pbkdf2==1.3, pyyaml, protobuf==3.6.1, keyring==10.4.0, defusedxml, git+https://github.com/lbryio/aioupnp.git@ab7ef0048bbce6404e463d20e8a15046ea6941f0#egg=aioupnp, asn1crypto, mock, netifaces, cryptography, aiohttp==3.5.4, multidict==4.5.2, yarl==1.3.0, chardet==3.0.4, async_timeout==3.0.1, coincurve, msgpack==0.6.1, six, attrs==18.2.0, pylru, hachoir, prometheus_client==0.7.1, "git+https://github.com/lbryio/lbry-sdk@v0.60.0#egg=lbry" +requirements = python3crystax, openssl, sqlite3, hostpython3crystax, android, distro==1.4.0, pyjnius, certifi==2018.11.29, appdirs==1.4.3, docopt==0.6.2, base58==1.0.0, colorama==0.3.7, ecdsa==0.13.3, jsonschema==2.6.0, pbkdf2==1.3, pyyaml, protobuf==3.6.1, keyring==10.4.0, defusedxml, git+https://github.com/lbryio/aioupnp.git@ab7ef0048bbce6404e463d20e8a15046ea6941f0#egg=aioupnp, asn1crypto, mock, netifaces, cryptography, aiohttp==3.5.4, multidict==4.5.2, yarl==1.3.0, chardet==3.0.4, async_timeout==3.0.1, coincurve, msgpack==0.6.1, six, attrs==18.2.0, pylru, hachoir, prometheus_client==0.7.1, "git+https://github.com/lbryio/lbry-sdk@v0.60.1#egg=lbry" # (str) Custom source folders for requirements # Sets custom source for any requirements with recipes diff --git a/buildozer.spec.sample b/buildozer.spec.sample index 2ff7868..c834176 100644 --- a/buildozer.spec.sample +++ b/buildozer.spec.sample @@ -39,7 +39,7 @@ version.filename = %(source.dir)s/main.py # (list) Application requirements # comma seperated e.g. requirements = sqlite3,kivy -requirements = python3crystax, openssl, sqlite3, hostpython3crystax, android, distro==1.4.0, pyjnius, certifi==2018.11.29, appdirs==1.4.3, docopt==0.6.2, base58==1.0.0, colorama==0.3.7, ecdsa==0.13.3, jsonschema==2.6.0, pbkdf2==1.3, pyyaml, protobuf==3.6.1, keyring==10.4.0, defusedxml, git+https://github.com/lbryio/aioupnp.git@ab7ef0048bbce6404e463d20e8a15046ea6941f0#egg=aioupnp, asn1crypto, mock, netifaces, cryptography, aiohttp==3.5.4, multidict==4.5.2, yarl==1.3.0, chardet==3.0.4, async_timeout==3.0.1, coincurve, msgpack==0.6.1, six, attrs==18.2.0, pylru, hachoir, prometheus_client==0.7.1, "git+https://github.com/lbryio/lbry-sdk@v0.60.0#egg=lbry" +requirements = python3crystax, openssl, sqlite3, hostpython3crystax, android, distro==1.4.0, pyjnius, certifi==2018.11.29, appdirs==1.4.3, docopt==0.6.2, base58==1.0.0, colorama==0.3.7, ecdsa==0.13.3, jsonschema==2.6.0, pbkdf2==1.3, pyyaml, protobuf==3.6.1, keyring==10.4.0, defusedxml, git+https://github.com/lbryio/aioupnp.git@ab7ef0048bbce6404e463d20e8a15046ea6941f0#egg=aioupnp, asn1crypto, mock, netifaces, cryptography, aiohttp==3.5.4, multidict==4.5.2, yarl==1.3.0, chardet==3.0.4, async_timeout==3.0.1, coincurve, msgpack==0.6.1, six, attrs==18.2.0, pylru, hachoir, prometheus_client==0.7.1, "git+https://github.com/lbryio/lbry-sdk@v0.60.1#egg=lbry" # (str) Custom source folders for requirements # Sets custom source for any requirements with recipes diff --git a/buildozer.spec.vagrant b/buildozer.spec.vagrant index c66e389..fac0168 100644 --- a/buildozer.spec.vagrant +++ b/buildozer.spec.vagrant @@ -39,7 +39,7 @@ version.filename = %(source.dir)s/main.py # (list) Application requirements # comma seperated e.g. requirements = sqlite3,kivy -requirements = python3crystax, openssl, sqlite3, hostpython3crystax, android, distro==1.4.0, pyjnius, certifi==2018.11.29, appdirs==1.4.3, docopt==0.6.2, base58==1.0.0, colorama==0.3.7, ecdsa==0.13.3, jsonschema==2.6.0, pbkdf2==1.3, pyyaml, protobuf==3.6.1, keyring==10.4.0, defusedxml, git+https://github.com/lbryio/aioupnp.git@ab7ef0048bbce6404e463d20e8a15046ea6941f0#egg=aioupnp, asn1crypto, mock, netifaces, cryptography, aiohttp==3.5.4, multidict==4.5.2, yarl==1.3.0, chardet==3.0.4, async_timeout==3.0.1, coincurve, msgpack==0.6.1, six, attrs==18.2.0, pylru, hachoir, prometheus_client==0.7.1, "git+https://github.com/lbryio/lbry-sdk@v0.60.0#egg=lbry" +requirements = python3crystax, openssl, sqlite3, hostpython3crystax, android, distro==1.4.0, pyjnius, certifi==2018.11.29, appdirs==1.4.3, docopt==0.6.2, base58==1.0.0, colorama==0.3.7, ecdsa==0.13.3, jsonschema==2.6.0, pbkdf2==1.3, pyyaml, protobuf==3.6.1, keyring==10.4.0, defusedxml, git+https://github.com/lbryio/aioupnp.git@ab7ef0048bbce6404e463d20e8a15046ea6941f0#egg=aioupnp, asn1crypto, mock, netifaces, cryptography, aiohttp==3.5.4, multidict==4.5.2, yarl==1.3.0, chardet==3.0.4, async_timeout==3.0.1, coincurve, msgpack==0.6.1, six, attrs==18.2.0, pylru, hachoir, prometheus_client==0.7.1, "git+https://github.com/lbryio/lbry-sdk@v0.60.1#egg=lbry" # (str) Custom source folders for requirements # Sets custom source for any requirements with recipes diff --git a/src/main/python/main.py b/src/main/python/main.py index 1232387..cbabfdc 100644 --- a/src/main/python/main.py +++ b/src/main/python/main.py @@ -1,5 +1,5 @@ # going forward, this should match sdk version -__version__ = "0.60.0" +__version__ = "0.60.1" class ServiceApp(App): def build(self): From 4dfb337c62314723036f897f5897aaf3ec388d8a Mon Sep 17 00:00:00 2001 From: Akinwale Ariwodola Date: Mon, 24 Feb 2020 16:08:53 +0100 Subject: [PATCH 2/2] do not create draft releases --- .gitlab-ci.yml | 1 - lbry-android.keystore.enc | Bin 2240 -> 0 bytes 2 files changed, 1 deletion(-) delete mode 100644 lbry-android.keystore.enc diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5126814..c2cf9ba 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -85,4 +85,3 @@ release aar: - export BUILD_APK_FILENAME__64=lbrysdk-$BUILD_VERSION-release__arm64.aar script: - githubrelease release lbryio/lbry-android-sdk create $CI_COMMIT_TAG --publish bin/$BUILD_APK_FILENAME__64 bin/$BUILD_APK_FILENAME__32 - - githubrelease release lbryio/lbry-android-sdk edit $CI_COMMIT_TAG --draft diff --git a/lbry-android.keystore.enc b/lbry-android.keystore.enc deleted file mode 100644 index 5da28d272f5df725a4199cde6fdf1cd937ba535a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2240 zcmV;x2tW7R^qly*H7B>kBP$MQn|(Gia*U4+bvh z*syU6sSW*KZ!3&8aR_1^H?_rWp3+NhmRaZ)tq0)rhwhoY8v!>^u;f?q zRVBBg$x;v&r1%;tI_e#CL$Io#5jX(7jpNTycu88GAL_q;mxAsWGrenMPQt@;Dh!ji zqA*!?g9$guH00M%isS4eaUl*BT&N_dF4l#z8I*!q;uD~*rBwp`eYu;So9N(s`d(N) zPj(Nq-ElBC$NVo0TT)2J#Mtr_6qtzj0>m%1qRqe+?3*dy#(LrXEhsvxYld`(`j04? zvQjPE)-hZVO+LQBE++Gz?KPV1qPTFbd9P%wN62L*TgZBcbPqwr_uH-Zs{+rph%wOz zP8aQzEI-f%3-|~{nj5AEl1E@~P;|YWCc39D+0qv*D#c92DVtfXf|}$z^h$e85nTwe zWQR)gjji+MvHWHj3Z1~C<_(K%Ur-&kQaU}TqtZ>Vl(Z9WiJf#0@)Ap~h* z?x|Pf`1Iv;S9)B6jJ?-%B>K6~>r|pXkEm*H)#yl~gk{FU)`6)x2d*G3a$itAX!WkC z$e%1LPS(|lj&r3caJ<6R0L31TNO8*fy}FJRu`5-X-0)ip+!8x=9AfkNheD!dG8Ls_ zlEutjzi~+3(eTPi!ZgaOz7vy*dOZ?AaMFUn9rtg{Cm=c3hf-9XFm#0`>!c?LRi%ie z86b8z=qC0*3FWUN1@_L20On!{NS5YVNoe*V5knQ6tTt!;?$V}3Qol26#)-W`f? zKqU*gjOW$O(pG@EyM zFY_J`o>_CTBA=M>(M61D>PcPI?M0gHdCopV)Ha(8uMNuB)stn6g)K&bp|KTP@XN(d zXQ^wh@rgy}r|n-N&jXr}x3fNjy(SY_L`|wOlTtvyNIi-9g>dlxWC<`r(Ai=N6AURg zk2q-m6oJ7!Ax`XS3lA6C%rh)Griqe;E|5?g!;Ec-=^d)CF5LVi$r@@=j9@9}1(i@| zWPz8sGoylIod%(8P*{+9Oh>{619os@<4WBfxug~1|F(e4*I_n)1i{rpaV52jFl3ic z<<2@8^~)y)Rcm9dx^zm3$)sHgfRP%=lmDC7tJRN8Tl@+)k<3Jq4_ z_3oC_xozeZUXEAu^Hi@_GFYO9c<2`yiI#C|v_1tFp@AVAP>pWLW`ANz#TwN0Q9cawy591uHC6qS&R~yv$}{#Do>F1Ql~KzNp1y}Uv*-x& zJhQ;sN<{A4Y;|3+hX8HsRTUYMiB81;LAd3%f#|l6@p0GI|H9s12RZFFZjK6)%T*#Y z95*#3^yDOm^YaQLJ%As~=TyQ+hJwDdNlv8^y+!vmOl$M%Js~u*dx80QbO|80zrZ-! zweNMV&nO*$`nSo#hl?+EziLQn*w9)Fvm7m+0^(P9hf_aj%KeYNNruRw*Rj6 zNM=yEi>!FW==Uj#iqmC`TrQokNzL^NQ&INnZu7{ZeE7I@p+|cL<05w{bEx8HDl?4) z`)f8MxNPKzR$OdZUhP^l8qxGzs7~O~3<6yY7d|{npOI6LpG8AyNGv*}Jr&O$D5t#+ zg4;uZyjK|@