Skip to content

Commit 6770017

Browse files
APPLE: chore fix BuildCore.sh script (#5011)
* APPLE: chore fix BuildCore.sh script * APPLE: add beta feature to Split Tunnel
1 parent a566f35 commit 6770017

3 files changed

Lines changed: 50 additions & 1 deletion

File tree

nym-vpn-apple/NymVPN/Resources/Localizable.xcstrings

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34898,6 +34898,17 @@
3489834898
}
3489934899
}
3490034900
},
34901+
"splitTunnel.betaFeature" : {
34902+
"extractionState" : "manual",
34903+
"localizations" : {
34904+
"en" : {
34905+
"stringUnit" : {
34906+
"state" : "translated",
34907+
"value" : "Beta feature"
34908+
}
34909+
}
34910+
}
34911+
},
3490134912
"splitTunnel.apps" : {
3490234913
"extractionState" : "manual",
3490334914
"localizations" : {
@@ -35994,6 +36005,17 @@
3599436005
}
3599536006
}
3599636007
},
36008+
"subscriptionPayment.received" : {
36009+
"extractionState" : "manual",
36010+
"localizations" : {
36011+
"en" : {
36012+
"stringUnit" : {
36013+
"state" : "translated",
36014+
"value" : "Payment received\nRequesting ZkNyms..."
36015+
}
36016+
}
36017+
}
36018+
},
3599736019
"support.protect.subtitle1" : {
3599836020
"extractionState" : "manual",
3599936021
"localizations" : {

nym-vpn-apple/Scripts/BuildCore.sh

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,20 @@ rm -rf "${LIB_DEST}"
5656
cp -R "${LIB_SRC}" "${LIB_DEST}"
5757
echo "[BuildCore] Copied NymVPNLib → ${LIB_DEST}"
5858

59+
# 2b) Flatten xcframework headers for Xcode 26+ explicit module builds
60+
XCODE_VER="$(xcodebuild -version 2>/dev/null | head -1 | awk '{print $2}')"
61+
if [[ "$(printf '%s\n' "26.4" "${XCODE_VER}" | sort -V | head -1)" == "26.4" ]]; then
62+
for HEADERS_DIR in "${LIB_DEST}"/NymVPNLibUniffi.xcframework/*/Headers; do
63+
for SUBDIR in "${HEADERS_DIR}"/*/; do
64+
[[ -d "${SUBDIR}" ]] || continue
65+
cp -n "${SUBDIR}"* "${HEADERS_DIR}/" 2>/dev/null || true
66+
done
67+
done
68+
echo "[BuildCore] Flattened NymVPNLib xcframework headers (Xcode ${XCODE_VER})"
69+
else
70+
echo "[BuildCore] Skipping header flatten (Xcode ${XCODE_VER} < 26.4)"
71+
fi
72+
5973
# 3) Build macOS (produces upload/mac/nym-vpnd if macOS.mk has vpnd targets)
6074
make -f macOS.mk libwg nym-setup nym-vpnd rpc-swift-package RELEASE="${RELEASE}"
6175

@@ -66,6 +80,19 @@ rm -rf "${RPC_DEST}"
6680
cp -R "${RPC_SRC}" "${RPC_DEST}"
6781
echo "[BuildCore] Copied NymVPNRpc → ${RPC_DEST}"
6882

83+
# 4b) Flatten xcframework headers for Xcode 26+ explicit module builds
84+
if [[ "$(printf '%s\n' "26.4" "${XCODE_VER}" | sort -V | head -1)" == "26.4" ]]; then
85+
for HEADERS_DIR in "${RPC_DEST}"/NymVPNRpcUniffi.xcframework/*/Headers; do
86+
for SUBDIR in "${HEADERS_DIR}"/*/; do
87+
[[ -d "${SUBDIR}" ]] || continue
88+
cp -n "${SUBDIR}"* "${HEADERS_DIR}/" 2>/dev/null || true
89+
done
90+
done
91+
echo "[BuildCore] Flattened NymVPNRpc xcframework headers (Xcode ${XCODE_VER})"
92+
else
93+
echo "[BuildCore] Skipping header flatten (Xcode ${XCODE_VER} < 26.4)"
94+
fi
95+
6996
# 5) Copy the universal nym-vpnd → apple Daemon
7097
VPND_SRC="${CORE_ROOT}/upload/mac/nym-vpnd"
7198
VPND_DEST_DIR="${APPLE_ROOT}/Daemon"

nym-vpn-apple/Settings/Sources/Settings/SplitTunneling/SplitTunnelView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ private extension SplitTunnelView {
104104

105105
var changesText: some View {
106106
HStack {
107-
Text("\("splitTunel.apps.exclude".localizedString) \n\("splitTunnel.apps.unprotected".localizedString)")
107+
Text("⚠️ \("splitTunnel.betaFeature".localizedString)\n\("splitTunel.apps.exclude".localizedString) \n\("splitTunnel.apps.unprotected".localizedString)")
108108
.foregroundStyle(NymColor.gray1)
109109
.textStyle(.Body.Medium.regular)
110110
Spacer()

0 commit comments

Comments
 (0)