APPLE: update core

nymtech · Dec 6, 2024 · 95f4ab1 · 95f4ab1
1 parent f58ad74
commit 95f4ab1
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 24 deletions.
diff --git a/nym-vpn-apple/Daemon/Info.plist b/nym-vpn-apple/Daemon/Info.plist
@@ -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>25</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>

diff --git a/nym-vpn-apple/Daemon/net.nymtech.vpn.helper b/nym-vpn-apple/Daemon/net.nymtech.vpn.helper
diff --git a/nym-vpn-apple/MixnetLibrary/Package.swift b/nym-vpn-apple/MixnetLibrary/Package.swift
@@ -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.2/nym-vpn-core-v1.1.0-dev_ios_universal.zip",
+            checksum: "430dbb5bdf4f8504b2c4d32a4a75bda4271d373e0beb77d4af6ef5296892f32f"
         ),
 //        .binaryTarget(
 //            name: "NymVpnLib",

diff --git a/nym-vpn-apple/NymVPN.xcodeproj/project.pbxproj b/nym-vpn-apple/NymVPN.xcodeproj/project.pbxproj
@@ -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 = 324;
 				DEVELOPMENT_TEAM = VW5DZLFHM5;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GENERATE_INFOPLIST_FILE = NO;
@@ -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 = 324;
 				DEVELOPMENT_TEAM = VW5DZLFHM5;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GENERATE_INFOPLIST_FILE = NO;
@@ -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 = 324;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = VW5DZLFHM5;
 				ENABLE_PREVIEWS = YES;
@@ -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 = 324;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = VW5DZLFHM5;
 				ENABLE_PREVIEWS = YES;
@@ -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 = 36;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"NymVPNDaemon/Preview Content\"";
 				DEVELOPMENT_TEAM = VW5DZLFHM5;
@@ -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 = 36;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"NymVPNDaemon/Preview Content\"";
 				DEVELOPMENT_TEAM = "";

diff --git a/nym-vpn-apple/Scripts/UpdateCore.sh b/nym-vpn-apple/Scripts/UpdateCore.sh
@@ -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

diff --git a/nym-vpn-apple/ServicesMacOS/Sources/HelperManager/HelperManager.swift b/nym-vpn-apple/ServicesMacOS/Sources/HelperManager/HelperManager.swift
@@ -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 = ""