diff --git a/.circleci/config.yml b/.circleci/config.yml index 770209a77d..6d5e40256f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,6 +7,9 @@ jobs: environment: GRADLE_OPTS: -Dorg.gradle.workers.max=1 -Dorg.gradle.daemon=false -Dkotlin.compiler.execution.strategy="in-process" steps: + - run: rustup toolchain install nightly-2020-12-20 + - run: rustup override set nightly-2020-12-20 + - run: rustup target install armv7-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android - checkout - run: git submodule update --init --recursive - restore_cache: diff --git a/README.md b/README.md index b376c7f6bb..12e51f795a 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,12 @@ for Android TV ([beta](https://play.google.com/apps/testing/com.github.shadowsoc * Android SDK - Android NDK * Rust with Android targets installed - `$ rustup target install armv7-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android` + +```bash + $ rustup toolchain install nightly-2020-12-20 + $ rustup override set nightly-2020-12-20 + $ rustup target install armv7-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android +``` ### BUILD diff --git a/buildSrc/src/main/kotlin/Helpers.kt b/buildSrc/src/main/kotlin/Helpers.kt index 8bc80be2d9..148834e226 100644 --- a/buildSrc/src/main/kotlin/Helpers.kt +++ b/buildSrc/src/main/kotlin/Helpers.kt @@ -56,8 +56,8 @@ fun Project.setupCore() { setupCommon() android.apply { defaultConfig { - versionCode = 5010750 - versionName = "5.1.7-nightly" + versionCode = 5010850 + versionName = "5.1.8-nightly" } compileOptions.isCoreLibraryDesugaringEnabled = true lintOptions { diff --git a/core/build.gradle.kts b/core/build.gradle.kts index ce41440723..160f1e5fb6 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -38,16 +38,9 @@ cargo { profile = findProperty("CARGO_PROFILE")?.toString() ?: currentFlavor extraCargoBuildArguments = listOf("--bin", libname!!) featureSpec.noDefaultBut(arrayOf( - "ring-aead-ciphers", - "sodium", - "rc4", - "aes-cfb", - "aes-ctr", - "camellia-cfb", - "openssl-vendored", "single-threaded", "local-flow-stat", - "local-dns-relay")) + "local-dns")) exec = { spec, toolchain -> spec.environment("RUST_ANDROID_GRADLE_LINKER_WRAPPER_PY", "$projectDir/$module/../linker-wrapper.py") spec.environment("RUST_ANDROID_GRADLE_TARGET", "target/${toolchain.target}/$profile/lib$libname.so") diff --git a/core/src/main/java/com/github/shadowsocks/bg/ProxyInstance.kt b/core/src/main/java/com/github/shadowsocks/bg/ProxyInstance.kt index 856beae0c4..7c7ab5dc77 100644 --- a/core/src/main/java/com/github/shadowsocks/bg/ProxyInstance.kt +++ b/core/src/main/java/com/github/shadowsocks/bg/ProxyInstance.kt @@ -90,8 +90,8 @@ class ProxyInstance(val profile: Profile, private val route: String = profile.ro throw BaseService.ExpectedExceptionWrapper(e) }.let { dns -> cmd += arrayListOf( - "--dns-relay", "${DataStore.listenAddress}:${DataStore.portLocalDns}", - "--remote-dns", "${dns.host ?: "0.0.0.0"}:${if (dns.port < 0) 53 else dns.port}") + "--dns-addr", "${DataStore.listenAddress}:${DataStore.portLocalDns}", + "--remote-dns-addr", "${dns.host ?: "0.0.0.0"}:${if (dns.port < 0) 53 else dns.port}") } if (route != Acl.ALL) { diff --git a/core/src/main/rust/shadowsocks-rust b/core/src/main/rust/shadowsocks-rust index 2a6451f0fe..3a1054acc5 160000 --- a/core/src/main/rust/shadowsocks-rust +++ b/core/src/main/rust/shadowsocks-rust @@ -1 +1 @@ -Subproject commit 2a6451f0feef2abbcf961be38edf13abdada11b5 +Subproject commit 3a1054acc54cfc23a1cd232aa0a45b66af4bd612