From 1f3abb127bab64252fb045818448ca3d6d556af0 Mon Sep 17 00:00:00 2001 From: Catfriend1 Date: Sat, 22 Sep 2018 19:19:18 +0200 Subject: [PATCH] Update NDK to android-ndk-r18 (#68) * Update NDK to android-ndk-r18 * Update build.gradle, resolve lint warnings --- .gitignore | 2 +- app/build.gradle | 6 +++--- .../drawable-hdpi/ic_settings_white_24dp.png | Bin 0 -> 412 bytes .../drawable-mdpi/ic_settings_white_24dp.png | Bin 0 -> 304 bytes .../drawable-xhdpi/ic_settings_white_24dp.png | Bin 0 -> 538 bytes .../drawable-xxhdpi/ic_settings_white_24dp.png | Bin 0 -> 726 bytes .../ic_settings_white_24dp.png | Bin 743 -> 1018 bytes build.gradle | 2 +- syncthing/build-syncthing.py | 12 ++++++------ 9 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/ic_settings_white_24dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_settings_white_24dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_settings_white_24dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_settings_white_24dp.png diff --git a/.gitignore b/.gitignore index 8292ebd7..ed988dab 100644 --- a/.gitignore +++ b/.gitignore @@ -33,7 +33,7 @@ gradle/wrapper/gradlew* syncthing/go syncthing/go.tgz syncthing/go.zip -syncthing/android-ndk-r16b +syncthing/android-ndk-r* syncthing/ndk.zip # External build artifacts diff --git a/app/build.gradle b/app/build.gradle index 949e6e31..a6718670 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,14 +4,14 @@ apply plugin: 'com.github.triplet.play' dependencies { implementation 'eu.chainfire:libsuperuser:1.0.0.201704021214' - implementation 'com.android.support:design:27.0.2' + implementation 'com.android.support:design:27.1.1' implementation 'com.google.zxing:android-integration:3.3.0' implementation 'com.google.code.gson:gson:2.8.2' implementation 'org.mindrot:jbcrypt:0.4' implementation 'com.google.guava:guava:23.6-android' implementation 'com.annimon:stream:1.1.9' implementation 'com.android.volley:volley:1.1.0' - implementation 'com.android.support.constraint:constraint-layout:1.1.2' + implementation 'com.android.support.constraint:constraint-layout:1.1.3' implementation 'com.google.dagger:dagger:2.14.1' annotationProcessor "com.google.dagger:dagger-compiler:2.14.1" androidTestImplementation 'com.android.support.test:rules:1.0.2' @@ -21,7 +21,7 @@ dependencies { android { // Changes to these values need to be reflected in `.travis.yml` compileSdkVersion 27 - buildToolsVersion '27.0.3' + buildToolsVersion '28.0.2' buildTypes.debug.applicationIdSuffix ".debug" dataBinding.enabled = true diff --git a/app/src/main/res/drawable-hdpi/ic_settings_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_settings_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..836237d18f8071480ede2ced6d4a1e4fad8cb94a GIT binary patch literal 412 zcmV;N0b~A&P)MIU{vG%JM?$Wt5|vtnSe~`g`Yy@mfb1tV&j$K@r**=dgDMMMInd zJhag_MZVeSA>dRLGf_)TiaZ@W&{7Yyi!2KjyJ?l>_A0iZDAjql4U4}FQ!6iD5@z`* z#eF>@p}i|od^9`q^mSWmbYvJIbz9#krn5^b?nME0DlX|94Rb-owkTk;imGUgDixcf zfE~>`NN1N-)JFjiR9w|LiW%s()bPkKsu{sH+h?S%Y99$bJwWQCX_4i%ytXsNMLOf}%4^}Z?c)jCfAhod0|dGC<1e@AV#tSSQ| zv@zaM@AQf0(Op)DD90PAr%{$_sZ&vw^-@1Ji+YWSkqH0|lEmC>S8xFU0000%?kwGN=w-K=umi1|zepm)$%* zrX_oD;J|~dWh@G#8YpTi@x_2W6b<9?&9EE5UFudm0j>;3Cli46NNfWp<0q4V?MPGs zQ<3GB+^eMiE#TTn9v|00v9Hp;poZej=wEL=bm;Myw-#!8*@?`MW(q>~oT8Cgb7UsM zig!iRLWFtemZCeCiqq(aEya5D!?bFd|n3Pmz_ z`2aj)9+l;zBR8?RNoV<}${d~pA1JCQEGN!c_7G(cXNa>}ZdBwCN#RjVF6<$x_REfz zB!`wVBL{bI^SJHD!|e_^WWq39_RxSl@{xxI?8arJYyFr_R0uuzhRrIOkdLjHO_Kqm zFxyH#*)Rc*uuHPw0%0Cgjb67-#1vLG+t3F@u*U?@QkTzOZqAM7t_@FOAKO94piys8_S2Wu2kyssMK?h=epq<>9!au@J%YrL}c}$WG1=xkz zNEt94vyJ4H2`jPrP7j4J7Q3Y~VKgqgX+U22$V)?Z<1$PpZVn9dIJQJwj`1l~|o z(P%_7#b7liixfZ(8cJ#f cWf0l^0}KSHGP+ePUH||907*qoM6N<$g2_JaI{*Lx literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_settings_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_settings_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..7ef944dbd04ec62fc7b8a6e18e0df5e094a19fce GIT binary patch literal 726 zcmV;{0xA88P)YN+qP{pwr$(_iEZ1qZ96-5PuJ~1MYHO+QMS^|($dl>N@s#Yarwv9 zgt}IWNn3F}1)0MRITalju!24H z<{N4eRYSg^Cwp4WrHYCMq*7x=!^5Q7)3W0zMv`jdIYw6eh7bS9hI3eo4=XrF7F5NT znsVb_qS(lAO7b%=^C~}4hG9f=uUzPXT`O+TUbuyp*!7YN^RZdYhl+vUv05${K4m>_ zYr`{}Z?V|GS90SK=Hl|39LSE#0v@xEW4#E|TL$zd%s?)Z9mi0T*zS=5_Yhk-j#X5= z$4Y_>krAU!&B2ae2$D-ilpx5zGO<_8_hrPV1SzO^QHmgs$%rQjQdaSzEJ2=>5l;}L zwBkiUf_yF`J|ajy#f$$4QcOnVO6t0w4_Qr+(K2EvLDuj|JS)=*#CDeqxSQB2a;)sQ zh=GX@9rPhge=d*>kFfxkta9L2T;}qK-1v?SSbVDxJit2K*7K=cSccW_&gS4YUoP~* zt|d1oIEC#d7aopllK<-F@H1r?9`Wtl$TzaMCvRTyK4D&xZ`?wds}8J-1VxpWmX>C<36o)sW-vyoq5uE@07*qo IM6N<$f_6$-d;kCd literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_settings_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_settings_white_24dp.png index 76b5dbad0653f14b9c989011c3aab1eccce1ba4a..56d5d9fc27d936b53b8cf346777de4d87ddde38f 100644 GIT binary patch delta 1007 zcmVSlk9ikj@E`L^6C`UYq)icTwpJMfc zT8mM*gC97FDHO!QbjNOG1u+@N@;Li4yvo7}^i|^?R#Y7p;9+7t$NZ|pGTcr>?|&{~R*9|on-u@B3&Sug7w|vz z9#uM)B;z{;nb`64&*_g*kah&WJmri&+ z%KQpoAs)l4D-+3z74hlT{90u*df>CFtQec0iT67T$bW!E`HgtLF<#s!^qa(~v80Tc zmoCKlkZIzdLzfWaAVpwJV%)$e@?cXsWAm;eahv((-C2Ij!k1VquSiToL37_QkJ2y( z_t4Dqa^O~)d5p1C2KJ|*k)7ng<}^~{2!>HvIE}D^apb^QbP#r-%Ea}AeJm$FA?!Al ziN^?gT7OPFL)eol6R!|X;ZXhG?`&If*Or%DhGC?kq(Y$SfyhuLyEdp4!l4!PcyF4FpnwR7q+i;N9y~Y zdF02=bjRj)MdCedy0U|JSm_1~d__1165|F&ihuuF|ByIcm{&$DNsTz~GG$z?@;mW< zGlu&4Tuc9jvCI5vz+bCuK{tF>kQEct9j`|k7F&yd72c5 zC-+A=HwDO8&ZZ3 zvr;gq_t}Nf)DM$z4_>!0;ULjjbVm(qH78!;WxtAJ! z9j~%50{ij=$1t&iSQ)$SjjnB`;$(i{c4$UbYw;6SpD0H>ht&hh5m#Y#j&j6dSnZ)4 zu@P3QC`ZhP)eOoJV`5V?8g8A delta 730 zcmV<00ww+W2j>Nl8Gix*003?J;BNo`00wkYPE!B?00000Zl(v30007fmBObZ3?fkk{SDtk2O#W}NT5STwR|?hPVp)BddYPSn`juM8JGwP z2%pE#Fx`Q}Z1eZH*|puHd!Lx*IRa@nM2Rvb4AQo`OefwM(L!;cTOM^f!On!Pr2Xo2 zBAt;=^R?DiTx)_)U-N;qQsj?nR>AClMuktX8|tSzwtt_&MAW1^+6Op8))*g*cG{!?#hmFm&FL2X2SRGz05aO|> z*lLApv%|xVzpy;RUd-TwI)avqoofuvD+D?bdDJOV M07*qoM6N<$f>@$MOaK4? diff --git a/build.gradle b/build.gradle index 3a8103da..4653bbbd 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.3' + classpath 'com.android.tools.build:gradle:3.1.4' classpath 'com.github.triplet.gradle:play-publisher:1.2.0' classpath 'com.github.ben-manes:gradle-versions-plugin:0.15.0' diff --git a/syncthing/build-syncthing.py b/syncthing/build-syncthing.py index d162868d..6c959cfd 100644 --- a/syncthing/build-syncthing.py +++ b/syncthing/build-syncthing.py @@ -136,12 +136,12 @@ def install_ndk(): # Consts. pwd_path = os.path.dirname(os.path.realpath(__file__)) if sys.platform == 'win32': - url = 'https://dl.google.com/android/repository/android-ndk-r16b-windows-x86_64.zip' - expected_shasum = 'f3f1909ed1052e98dda2c79d11c22f3da28daf25' + url = 'https://dl.google.com/android/repository/android-ndk-r18-windows-x86_64.zip' + expected_shasum = '7fc0e0f94d86ea389bd18761abdc1bae2c005587' else: - url = 'https://dl.google.com/android/repository/android-ndk-r16b-linux-x86_64.zip' - expected_shasum = '42aa43aae89a50d1c66c3f9fdecd676936da6128' + url = 'https://dl.google.com/android/repository/android-ndk-r18-linux-x86_64.zip' + expected_shasum = '2ac2e8e1ef73ed551cac3a1479bb28bd49369212' zip_fullfn = pwd_path + os.path.sep + 'ndk.zip'; # Download NDK. @@ -161,10 +161,10 @@ def install_ndk(): print("[ok] Checksum of", zip_fullfn, "matches expected value.") # Proceed with extraction of the NDK if necessary. - ndk_home_path = pwd_path + os.path.sep + 'android-ndk-r16b' + ndk_home_path = pwd_path + os.path.sep + 'android-ndk-r18' if not os.path.isfile(ndk_home_path + os.path.sep + "sysroot" + os.path.sep + "NOTICE"): print("Extracting NDK ...") - # This will go to a subfolder "android-ndk-r16b" in the current path. + # This will go to a subfolder "android-ndk-r18" in the current path. file_name, file_extension = os.path.splitext(url_base_name) zip = zipfile.ZipFile(zip_fullfn, 'r') zip.extractall(pwd_path)