From 5b89d1fdd872fed6330714d745b901955607dca1 Mon Sep 17 00:00:00 2001 From: cyan Date: Tue, 9 Sep 2025 07:27:52 -0400 Subject: [PATCH] fix: tor on macOS (#2514) This PR fixes missing entitlemends, and ITMS-90291, ITMS-90292 from app review --- .github/workflows/pr_test_build_android.yml | 2 +- .github/workflows/pr_test_build_linux.yml | 2 +- cw_core/lib/utils/tor/torch.dart | 2 +- ios/Podfile.lock | 2 +- macos/Podfile.lock | 2 +- macos/Runner/DebugProfileBase.entitlements | 4 ++-- macos/Runner/ReleaseBase.entitlements | 2 ++ macos/Runner/RunnerBase.entitlements | 2 ++ scripts/prepare_torch.sh | 4 ++-- 9 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.github/workflows/pr_test_build_android.yml b/.github/workflows/pr_test_build_android.yml index b40798cd9..135752105 100644 --- a/.github/workflows/pr_test_build_android.yml +++ b/.github/workflows/pr_test_build_android.yml @@ -223,7 +223,7 @@ jobs: run: | set -x -e pushd scripts - wget https://github.com/MrCyjaneK/torch_dart/releases/download/4f987d4-1-ge071fcf-1-gc282f09-1-g4c290aa-1-gabdf653/torch_dart-4f987d4-1-ge071fcf-1-gc282f09-1-g4c290aa-1-gabdf653.tar.gz -O torch_dart.tar.gz + wget https://github.com/MrCyjaneK/torch_dart/releases/download/v1.0.4/torch_dart-v1.0.4.tar.gz -O torch_dart.tar.gz mkdir torch_dart pushd torch_dart tar -xzf ../torch_dart.tar.gz diff --git a/.github/workflows/pr_test_build_linux.yml b/.github/workflows/pr_test_build_linux.yml index 8c823a504..0a6370184 100644 --- a/.github/workflows/pr_test_build_linux.yml +++ b/.github/workflows/pr_test_build_linux.yml @@ -207,7 +207,7 @@ jobs: run: | set -x -e pushd scripts - wget https://github.com/MrCyjaneK/torch_dart/releases/download/4f987d4-1-ge071fcf-1-gc282f09-1-g4c290aa-1-gabdf653/torch_dart-4f987d4-1-ge071fcf-1-gc282f09-1-g4c290aa-1-gabdf653.tar.gz -O torch_dart.tar.gz + wget https://github.com/MrCyjaneK/torch_dart/releases/download/v1.0.4/torch_dart-v1.0.4.tar.gz -O torch_dart.tar.gz mkdir torch_dart pushd torch_dart tar -xzf ../torch_dart.tar.gz diff --git a/cw_core/lib/utils/tor/torch.dart b/cw_core/lib/utils/tor/torch.dart index 914662759..7fb4826f9 100644 --- a/cw_core/lib/utils/tor/torch.dart +++ b/cw_core/lib/utils/tor/torch.dart @@ -29,7 +29,7 @@ class CakeTorTorch implements CakeTorInstance { bool get enabled => isTorRunning; @override - int get port => 42142; + int get port => 52142; @override Future start() async { diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 5d997f8df..c926a3d65 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -246,7 +246,7 @@ SPEC CHECKSUMS: flutter_secure_storage: 2c2ff13db9e0a5647389bff88b0ecac56e3f3418 fluttertoast: 2c67e14dce98bbdb200df9e1acf610d7a6264ea1 image_picker_ios: 7fe1ff8e34c1790d6fff70a32484959f563a928a - in_app_review: 5596fe56fab799e8edb3561c03d053363ab13457 + in_app_review: 7dd1ea365263f834b8464673f9df72c80c17c937 integration_test: 4a889634ef21a45d28d50d622cf412dc6d9f586e OrderedSet: e539b66b644ff081c73a262d24ad552a69be3a94 package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499 diff --git a/macos/Podfile.lock b/macos/Podfile.lock index e72a5ba58..6e5677054 100644 --- a/macos/Podfile.lock +++ b/macos/Podfile.lock @@ -134,7 +134,7 @@ SPEC CHECKSUMS: flutter_local_notifications: 4bf37a31afde695b56091b4ae3e4d9c7a7e6cda0 flutter_secure_storage_macos: 3dacac420d84c4d0dc5e868194ee43c8664ec797 FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24 - in_app_review: 0599bccaed5e02f6bed2b0d30d16f86b63ed8638 + in_app_review: 66e7680752b632d83f4f0e88b34d52ed303fbff4 OrderedSet: e539b66b644ff081c73a262d24ad552a69be3a94 package_info_plus: f0052d280d17aa382b932f399edf32507174e870 path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564 diff --git a/macos/Runner/DebugProfileBase.entitlements b/macos/Runner/DebugProfileBase.entitlements index d6b74b4aa..526d24107 100644 --- a/macos/Runner/DebugProfileBase.entitlements +++ b/macos/Runner/DebugProfileBase.entitlements @@ -6,8 +6,6 @@ com.apple.security.cs.allow-jit - com.apple.security.network.server - com.apple.security.device.bluetooth keychain-access-groups @@ -16,5 +14,7 @@ com.apple.security.network.client + com.apple.security.network.server + diff --git a/macos/Runner/ReleaseBase.entitlements b/macos/Runner/ReleaseBase.entitlements index c942c3aa9..fdc10515c 100644 --- a/macos/Runner/ReleaseBase.entitlements +++ b/macos/Runner/ReleaseBase.entitlements @@ -12,5 +12,7 @@ com.apple.security.network.client + com.apple.security.network.server + diff --git a/macos/Runner/RunnerBase.entitlements b/macos/Runner/RunnerBase.entitlements index 5e6cc995d..447224075 100644 --- a/macos/Runner/RunnerBase.entitlements +++ b/macos/Runner/RunnerBase.entitlements @@ -6,6 +6,8 @@ com.apple.security.network.client + com.apple.security.network.server + com.apple.security.device.bluetooth keychain-access-groups diff --git a/scripts/prepare_torch.sh b/scripts/prepare_torch.sh index f8760e62e..4520b8630 100755 --- a/scripts/prepare_torch.sh +++ b/scripts/prepare_torch.sh @@ -5,9 +5,9 @@ cd "$(dirname "$0")" # IMPORTANT: Make sure to update action 'Build Torch` in # - .github/workflows/pr_test_build_android.yml # - .github/workflows/pr_test_build_linux.yml -# https://github.com/MrCyjaneK/torch_dart/releases/download/4f987d4-1-ge071fcf-1-gc282f09-1-g4c290aa-1-gabdf653/torch_dart-4f987d4-1-ge071fcf-1-gc282f09-1-g4c290aa-1-gabdf653.tar.gz +# https://github.com/MrCyjaneK/torch_dart/releases/download/v1.0.4/torch_dart-v1.0.4.tar.gz -HASH=abdf653fc15b576f2a67597a1f9618345a297f45 +HASH=8d22697df9d1e43ac98dd55087190bae17d32c05 if [[ ! -d "torch_dart/.git" ]]; then