From 3c2fd7f1b84b4de98a9f57f4a84b29c1915738a7 Mon Sep 17 00:00:00 2001 From: Andrey Filipenkov Date: Sun, 26 Feb 2023 14:14:51 +0300 Subject: [PATCH] fix build signing --- CI/android/signing.properties | 4 ++++ CI/android/vcmi-travis.jks | Bin 0 -> 2223 bytes android/vcmi-app/build.gradle | 13 +++++++------ 3 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 CI/android/signing.properties create mode 100644 CI/android/vcmi-travis.jks diff --git a/CI/android/signing.properties b/CI/android/signing.properties new file mode 100644 index 000000000..bc174e1f9 --- /dev/null +++ b/CI/android/signing.properties @@ -0,0 +1,4 @@ +STORE_FILE=vcmi-travis.jks +STORE_PASSWORD=traviskey +KEY_ALIAS=vcmitraviskey +KEY_PASSWORD=traviskey diff --git a/CI/android/vcmi-travis.jks b/CI/android/vcmi-travis.jks new file mode 100644 index 0000000000000000000000000000000000000000..9d1ac344b4d938d024ccaff760b24b317f3783cd GIT binary patch literal 2223 zcmcJQ`8(8$9>-@hVj99^%MxQ>j_(YzW*4C&WnZ&pH%!?Yk&#A=tQj;%Me8$uckYWCEpTFH8fPivtS2BvDoX^m?6*aF;j4^rwmWVOO~pVfhVF^sxK;P!W-e@ zptawV(k0qcaq&WJOs3 ztdwn%rG7@&l|I>!-N%Pbq?V6Fp@CA(W3$?LZlMEjW92@^hC+`o*92wqlkc{%96m!X zHM70RYD;^egtum2eN&I7BHohad2S5xV|+>;W#Dktr^tSY4M*L12(uWm2O_GbFXSn2 z3mSRKV2>5Ets=ZzUsmP+Mm#<}OOLB%6?sWVC2J6uwgq3X4#)w4?wgA*5xb)F)c3lz z?LXB^I9|w8^Tg+6GRgiMq2+T^^OiaX<5yH4JU7#EwH_{#HhMK%rTrB5kdzeJkszSd zU{Z%&3lJVL>f%+jTj@!zhSHsLHkqdtIU~g40dU-ys>l|A5t$Y^u*~?yxZ5asVA1Fm~(F)H$BA-Od^pH+*9q zX7SVdNtmnVp?q465W)Jo7F(pO(U(?@^EKInFWbl<^~v+g6EyO;j+^i-s`!~_2x!9P ztw75+rR-1@2*=6-wVr3d_hf9aSOa|zWoH@0N4NbF>-L;i^x^t;q1Nv3u=G86Jjzkh zf?#!Rgq!WFd7dJ5Bv^ySO@2FaRvF*4oasOI0Q(O=4|fV7S`&q za05ecg`1!K9ln}uy!RcY)E$GY#}NpKzO2wwFnm>8fBN88^(hI-N2Jgwn>MnY2j#eY zZeA@{)>p^%mZW_Ty_xmi^#tYNV|ffCVAeI;`2J{64uH=$^<0b%mrL_0=Z%oq8vmaD z+^avG!>+P?HP{U8yy>o_wsCI`H_0Y*x_EJ!P_hXRXyTKUi;wYmc-JF{5!scfuSoH3 zd|KGZem9;5?~m#B`!NztPGue^iPvkzBxB7sEUb%QI;H(9bAU6mgMhs&_Lo7j*#Dvm zXn;UaH-HFr0*Da9JSYSVfxy^;u6F`RIGfxZ(>vdgU@(FO1h`@l02>@?1B3HGjBPL{ zj{Nfoj`6VC1P27;B7*;;u>My;0*F6z*m+=oIx*&NMEoy8|BZkM9}=SmoWY#IVlY@$ z4M#qtiV6k;VE)Gcdwn8U{GTl!eFP{G%n1UBV0H)*3kURB7=k(VX4<&4R4HmxeqkGL)!dp-V+~%v=4Z zEIhp~_hT@vxP|@0(y*m1loouYWjeo%ZWR|?I5n^q*jx3`@o^Jw$Whm zHI`cag+_RwD#+UH@at&ZuQFrfA1SYj-Y39wzgg$Dcx*73A1iFTn`QO;j<0u$DxZpp zr+KHa1JIZKwUb5u6qQ3vOYKIg~lTjqkSkhvd;bV3vkjN zg*%cciON=~*34QX1Tw>z>wROcbb3I(CAU) uDS$O-XxTN)`{33aws=+4D|ze7B#KAA`MaeN9NCm(V`| literal 0 HcmV?d00001 diff --git a/android/vcmi-app/build.gradle b/android/vcmi-app/build.gradle index 6823ec56d..c0e41bd47 100644 --- a/android/vcmi-app/build.gradle +++ b/android/vcmi-app/build.gradle @@ -17,7 +17,7 @@ android { signingConfigs { releaseSigning - LoadSigningConfig(PROJECT_PATH_BASE) + LoadSigningConfig() } buildTypes { @@ -119,16 +119,17 @@ def ResolveGitInfo() { } def SigningPropertiesPath(final basePath) { - return file(basePath + "/.github/CI/signing.properties") + return file("${basePath}/signing.properties") } def SigningKeystorePath(final basePath, final keystoreFileName) { - return file(basePath + "/.github/CI/" + keystoreFileName) + return file("${basePath}/${keystoreFileName}") } -def LoadSigningConfig(final basePath) { +def LoadSigningConfig() { + final def projectRoot = "${project.projectDir}/../../CI/android" final def props = new Properties() - final def propFile = SigningPropertiesPath(basePath) + final def propFile = SigningPropertiesPath(projectRoot) if (propFile.canRead()) { props.load(new FileInputStream(propFile)) @@ -138,7 +139,7 @@ def LoadSigningConfig(final basePath) { && props.containsKey('KEY_ALIAS') && props.containsKey('KEY_PASSWORD')) { - android.signingConfigs.releaseSigning.storeFile = SigningKeystorePath(basePath, props['STORE_FILE']) + android.signingConfigs.releaseSigning.storeFile = SigningKeystorePath(projectRoot, props['STORE_FILE']) android.signingConfigs.releaseSigning.storePassword = props['STORE_PASSWORD'] android.signingConfigs.releaseSigning.keyAlias = props['KEY_ALIAS'] android.signingConfigs.releaseSigning.keyPassword = props['KEY_PASSWORD']