Update dependencies

2021-02-04 01:40:30 +08:00 · 2021-02-04 01:40:30 +08:00 · 2debb39e74
commit 2debb39e74
parent 34a97553dd
11 changed files with 56 additions and 22 deletions
--- a/TMessagesProj/build.gradle
+++ b/TMessagesProj/build.gradle
@ -73,7 +73,7 @@ dependencies {

    implementation 'com.google.code.gson:gson:2.8.6'
    implementation 'org.osmdroid:osmdroid-android:6.1.10'
-    implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.21-2'
+    implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.30'
    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.2'

    implementation "com.squareup.okhttp3:okhttp:$okHttpVersion"
--- a/TMessagesProj/jni/boringssl
+++ b/TMessagesProj/jni/boringssl
@ -1 +1 @@
-Subproject commit 78f15a6aa9f11ab7cff736f920c4858cc38264fb
+Subproject commit 48cbd69dee6c744b5b9ca6506079fabcda86fe61
--- a/TMessagesProj/jni/ffmpeg
+++ b/TMessagesProj/jni/ffmpeg
@ -1 +1 @@
-Subproject commit f9f95ceebfbd7b7f43c1b7ad34e25d366e6e2d2b
+Subproject commit 89daac5fe2edb86f45fbd3281ac680bc598d6a97
--- a/TMessagesProj/jni/libwebp
+++ b/TMessagesProj/jni/libwebp
@ -1 +1 @@
-Subproject commit 17fd4ba820e59899d6938d460164147999f45bf2
+Subproject commit 47f64f6eddb9da0d1271c4af9a87ac78244f0b57
--- a/TMessagesProj/jni/patches/boringssl/0001-only-build-what-we-need.patch
+++ b/TMessagesProj/jni/patches/boringssl/0001-only-build-what-we-need.patch
@ -1,11 +1,11 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c266e1267..81d721df4 100644
+index f58e853cd..a56305ce5 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -562,44 +562,8 @@ if(USE_CUSTOM_LIBCXX)
+@@ -564,44 +564,8 @@ if(USE_CUSTOM_LIBCXX)
   target_link_libraries(libcxx libcxxabi)
 endif()
- 
+
 -# Add minimal googletest targets. The provided one has many side-effects, and
 -# googletest has a very straightforward build.
 -add_library(boringssl_gtest third_party/googletest/src/gtest-all.cc)
@ -44,13 +44,38 @@ index c266e1267..81d721df4 100644
 -add_subdirectory(util/fipstools/cavp)
 -add_subdirectory(util/fipstools/acvp/modulewrapper)
 -add_subdirectory(decrepit)
- 
+
 if(FUZZ)
   if(LIBFUZZER_FROM_DEPS)
-@@ -616,14 +580,3 @@ endif()
+@@ -617,39 +581,4 @@ endif()
+
 if(UNIX AND NOT APPLE AND NOT ANDROID)
   set(HANDSHAKER_ARGS "-handshaker-path" $<TARGET_FILE:handshaker>)
- endif()
+-endif()
+-
+-if(FIPS)
+-  add_custom_target(
+-    acvp_tests
+-    COMMAND ${GO_EXECUTABLE} build -o ${CMAKE_BINARY_DIR}/acvptool
+-            boringssl.googlesource.com/boringssl/util/fipstools/acvp/acvptool
+-    COMMAND ${GO_EXECUTABLE} build -o ${CMAKE_BINARY_DIR}/testmodulewrapper
+-            boringssl.googlesource.com/boringssl/util/fipstools/acvp/acvptool/testmodulewrapper
+-    COMMAND cd util/fipstools/acvp/acvptool/test &&
+-            ${GO_EXECUTABLE} run check_expected.go
+-            -tool ${CMAKE_BINARY_DIR}/acvptool
+-            -module-wrappers modulewrapper:$<TARGET_FILE:modulewrapper>,testmodulewrapper:${CMAKE_BINARY_DIR}/testmodulewrapper
+-            -tests tests.json
+-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+-    DEPENDS modulewrapper
+-    USES_TERMINAL)
+-
+-  add_custom_target(
+-    fips_specific_tests_if_any
+-    DEPENDS acvp_tests
+-  )
+-else()
+-  add_custom_target(fips_specific_tests_if_any)
+-endif()
 -
 -add_custom_target(
 -    run_tests
@ -60,13 +85,15 @@ index c266e1267..81d721df4 100644
 -            ${GO_EXECUTABLE} test -shim-path $<TARGET_FILE:bssl_shim>
 -              ${HANDSHAKER_ARGS} ${RUNNER_ARGS}
 -    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-    DEPENDS all_tests bssl_shim handshaker
+-    DEPENDS all_tests bssl_shim handshaker fips_specific_tests_if_any
 -    USES_TERMINAL)
+endif()
+\ No newline at end of file
 diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
-index d23c02eee..d84f4c1b9 100644
+index cde92b591..1807d036a 100644
 --- a/crypto/CMakeLists.txt
 +++ b/crypto/CMakeLists.txt
-@@ -85,7 +85,6 @@ function(perlasm dest src)
+@@ -91,7 +91,6 @@ function(perlasm dest src)
 endfunction()

 add_subdirectory(fipsmodule)
@ -74,7 +101,7 @@ index d23c02eee..d84f4c1b9 100644

 if(FIPS_DELOCATE OR FIPS_SHARED)
   SET_SOURCE_FILES_PROPERTIES(fipsmodule/bcm.o PROPERTIES EXTERNAL_OBJECT true)
-@@ -467,92 +466,4 @@ endif()
+@@ -475,93 +474,4 @@ endif()

 # urandom_test is a separate binary because it needs to be able to observe the
 # PRNG initialisation, which means that it can't have other tests running before
@ -96,8 +123,9 @@ index d23c02eee..d84f4c1b9 100644
 -  abi_self_test.cc
 -  asn1/asn1_test.cc
 -  base64/base64_test.cc
-  buf/buf_test.cc
 -  bio/bio_test.cc
+-  blake2/blake2_test.cc
+-  buf/buf_test.cc
 -  bytestring/bytestring_test.cc
 -  chacha/chacha_test.cc
 -  cipher_extra/aead_test.cc
--- a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/DataCenter.kt
+++ b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/DataCenter.kt
@ -8,9 +8,7 @@ object DataCenter {
    fun applyOfficalDataCanter(account: Int) {

        if (ConnectionsManager.native_isTestBackend(account) != 0) {
-
            ConnectionsManager.getInstance(account).switchBackend()
-
        }

        ConnectionsManager.native_cleanUp(account, true)
@ -21,9 +19,7 @@ object DataCenter {
    fun applyTestDataCenter(account: Int) {

        if (ConnectionsManager.native_isTestBackend(account) == 0) {
-
            ConnectionsManager.getInstance(account).switchBackend()
-
        }

    }
--- a/TMessagesProj/src/main/res/values-pt-rBR/strings_nekox.xml
+++ b/TMessagesProj/src/main/res/values-pt-rBR/strings_nekox.xml
@ -208,4 +208,8 @@
    <string name="AcceptSecretChat">Aceitar novo chat secreto</string>
    <string name="TabletMode">Modo Tablet</string>
    <string name="TabletModeDefault">Depende do dispositivo</string>
+    <string name="ReplaceText">Substituir Texto</string>
+    <string name="TextOrigin">Origem</string>
+    <string name="TextReplace">Substituir</string>
+    <string name="ReplaceRegex">Use regex</string>
 </resources>
--- a/TMessagesProj/src/main/res/values-zh-rCN/strings_nekox.xml
+++ b/TMessagesProj/src/main/res/values-zh-rCN/strings_nekox.xml
@ -212,4 +212,5 @@
    <string name="TextOrigin">原文</string>
    <string name="TextReplace">替换</string>
    <string name="ReplaceRegex">正则表达式</string>
+    <string name="DisableTrending">禁用趋势推荐</string>
 </resources>
--- a/TMessagesProj/src/main/res/values-zh-rTW/strings_neko.xml
+++ b/TMessagesProj/src/main/res/values-zh-rTW/strings_neko.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <string name="NekoSettings">喵設定</string>
-    <string name="IPv6">通過 IPv6 連接</string>
+    <string name="IPv6">透過 IPv6 連線</string>
    <string name="MessageMenu">訊息選單</string>
    <string name="HidePhone">隱藏您的手機號碼</string>
    <string name="Hide">隱藏</string>
--- a/TMessagesProj/src/main/res/values-zh-rTW/strings_nekox.xml
+++ b/TMessagesProj/src/main/res/values-zh-rTW/strings_nekox.xml
@ -207,5 +207,10 @@
    <string name="UserRestrictionsSendInline">透過內聯機器人傳送</string>
    <string name="AcceptSecretChat">接受新的加密對話</string>
    <string name="TabletMode">平板模式</string>
-    <string name="TabletModeDefault">基於設備</string>
+    <string name="TabletModeDefault">基於裝置</string>
+    <string name="ReplaceText">替換文字</string>
+    <string name="TextOrigin">原文</string>
+    <string name="TextReplace">替換</string>
+    <string name="ReplaceRegex">正規表示式</string>
+    <string name="DisableTrending">禁用趨勢推薦</string>
 </resources>
--- a/build.gradle
+++ b/build.gradle
@ -8,7 +8,7 @@ buildscript {
    }
    dependencies {
        classpath 'com.android.tools.build:gradle:4.1.2'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.21-2"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.30"
        classpath 'com.google.gms:google-services:4.3.5'
        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.4.1'
        classpath 'gradle.plugin.org.mozilla.rust-android-gradle:plugin:0.8.3'