From 8f4f4cfe5a4010f0f06553871b6a19804049ee75 Mon Sep 17 00:00:00 2001 From: Tim Xylon Date: Mon, 14 Aug 2023 16:18:41 +0000 Subject: [PATCH 1/5] Update shadowsocks-rust to v1.15.4 --- core/src/main/rust/shadowsocks-rust | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/rust/shadowsocks-rust b/core/src/main/rust/shadowsocks-rust index 49df0ebbed..16f280cd75 160000 --- a/core/src/main/rust/shadowsocks-rust +++ b/core/src/main/rust/shadowsocks-rust @@ -1 +1 @@ -Subproject commit 49df0ebbedef68874aac6b984e9c5b1762783691 +Subproject commit 16f280cd75a171973f928f7fbec2dae90f07c401 From b2090d023876f49a1c68f5c5027783b650f8e7af Mon Sep 17 00:00:00 2001 From: Tim Xylon Date: Mon, 14 Aug 2023 16:19:31 +0000 Subject: [PATCH 2/5] Bump version to v5.3.4 --- buildSrc/src/main/kotlin/Helpers.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/kotlin/Helpers.kt b/buildSrc/src/main/kotlin/Helpers.kt index cd744d5192..259646ebb0 100644 --- a/buildSrc/src/main/kotlin/Helpers.kt +++ b/buildSrc/src/main/kotlin/Helpers.kt @@ -59,8 +59,8 @@ fun Project.setupCore() { setupCommon() android.apply { defaultConfig { - versionCode = 5030350 - versionName = "5.3.3-nightly" + versionCode = 5030450 + versionName = "5.3.4-nightly" } compileOptions.isCoreLibraryDesugaringEnabled = true lint.apply { From ad1d72f060bebb6229f0fa1a0ce6bfea9385b234 Mon Sep 17 00:00:00 2001 From: Tim Xylon Date: Mon, 14 Aug 2023 16:27:59 +0000 Subject: [PATCH 3/5] Update rust toolchain on CI --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8b34d1be34..b7444c12ee 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,7 +6,7 @@ jobs: - image: cimg/android:2022.12.1-ndk environment: GRADLE_OPTS: -Dorg.gradle.workers.max=1 -Dorg.gradle.daemon=false -Dkotlin.compiler.execution.strategy="in-process" - RUST_VERSION: 1.67.0 + RUST_VERSION: 1.71.1 steps: - checkout - run: git submodule update --init --recursive From f91f594dba793326bba640f020df23774ea438e9 Mon Sep 17 00:00:00 2001 From: Tim Xylon Date: Mon, 14 Aug 2023 16:35:04 +0000 Subject: [PATCH 4/5] Bump CircleCI android image --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b7444c12ee..507645edf0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ jobs: build: working_directory: ~/code docker: - - image: cimg/android:2022.12.1-ndk + - image: cimg/android:2023.08-ndk environment: GRADLE_OPTS: -Dorg.gradle.workers.max=1 -Dorg.gradle.daemon=false -Dkotlin.compiler.execution.strategy="in-process" RUST_VERSION: 1.71.1 From 5ce47bb50aba3e6be1782914d937db6a3549d1ad Mon Sep 17 00:00:00 2001 From: Tim Xylon Date: Mon, 14 Aug 2023 16:39:16 +0000 Subject: [PATCH 5/5] Update shadowsocks-rust to master --- core/src/main/rust/shadowsocks-rust | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/rust/shadowsocks-rust b/core/src/main/rust/shadowsocks-rust index 16f280cd75..20e29f8ec6 160000 --- a/core/src/main/rust/shadowsocks-rust +++ b/core/src/main/rust/shadowsocks-rust @@ -1 +1 @@ -Subproject commit 16f280cd75a171973f928f7fbec2dae90f07c401 +Subproject commit 20e29f8ec6896308e0cdfa46e7054265e6bdcb23