From e5d7e4978454f402bfc8ea674464fc22c74129c0 Mon Sep 17 00:00:00 2001
From: ssrlive <30760636+ssrlive@users.noreply.github.com>
Date: Sat, 30 Mar 2024 11:14:41 +0800
Subject: [PATCH] Bump version 0.1.3

---
 .github/workflows/publish-exe.yml             |  2 ++
 Cargo.toml                                    |  4 +--
 ...bug.sh => build-aarch64-apple-ios-debug.sh |  2 +-
 build-aarch64-apple-ios.sh                    | 27 +++++++++++++++++++
 build-apple.sh                                | 13 ++++++++-
 cbindgen.toml                                 |  6 +++++
 src/api.rs                                    |  1 -
 7 files changed, 50 insertions(+), 5 deletions(-)
 rename build-apple-debug.sh => build-aarch64-apple-ios-debug.sh (93%)
 create mode 100755 build-aarch64-apple-ios.sh

diff --git a/.github/workflows/publish-exe.yml b/.github/workflows/publish-exe.yml
index d927ddb..6462b3f 100644
--- a/.github/workflows/publish-exe.yml
+++ b/.github/workflows/publish-exe.yml
@@ -69,6 +69,8 @@ jobs:
           elif [[ "${{ matrix.host_os }}" == "macos-latest" ]]; then
             zip -j mypubdir4/dns2socks-${{ matrix.target }}.zip target/${{ matrix.target }}/release/dns2socks README.md target/dns2socks-ffi.h target/${{ matrix.target }}/release/libdns2socks.dylib
             if [[ "${{ matrix.target }}" == "x86_64-apple-darwin" ]]; then
+              ./build-aarch64-apple-ios.sh
+              zip -r mypubdir4/dns2socks-aarch64-apple-ios-xcframework.zip ./dns2socks.xcframework/
               ./build-apple.sh
               zip -r mypubdir4/dns2socks-apple-xcframework.zip ./dns2socks.xcframework/
             fi
diff --git a/Cargo.toml b/Cargo.toml
index 3b820cb..cd1714c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "dns2socks"
-version = "0.1.2"
+version = "0.1.3"
 edition = "2021"
 license = "MIT"
 repository = "https://github.com/ssrlive/dns2socks"
@@ -18,7 +18,7 @@ ctrlc2 = { version = "3.5", features = ["tokio", "termination"] }
 dotenvy = "0.15"
 env_logger = "0.11"
 log = "0.4"
-moka = { version = "0.12", features = ["future"] }
+moka = { version = "0.12", default-features = false, features = ["future"] }
 rand = "0.8"
 socks5-impl = "0.5"
 tokio = { version = "1.36", features = ["full"] }
diff --git a/build-apple-debug.sh b/build-aarch64-apple-ios-debug.sh
similarity index 93%
rename from build-apple-debug.sh
rename to build-aarch64-apple-ios-debug.sh
index e36b7c0..f204430 100755
--- a/build-apple-debug.sh
+++ b/build-aarch64-apple-ios-debug.sh
@@ -11,7 +11,7 @@ echo "Generating includes..."
 mkdir -p target/include/
 rm -rf target/include/*
 cbindgen --config cbindgen.toml -l C -o target/include/dns2socks.h
-cat > target/include/module.modulemap <<EOF
+cat > target/include/dns2socks.modulemap <<EOF
 framework module dns2socks {
     umbrella header "dns2socks.h"
 
diff --git a/build-aarch64-apple-ios.sh b/build-aarch64-apple-ios.sh
new file mode 100755
index 0000000..4e3e8a6
--- /dev/null
+++ b/build-aarch64-apple-ios.sh
@@ -0,0 +1,27 @@
+#! /bin/sh
+
+echo "Setting up the rust environment..."
+rustup target add aarch64-apple-ios
+cargo install cbindgen
+
+echo "Building target aarch64-apple-ios..."
+cargo build --release --target aarch64-apple-ios
+
+echo "Generating includes..."
+mkdir -p target/include/
+rm -rf target/include/*
+cbindgen --config cbindgen.toml -l C -o target/include/dns2socks.h
+cat > target/include/dns2socks.modulemap <<EOF
+framework module dns2socks {
+    umbrella header "dns2socks.h"
+
+    export *
+    module * { export * }
+}
+EOF
+
+echo "Creating XCFramework"
+rm -rf ./dns2socks.xcframework
+xcodebuild -create-xcframework \
+    -library ./target/aarch64-apple-ios/release/libdns2socks.a -headers ./target/include/ \
+    -output ./dns2socks.xcframework
diff --git a/build-apple.sh b/build-apple.sh
index bc5d3b3..0d052a7 100755
--- a/build-apple.sh
+++ b/build-apple.sh
@@ -5,16 +5,27 @@ rustup target add aarch64-apple-ios aarch64-apple-ios-sim x86_64-apple-ios x86_6
 cargo install cbindgen
 
 echo "Building..."
+
+echo "cargo build --release --target x86_64-apple-darwin"
 cargo build --release --target x86_64-apple-darwin
+
+echo "cargo build --release --target aarch64-apple-darwin"
 cargo build --release --target aarch64-apple-darwin
+
+echo "cargo build --release --target aarch64-apple-ios"
 cargo build --release --target aarch64-apple-ios
+
+echo "cargo build --release --target x86_64-apple-ios"
 cargo build --release --target x86_64-apple-ios
+
+echo "cargo build --release --target aarch64-apple-ios-sim"
 cargo build --release --target aarch64-apple-ios-sim
 
 echo "Generating includes..."
 mkdir -p target/include/
+rm -rf target/include/*
 cbindgen --config cbindgen.toml -l C -o target/include/dns2socks.h
-cat > target/include/module.modulemap <<EOF
+cat > target/include/dns2socks.modulemap <<EOF
 framework module dns2socks {
     umbrella header "dns2socks.h"
 
diff --git a/cbindgen.toml b/cbindgen.toml
index 47a7478..e47bd69 100644
--- a/cbindgen.toml
+++ b/cbindgen.toml
@@ -1,3 +1,9 @@
 [export]
 include = ["dns2socks_start", "dns2socks_stop", "dns2socks_set_log_callback"]
 exclude = []
+
+[export.rename]
+"ArgVerbosity" = "Dns2socksVerbosity"
+
+[enum]
+prefix_with_name = true
diff --git a/src/api.rs b/src/api.rs
index 6c84652..22ceb07 100644
--- a/src/api.rs
+++ b/src/api.rs
@@ -43,7 +43,6 @@ pub unsafe extern "C" fn dns2socks_start(
     log::set_max_level(verbosity.into());
     if let Err(err) = log::set_boxed_logger(Box::<crate::dump_logger::DumpLogger>::default()) {
         log::error!("set logger error: {}", err);
-        return -1;
     }
 
     let mut config = crate::Config::default();