From c9b36560894b02fb253d6bf587c93c4ebd2b4e5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= Date: Tue, 9 Mar 2021 18:47:22 +0800 Subject: [PATCH] Update dependencies --- TMessagesProj/build.gradle | 5 ++--- TMessagesProj/jni/boringssl | 2 +- TMessagesProj/libs/README.md | 3 --- TMessagesProj/src/main/libs/README.md | 3 --- bin/libs/shadowsocks.sh | 1 + bin/libs/ssr.sh | 1 + bin/libs/v2ray/build.sh | 1 + ss-rust/src/main/rust/shadowsocks-rust | 2 +- 8 files changed, 7 insertions(+), 11 deletions(-) delete mode 100644 TMessagesProj/libs/README.md delete mode 100644 TMessagesProj/src/main/libs/README.md diff --git a/TMessagesProj/build.gradle b/TMessagesProj/build.gradle index 9f475eaba..16b75363e 100644 --- a/TMessagesProj/build.gradle +++ b/TMessagesProj/build.gradle @@ -3,14 +3,13 @@ import cn.hutool.core.util.RuntimeUtil apply plugin: 'com.android.application' apply plugin: 'kotlin-android' -def verName = "7.5.0-rc04" -def verCode = 200 + 3 * 3 +def verName = "7.5.0-rc05" +def verCode = 200 + 3 * 4 if (System.getenv("DEBUG_BUILD") == "true") { verName += "-" + RuntimeUtil.execForStr("git log --pretty=format:'%h' -n 1)") } - def officialVer = "7.5.0" def officialCode = 2246 diff --git a/TMessagesProj/jni/boringssl b/TMessagesProj/jni/boringssl index 48cbd69de..04b3213d4 160000 --- a/TMessagesProj/jni/boringssl +++ b/TMessagesProj/jni/boringssl @@ -1 +1 @@ -Subproject commit 48cbd69dee6c744b5b9ca6506079fabcda86fe61 +Subproject commit 04b3213d43492b6c9e0434d8e2a4530a9938f958 diff --git a/TMessagesProj/libs/README.md b/TMessagesProj/libs/README.md deleted file mode 100644 index b639d5aae..000000000 --- a/TMessagesProj/libs/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# Pre-compiled binary libraries. - -About compilation, please refer to [scripts](https://github.com/NekoX-Dev/NekoX/blob/master/bin). \ No newline at end of file diff --git a/TMessagesProj/src/main/libs/README.md b/TMessagesProj/src/main/libs/README.md deleted file mode 100644 index b639d5aae..000000000 --- a/TMessagesProj/src/main/libs/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# Pre-compiled binary libraries. - -About compilation, please refer to [scripts](https://github.com/NekoX-Dev/NekoX/blob/master/bin). \ No newline at end of file diff --git a/bin/libs/shadowsocks.sh b/bin/libs/shadowsocks.sh index 5c9d65c78..26c19abed 100755 --- a/bin/libs/shadowsocks.sh +++ b/bin/libs/shadowsocks.sh @@ -4,4 +4,5 @@ source "bin/init/env.sh" git submodule update --init ss-rust/src/main/rust/shadowsocks-rust ./gradlew ss-rust:assembleRelease || exit 1 +mkdir -p TMessagesProj/libs cp ss-rust/build/outputs/aar/* TMessagesProj/libs diff --git a/bin/libs/ssr.sh b/bin/libs/ssr.sh index 43445be5c..99134187b 100755 --- a/bin/libs/ssr.sh +++ b/bin/libs/ssr.sh @@ -4,4 +4,5 @@ source "bin/init/env.sh" git submodule update --init 'ssr-libev/src/main/jni/*' ./gradlew ssr-libev:assembleRelease || exit 1 +mkdir -p TMessagesProj/libs cp ssr-libev/build/outputs/aar/* TMessagesProj/libs diff --git a/bin/libs/v2ray/build.sh b/bin/libs/v2ray/build.sh index 909d4aa69..74d606104 100755 --- a/bin/libs/v2ray/build.sh +++ b/bin/libs/v2ray/build.sh @@ -8,4 +8,5 @@ cd "$PROJECT/v2ray" gomobile init gomobile bind -v -ldflags='-s -w' . || exit 1 +mkdir -p "$PROJECT/TMessagesProj/libs" /bin/cp -f libv2ray.aar "$PROJECT/TMessagesProj/libs" diff --git a/ss-rust/src/main/rust/shadowsocks-rust b/ss-rust/src/main/rust/shadowsocks-rust index 1ac8e2fd5..ec927e6f1 160000 --- a/ss-rust/src/main/rust/shadowsocks-rust +++ b/ss-rust/src/main/rust/shadowsocks-rust @@ -1 +1 @@ -Subproject commit 1ac8e2fd5059eb92d6d6bc8d3d66ad423cb7cb05 +Subproject commit ec927e6f1f01cf77211eb802d0361338906060bb