From 0afb0dcdd4da46b83a836b926c71cf35b410fc46 Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Wed, 6 May 2020 18:22:30 +0200 Subject: Version 0.7.16 Also update submodules to latest versions --- main/build.gradle.kts | 4 ++-- main/src/main/cpp/asio | 2 +- main/src/main/cpp/mbedtls | 2 +- main/src/main/cpp/openvpn | 2 +- main/src/main/cpp/openvpn3 | 2 +- main/src/ui/res/values-zh-rTW/strings.xml | 1 - 6 files changed, 6 insertions(+), 7 deletions(-) (limited to 'main') diff --git a/main/build.gradle.kts b/main/build.gradle.kts index 8b307641..6f9c966f 100644 --- a/main/build.gradle.kts +++ b/main/build.gradle.kts @@ -18,8 +18,8 @@ android { defaultConfig { minSdkVersion(14) targetSdkVersion(29) //'Q'.toInt() - versionCode = 168 - versionName = "0.7.15" + versionCode = 169 + versionName = "0.7.16" externalNativeBuild { cmake { diff --git a/main/src/main/cpp/asio b/main/src/main/cpp/asio index 90f32660..a5c5077e 160000 --- a/main/src/main/cpp/asio +++ b/main/src/main/cpp/asio @@ -1 +1 @@ -Subproject commit 90f32660cd503494b3707840cfbd5434d8e9dabe +Subproject commit a5c5077e44c451ddc8a50c3717e66dcccc92b074 diff --git a/main/src/main/cpp/mbedtls b/main/src/main/cpp/mbedtls index ca933c7e..b1c8e41a 160000 --- a/main/src/main/cpp/mbedtls +++ b/main/src/main/cpp/mbedtls @@ -1 +1 @@ -Subproject commit ca933c7e0c9e84738b168b6b0feb89af4183a60a +Subproject commit b1c8e41ae3b36a9a88e0cbee10ed38a577b54726 diff --git a/main/src/main/cpp/openvpn b/main/src/main/cpp/openvpn index b3eb7a46..a0ab2fa3 160000 --- a/main/src/main/cpp/openvpn +++ b/main/src/main/cpp/openvpn @@ -1 +1 @@ -Subproject commit b3eb7a46c465696b38debfc2d2c1dff8971c4035 +Subproject commit a0ab2fa3a88576c8a0fd311743bc2295f19d8fae diff --git a/main/src/main/cpp/openvpn3 b/main/src/main/cpp/openvpn3 index 5391351a..f4b9a655 160000 --- a/main/src/main/cpp/openvpn3 +++ b/main/src/main/cpp/openvpn3 @@ -1 +1 @@ -Subproject commit 5391351ac2ed1072a6bcff50b29fde52051e4a4e +Subproject commit f4b9a65591f34d5f154c4fef24643dae49bed022 diff --git a/main/src/ui/res/values-zh-rTW/strings.xml b/main/src/ui/res/values-zh-rTW/strings.xml index e165b2e4..b34562df 100644 --- a/main/src/ui/res/values-zh-rTW/strings.xml +++ b/main/src/ui/res/values-zh-rTW/strings.xml @@ -467,7 +467,6 @@ OpenSSL 回傳一個錯誤 執行測試中... 測試已選擇的演算法 - \'{\"title\":\"Sign In\",\"type\":\"login\",\"url\":\"/api/v1/generic-sigs/scan\",\"payload\":{\"id\":\"2171e48c-fc70-4edd-b3e5-97c7ec14406e\"}}\' OpenVPN 3 C ++實現不支持靜態密鑰。請在常規設置下更改為OpenVPN 2.x. Hi 網路代理 -- cgit v1.2.3