diff options
| author | Bug Magnet <marco.nikic@mullvad.net> | 2025-09-23 08:45:53 +0200 |
|---|---|---|
| committer | Bug Magnet <marco.nikic@mullvad.net> | 2025-09-23 08:45:53 +0200 |
| commit | b03b207a238bc3562d0f78d5c1b5c9825ef86d93 (patch) | |
| tree | ab34b45c0260edc670e2d7865187d94abc055fbf | |
| parent | 4eb0019f38bb1d1fe52dc6d3b335bce9b7ba62ce (diff) | |
| parent | 47e66263b973c5488f5699d60862328f44cf30a7 (diff) | |
| download | mullvadvpn-b03b207a238bc3562d0f78d5c1b5c9825ef86d93.tar.xz mullvadvpn-b03b207a238bc3562d0f78d5c1b5c9825ef86d93.zip | |
Merge branch 'update-snapfile-ios-screenshots'
| -rw-r--r-- | ios/MullvadREST/Transport/Shadowsocks/ShadowsocksCacheCleaner.swift | 1 | ||||
| -rw-r--r-- | ios/MullvadRustRuntime/MullvadApiContext.swift | 1 | ||||
| -rw-r--r-- | ios/MullvadVPN.xcodeproj/project.pbxproj | 10 | ||||
| -rw-r--r-- | ios/Snapfile | 6 |
4 files changed, 10 insertions, 8 deletions
diff --git a/ios/MullvadREST/Transport/Shadowsocks/ShadowsocksCacheCleaner.swift b/ios/MullvadREST/Transport/Shadowsocks/ShadowsocksCacheCleaner.swift index 05af069fad..6431dfd8df 100644 --- a/ios/MullvadREST/Transport/Shadowsocks/ShadowsocksCacheCleaner.swift +++ b/ios/MullvadREST/Transport/Shadowsocks/ShadowsocksCacheCleaner.swift @@ -8,6 +8,7 @@ import Foundation import MullvadSettings +import MullvadTypes public class ShadowsocksCacheCleaner: MullvadAccessMethodChangeListening { let cache: ShadowsocksConfigurationCacheProtocol diff --git a/ios/MullvadRustRuntime/MullvadApiContext.swift b/ios/MullvadRustRuntime/MullvadApiContext.swift index 66d40d800a..620d2a96ab 100644 --- a/ios/MullvadRustRuntime/MullvadApiContext.swift +++ b/ios/MullvadRustRuntime/MullvadApiContext.swift @@ -6,7 +6,6 @@ // Copyright © 2025 Mullvad VPN AB. All rights reserved. // -import MullvadSettings import MullvadTypes func onAccessChangeCallback(selfPtr: UnsafeRawPointer?, bytes: UnsafePointer<UInt8>?) { diff --git a/ios/MullvadVPN.xcodeproj/project.pbxproj b/ios/MullvadVPN.xcodeproj/project.pbxproj index 824b0e1ccc..410989b975 100644 --- a/ios/MullvadVPN.xcodeproj/project.pbxproj +++ b/ios/MullvadVPN.xcodeproj/project.pbxproj @@ -53,7 +53,6 @@ 4424CDD32CDBD4A6009D8C9F /* SingleChoiceList.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4424CDD22CDBD4A6009D8C9F /* SingleChoiceList.swift */; }; 447F3D8A2CDE1853006E3462 /* ShadowsocksObfuscationSettingsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 447F3D882CDE1852006E3462 /* ShadowsocksObfuscationSettingsViewModel.swift */; }; 447F3D8B2CDE1853006E3462 /* ShadowsocksObfuscationSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 447F3D892CDE1853006E3462 /* ShadowsocksObfuscationSettingsView.swift */; }; - 4483EC372E26A53D007E5473 /* MullvadAccessMethodChangeListening.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4483EC352E2693D5007E5473 /* MullvadAccessMethodChangeListening.swift */; }; 449275422C3570CA000526DE /* ICMP.swift in Sources */ = {isa = PBXBuildFile; fileRef = 449275412C3570CA000526DE /* ICMP.swift */; }; 4495ECD12D0B170700A7358B /* UDPOverTCPObfuscationSettingsPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4495ECD02D0B16F700A7358B /* UDPOverTCPObfuscationSettingsPage.swift */; }; 4495ECD52D131A4800A7358B /* ShadowsocksObfuscationSettingsPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4495ECD42D131A3E00A7358B /* ShadowsocksObfuscationSettingsPage.swift */; }; @@ -793,6 +792,7 @@ A97275562CE36CAE00029F15 /* DaitaV2Parameters.swift in Sources */ = {isa = PBXBuildFile; fileRef = A97275552CE36CAE00029F15 /* DaitaV2Parameters.swift */; }; A97687C82DD60D5D000D96E8 /* AddressCacheProviding.swift in Sources */ = {isa = PBXBuildFile; fileRef = A97687C72DD60D5D000D96E8 /* AddressCacheProviding.swift */; }; A97687CA2DD60F36000D96E8 /* MullvadAddressCacheProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = A97687C92DD60F36000D96E8 /* MullvadAddressCacheProvider.swift */; }; + A977E15D2E816B8200B7ABF6 /* MullvadAccessMethodChangeListening.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4483EC352E2693D5007E5473 /* MullvadAccessMethodChangeListening.swift */; }; A97D25AE2B0BB18100946B2D /* ProtocolObfuscator.swift in Sources */ = {isa = PBXBuildFile; fileRef = A97D25AD2B0BB18100946B2D /* ProtocolObfuscator.swift */; }; A97D25B02B0BB5C400946B2D /* ProtocolObfuscationStub.swift in Sources */ = {isa = PBXBuildFile; fileRef = A97D25AF2B0BB5C400946B2D /* ProtocolObfuscationStub.swift */; }; A97D25B22B0CB02D00946B2D /* ProtocolObfuscatorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A97D25B12B0CB02D00946B2D /* ProtocolObfuscatorTests.swift */; }; @@ -6252,7 +6252,6 @@ A93181A12B727ED700E341D2 /* TunnelSettingsV4.swift in Sources */, 58FE25BF2AA72311003D1918 /* MigrationManager.swift in Sources */, 58B2FDEF2AA720C4003EB5C6 /* ApplicationTarget.swift in Sources */, - 4483EC372E26A53D007E5473 /* MullvadAccessMethodChangeListening.swift in Sources */, A988DF272ADE86ED00D807EF /* WireGuardObfuscationSettings.swift in Sources */, 58B2FDDE2AA71D5C003EB5C6 /* Migration.swift in Sources */, F05769BB2C6661EE00D9778B /* TunnelSettingsStrategy.swift in Sources */, @@ -6893,6 +6892,7 @@ 58D22412294C90210029F5F8 /* RelayConstraint.swift in Sources */, 7A7AD14F2BF21EF200B30B3C /* NameInputFormatter.swift in Sources */, 58D22413294C90210029F5F8 /* RelayConstraints.swift in Sources */, + A977E15D2E816B8200B7ABF6 /* MullvadAccessMethodChangeListening.swift in Sources */, 7AB401852DA53D5300522E17 /* NewAccountData.swift in Sources */, A97687C82DD60D5D000D96E8 /* AddressCacheProviding.swift in Sources */, A97275562CE36CAE00029F15 /* DaitaV2Parameters.swift in Sources */, @@ -9283,9 +9283,10 @@ ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = CKG9MXH72F; + DEVELOPMENT_TEAM = ""; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = CKG9MXH72F; ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu17; GENERATE_INFOPLIST_FILE = YES; @@ -9294,6 +9295,7 @@ MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = net.mullvad.MullvadRustRuntimeTests; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = NO; SWIFT_EMIT_LOC_STRINGS = NO; diff --git a/ios/Snapfile b/ios/Snapfile index eccf0278c3..80d17c6a77 100644 --- a/ios/Snapfile +++ b/ios/Snapfile @@ -1,10 +1,10 @@ -ios_version '17.2' +ios_version '18.5' # A list of devices you want to take the screenshots from devices([ "iPhone SE (3rd generation)", - "iPhone 15 Pro", - "iPhone 15 Pro Max", + "iPhone 16 Pro", + "iPhone 16 Pro Max", "iPad Pro 11-inch (M4)", "iPad Pro 13-inch (M4)" ]) |
