Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

APPLE: update core #1735

Merged
merged 5 commits into from
Dec 9, 2024
Merged

APPLE: update core #1735

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b55b867
APPLE: update core
rokas-ambrazevicius Dec 6, 2024
f77ca1f
Fix logout not logging out
rokas-ambrazevicius Dec 9, 2024
a9b22cf
Add device identifier
rokas-ambrazevicius Dec 9, 2024
6472334
Add BouncingMarqueeTextView
rokas-ambrazevicius Dec 9, 2024
1f3b939
Upadate core to v1.1.0-beta.1
rokas-ambrazevicius Dec 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions nym-vpn-apple/Daemon/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
<key>CFBundleName</key>
<string>NymVPNHelper</string>
<key>CFBundleShortVersionString</key>
<string>1.0.0</string>
<string>1.1.0</string>
<key>CFBundleVersion</key>
<string>24</string>
<string>26</string>
<key>SMAuthorizedClients</key>
<array>
<string>anchor apple generic and identifier "net.nymtech.vpn" and (certificate leaf[field.1.2.840.113635.100.6.1.9] /* exists */ or certificate 1[field.1.2.840.113635.100.6.2.6] /* exists */ and certificate leaf[field.1.2.840.113635.100.6.1.13] /* exists */ and certificate leaf[subject.OU] = VW5DZLFHM5)</string>
Expand Down
Binary file modified nym-vpn-apple/Daemon/net.nymtech.vpn.helper
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions nym-vpn-apple/MixnetLibrary/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ let package = Package(
),
.binaryTarget(
name: "NymVpnLib",
url: "https://github.com/nymtech/nym-vpn-client/releases/download/nym-vpn-core-v1.1.0-dev-1/nym-vpn-core-v1.1.0-dev_ios_universal.zip",
checksum: "a763ae785ce77aeb5d3fee590d733900ee62c813ba4f48b3aa34ce05df7c0e48"
url: "https://github.com/nymtech/nym-vpn-client/releases/download/nym-vpn-core-v1.1.0-dev.3/nym-vpn-core-v1.1.0-dev_ios_universal.zip",
checksum: "d85aedefd560b16c00b387fd2fd24a1e0d8cce88bf637fd8115c3337ad55e466"
),
// .binaryTarget(
// name: "NymVpnLib",
Expand Down
12 changes: 6 additions & 6 deletions nym-vpn-apple/NymVPN.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -784,7 +784,7 @@
CODE_SIGN_ENTITLEMENTS = NymMixnetTunnel/NymMixnetTunnel.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 323;
CURRENT_PROJECT_VERSION = 325;
DEVELOPMENT_TEAM = VW5DZLFHM5;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
GENERATE_INFOPLIST_FILE = NO;
Expand Down Expand Up @@ -819,7 +819,7 @@
CODE_SIGN_ENTITLEMENTS = NymMixnetTunnel/NymMixnetTunnel.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 323;
CURRENT_PROJECT_VERSION = 325;
DEVELOPMENT_TEAM = VW5DZLFHM5;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
GENERATE_INFOPLIST_FILE = NO;
Expand Down Expand Up @@ -977,7 +977,7 @@
CODE_SIGN_ENTITLEMENTS = NymVPN/NymVPN.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 323;
CURRENT_PROJECT_VERSION = 325;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = VW5DZLFHM5;
ENABLE_PREVIEWS = YES;
Expand Down Expand Up @@ -1017,7 +1017,7 @@
CODE_SIGN_ENTITLEMENTS = NymVPN/NymVPN.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 323;
CURRENT_PROJECT_VERSION = 325;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = VW5DZLFHM5;
ENABLE_PREVIEWS = YES;
Expand Down Expand Up @@ -1056,7 +1056,7 @@
CODE_SIGN_IDENTITY = "Developer ID Application";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 35;
CURRENT_PROJECT_VERSION = 37;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_ASSET_PATHS = "\"NymVPNDaemon/Preview Content\"";
DEVELOPMENT_TEAM = VW5DZLFHM5;
Expand Down Expand Up @@ -1092,7 +1092,7 @@
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Developer ID Application";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 35;
CURRENT_PROJECT_VERSION = 37;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_ASSET_PATHS = "\"NymVPNDaemon/Preview Content\"";
DEVELOPMENT_TEAM = "";
Expand Down
14 changes: 1 addition & 13 deletions nym-vpn-apple/Scripts/UpdateCore.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,19 +190,7 @@ echo "✅ Files copied successfully to $destination_folder."
# Go back to the previous directory
cd -

# Update the requiredVersion in HelperManager.swift to match the provided version

helper_manager_file="../ServicesMacOS/Sources/HelperManager/HelperManager.swift"

if [[ -f "$helper_manager_file" ]]; then
# Use sed to update the requiredVersion line with the new version
sed -i '' "s/public let requiredVersion = \".*\"/public let requiredVersion = \"$VERSION\"/g" "$helper_manager_file"
echo "✅ HelperManager.swift has been successfully updated with the new required version: $VERSION."
else
echo "❌ Error: HelperManager.swift file not found at $helper_manager_file"
exit 1
fi

# Update daemon Info.plist
sh UpdateDaemonInfoPlist.sh ${VERSION}

# Remove the downloaded source zip file and extracted folder
Expand Down
1 change: 0 additions & 1 deletion nym-vpn-apple/ServicesMacOS/Sources/HelperManager/HelperManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import Shell

public final class HelperManager {
public static let shared = HelperManager()
public let requiredVersion = "1.1.0-dev-1"

private var helperName = ""

Expand Down
Loading