From 57355088f08571e87f5f4630e297269c34c0619b Mon Sep 17 00:00:00 2001 From: John Lyon-Smith Date: Wed, 9 May 2018 14:18:26 -0700 Subject: [PATCH] Fixed Android build issues --- mobile/android/build.gradle | 1 + mobile/android/gradle.properties | 1 + mobile/android/rename-apk | 2 +- mobile/src/Home/images/clipboard-pin.png | Bin 1446 -> 0 bytes mobile/src/Home/images/hardhat-pin.png | Bin 1612 -> 0 bytes mobile/src/Home/images/question-pin.png | Bin 1694 -> 0 bytes 6 files changed, 3 insertions(+), 1 deletion(-) delete mode 100644 mobile/src/Home/images/clipboard-pin.png delete mode 100644 mobile/src/Home/images/hardhat-pin.png delete mode 100644 mobile/src/Home/images/question-pin.png diff --git a/mobile/android/build.gradle b/mobile/android/build.gradle index 8717e60..16d7187 100644 --- a/mobile/android/build.gradle +++ b/mobile/android/build.gradle @@ -15,6 +15,7 @@ buildscript { allprojects { repositories { + google() mavenLocal() jcenter() maven { diff --git a/mobile/android/gradle.properties b/mobile/android/gradle.properties index 1fd964e..521cf00 100644 --- a/mobile/android/gradle.properties +++ b/mobile/android/gradle.properties @@ -18,3 +18,4 @@ # org.gradle.parallel=true android.useDeprecatedNdk=true +# android.enableAapt2=false diff --git a/mobile/android/rename-apk b/mobile/android/rename-apk index 43fe558..8fc1035 100755 --- a/mobile/android/rename-apk +++ b/mobile/android/rename-apk @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -OLD_APK=${SCRIPT_DIR}/app/build/outputs/apk/app-release.apk +OLD_APK=${SCRIPT_DIR}/app/build/outputs/apk/release/app-release.apk VERSION=$(cat $SCRIPT_DIR/../../scratch/version.txt) NEW_APK=$(dirname $OLD_APK)/deighton-ar-${VERSION}.apk diff --git a/mobile/src/Home/images/clipboard-pin.png b/mobile/src/Home/images/clipboard-pin.png deleted file mode 100644 index b1fa2d1e33d13e174df28ba35490a9c8de31da80..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1446 zcmV;X1zGxuP)phJicgoI3R zNq7V#>;W7C@}NFQGH+&ZU`95ZV2BE%fXe1XkbNl=hQ)#)I}}>K^QV`z9Vj({o7|pz z&-V4)d;W7S?}{0ts;WwQaBz^M)oR~@x+muISc^cHF&B9}-XNdPZ;6hM{y8o#?g%`S zgJ()wQBe`7R;xdSPNFG2CIh$%v)td`|Etv0)I-KMrl*3|)zw)pFE4+FXg-DkUmy@1 zy1BW{`S|$ENTpJhi;K&)NF-9PuC9tyDwX}z)RgD^{JhWB)|OZYFpJ3FFDfef-58Me z&w$p{)QER>b{+yS7KXbX3`}NJuO$j1Cfb4d0aq-vs zIh5ot>on77C%3~zx9neIy!;}2M2EuFFZWFCm|u>Pkp&Yqv74Z zfBz<;4+9>|bP>-61O&Xol8gJt zwY9ajFe)X(n3$L!@NfT}ot>2uU{Fv{ue-bZD06xiB^}Zwo0*xJ7fCNIEv?JJ!9j)P zOXK6?A23@EbbEXIHk4mLvMk|SnvUikBp3*v$wZj#UGI%vtx*7QCV3j zIXpbPj(>F&78W)~Oydz68u|qDOJlyddk+tf>5-8UF@lrB<|qE~@o^{?d}n9pMP%W* zCCpqPeLY`aU!`szL6i@4H(KB`*&=!wLn4uIzH!7H79T0jErdeh&Se0SPqA3ce7n+~ z5^0+jDD0L*FJqv}alR2C2TqYL5)cG-mjOsVQD~TN4hu=kSCRlFPfYYO29;8sUnNm~ zet!OAM7y%PyZf9{sdUx}FO*DAPkWO?;CxS%j#q=M`i?eeO|KHY$bl2ISz221BA?dQ z)@?+&iiB!X2XO7g#6&1HW)fV~K(~1fwZIDg6uG&%3*?upg#`r#10^LT41QT%bohK7b@bT1dUdgSWr`bJh(7I$)FBhWYO>gt-t6Ve92H}Ej?K%_3{lTT5t zP7L(*Pg|pt__ejQ$@lm79Uy;#^7>A8cJ@E|x(1Ol0q(aP|1b~W0_r|^QVya;je2@| z8W=NuJYy_|hK9WGcDlB{zRs08*e{`hgyrPq(A(HxoC-=B<>lq?BC+lP*qT`&;yv8i zCYiA%6t$#6O@GLwSK6{KLS`vdo#x!oYW_# zbWMViA)cjI5fK%SYo;7Qc7&_=5LtTn96i&KGGn~>g{UguV4uWzMsypW+^xdGLaxji z$)4Gs8!5ABY-|*aj*fng{YQ*PloAH>ZAAEoKHt>ZY*6L|5Aqz`@f}QH@x~CL3>9sj z$<3h#->EqUct-Zb$Hz|q)B%|+Lp@zF$4+18KO8|z-77?stpET307*qoM6N<$f>esG A3jhEB diff --git a/mobile/src/Home/images/hardhat-pin.png b/mobile/src/Home/images/hardhat-pin.png deleted file mode 100644 index 0a3a77967fff4e1eb2588978bcc087727f5b23fd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1612 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