Skip to content

Commit

Permalink
Bump version
Browse files Browse the repository at this point in the history
  • Loading branch information
madeye committed Jul 6, 2021
1 parent 69dd0ea commit 247c4a1
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions buildSrc/src/main/kotlin/Helpers.kt
Expand Up @@ -56,8 +56,8 @@ fun Project.setupCore() {
setupCommon()
android.apply {
defaultConfig {
versionCode = 5020450
versionName = "5.2.4-nightly"
versionCode = 5020550
versionName = "5.2.5-nightly"
}
compileOptions.isCoreLibraryDesugaringEnabled = true
lintOptions {
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/rust/shadowsocks-rust
Submodule shadowsocks-rust updated 35 files
+97 −0 .github/workflows/build-nightly-release.yml
+125 −152 Cargo.lock
+1 −1 Cargo.toml
+31 −8 README.md
+2 −4 bin/sslocal.rs
+32 −12 configs/genipset.py
+141 −38 configs/iptables_mixed.sh
+6 −10 crates/shadowsocks-service/Cargo.toml
+107 −21 crates/shadowsocks-service/src/config.rs
+2 −10 crates/shadowsocks-service/src/local/dns/client_cache.rs
+17 −13 crates/shadowsocks-service/src/local/http/dispatcher.rs
+1 −2 crates/shadowsocks-service/src/local/http/utils.rs
+2 −2 crates/shadowsocks-service/src/local/loadbalancing/ping_balancer.rs
+8 −9 crates/shadowsocks-service/src/local/mod.rs
+1 −15 crates/shadowsocks-service/src/local/redir/server.rs
+5 −48 crates/shadowsocks-service/src/local/redir/tcprelay/mod.rs
+4 −19 crates/shadowsocks-service/src/local/socks/server/mod.rs
+2 −20 crates/shadowsocks-service/src/local/socks/server/socks4/tcprelay.rs
+2 −21 crates/shadowsocks-service/src/local/socks/server/socks5/tcprelay.rs
+1 −15 crates/shadowsocks-service/src/local/tunnel/server.rs
+2 −25 crates/shadowsocks-service/src/local/tunnel/tcprelay.rs
+53 −75 crates/shadowsocks-service/src/local/utils.rs
+7 −0 crates/shadowsocks-service/src/manager/mod.rs
+8 −1 crates/shadowsocks-service/src/server/mod.rs
+23 −27 crates/shadowsocks-service/src/server/tcprelay.rs
+4 −3 crates/shadowsocks/Cargo.toml
+1 −1 crates/shadowsocks/src/config.rs
+6 −1 crates/shadowsocks/src/net/option.rs
+80 −2 crates/shadowsocks/src/net/sys/mod.rs
+62 −11 crates/shadowsocks/src/net/tcp.rs
+228 −37 crates/shadowsocks/src/relay/tcprelay/utils.rs
+1 −1 crates/shadowsocks/src/relay/udprelay/crypto_io.rs
+9 −0 debian/changelog
+1 −1 rust-toolchain
+1 −1 rustfmt.toml
20 changes: 10 additions & 10 deletions release.sh
@@ -1,13 +1,13 @@
#!/bin/bash

release=$1
cp mobile/build/outputs/apk/release/mobile-armeabi-v7a-release.apk shadowsocks-armeabi-v7a-${release}.apk
cp mobile/build/outputs/apk/release/mobile-arm64-v8a-release.apk shadowsocks-arm64-v8a-${release}.apk
cp mobile/build/outputs/apk/release/mobile-x86-release.apk shadowsocks-x86-${release}.apk
cp mobile/build/outputs/apk/release/mobile-x86_64-release.apk shadowsocks-x86_64-${release}.apk
cp mobile/build/outputs/apk/release/mobile-universal-release.apk shadowsocks--universal-${release}.apk
cp tv/build/outputs/apk/release/tv-armeabi-v7a-release.apk shadowsocks-tv-armeabi-v7a-${release}.apk
cp tv/build/outputs/apk/release/tv-arm64-v8a-release.apk shadowsocks-tv-arm64-v8a-${release}.apk
cp tv/build/outputs/apk/release/tv-x86-release.apk shadowsocks-tv-x86-${release}.apk
cp tv/build/outputs/apk/release/tv-x86_64-release.apk shadowsocks-tv-x86_64-${release}.apk
cp tv/build/outputs/apk/release/tv-universal-release.apk shadowsocks-tv--universal-${release}.apk
cp mobile/build/outputs/apk/release/mobile-armeabi-v7a-release.apk shadowsocks-armeabi-v7a-${release}.apk
cp mobile/build/outputs/apk/release/mobile-arm64-v8a-release.apk shadowsocks-arm64-v8a-${release}.apk
cp mobile/build/outputs/apk/release/mobile-x86-release.apk shadowsocks-x86-${release}.apk
cp mobile/build/outputs/apk/release/mobile-x86_64-release.apk shadowsocks-x86_64-${release}.apk
cp mobile/build/outputs/apk/release/mobile-universal-release.apk shadowsocks--universal-${release}.apk
cp tv/build/outputs/apk/freedom/release/tv-freedom-armeabi-v7a-release.apk shadowsocks-tv-armeabi-v7a-${release}.apk
cp tv/build/outputs/apk/freedom/release/tv-freedom-arm64-v8a-release.apk shadowsocks-tv-arm64-v8a-${release}.apk
cp tv/build/outputs/apk/freedom/release/tv-freedom-x86-release.apk shadowsocks-tv-x86-${release}.apk
cp tv/build/outputs/apk/freedom/release/tv-freedom-x86_64-release.apk shadowsocks-tv-x86_64-${release}.apk
cp tv/build/outputs/apk/freedom/release/tv-freedom-universal-release.apk shadowsocks-tv-universal-${release}.apk

0 comments on commit 247c4a1

Please sign in to comment.