From 56b7e4559ebf22f17f5a250a1d7627d834ff8163 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= Date: Thu, 1 Oct 2020 04:30:37 +0000 Subject: [PATCH] Refinds --- .gitignore | 4 +++- TMessagesProj/build.gradle | 14 +++++++------- bin/update_libs.sh | 2 ++ 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 6251ff23e..ca1dd442f 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,6 @@ local.properties /TMessagesProj/jni/boringssl/build/ CMakeLists.txt CMakeLists.txt.orig -service_account_credentials.json \ No newline at end of file +service_account_credentials.json +*.aar +*.so \ No newline at end of file diff --git a/TMessagesProj/build.gradle b/TMessagesProj/build.gradle index 3f94f0154..35c75a67a 100644 --- a/TMessagesProj/build.gradle +++ b/TMessagesProj/build.gradle @@ -46,9 +46,9 @@ configurations { } def okHttpVersion = '4.9.0' -def fcmVersion = '20.2.4' -def crashlyticsVersion = '17.2.1' -def playCoreVersion = '1.8.0' +def fcmVersion = '20.3.0' +def crashlyticsVersion = '17.2.2' +def playCoreVersion = '1.8.2' buildscript { @@ -84,7 +84,7 @@ dependencies { // replace zxing with latest // TODO: fix problem with android L - implementation 'com.google.zxing:core:3.4.0' + implementation 'com.google.zxing:core:3.4.1' compileOnly 'org.checkerframework:checker-qual:3.6.1' compileOnly 'org.checkerframework:checker-compat-qual:2.5.5' @@ -101,11 +101,11 @@ dependencies { implementation "com.squareup.okhttp3:okhttp:$okHttpVersion" implementation "com.squareup.okhttp3:okhttp-dnsoverhttps:$okHttpVersion" - implementation 'dnsjava:dnsjava:3.2.2' + implementation 'dnsjava:dnsjava:3.3.0' implementation 'org.dizitart:nitrite:3.4.2' - implementation 'cn.hutool:hutool-core:5.4.3' - implementation 'cn.hutool:hutool-crypto:5.4.3' + implementation 'cn.hutool:hutool-core:5.4.4' + implementation 'cn.hutool:hutool-crypto:5.4.4' implementation project(":openpgp-api") diff --git a/bin/update_libs.sh b/bin/update_libs.sh index d5e3b60eb..f7e9bd9b0 100755 --- a/bin/update_libs.sh +++ b/bin/update_libs.sh @@ -25,6 +25,8 @@ if [ ! -x "$(command -v rustc)" ]; then # curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh +# source $HOME/.cargo/env + # rustup target install armv7-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android echo "install rust please!"