diff options
| author | Bug Magnet <marco.nikic@mullvad.net> | 2025-02-27 15:36:32 +0100 |
|---|---|---|
| committer | Bug Magnet <marco.nikic@mullvad.net> | 2025-02-27 15:36:32 +0100 |
| commit | 4edeccf444519b25a7f6928d9daaaf3b7dbd491b (patch) | |
| tree | 1cf254248dba178dfcbdb7f0104d342fe38d0bb5 /ios | |
| parent | 7dd681bbd403142edc240c3838326bc9232318b9 (diff) | |
| parent | 1a745bf24d7d78725312fc047679cefe2c8b28a9 (diff) | |
| download | mullvadvpn-4edeccf444519b25a7f6928d9daaaf3b7dbd491b.tar.xz mullvadvpn-4edeccf444519b25a7f6928d9daaaf3b7dbd491b.zip | |
Merge branch 'wireguard-apple-submodule-addendum'lce-dns-temp-branch-android
Diffstat (limited to 'ios')
| -rw-r--r-- | ios/.swiftformat | 2 | ||||
| -rw-r--r-- | ios/BuildInstructions.md | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/ios/.swiftformat b/ios/.swiftformat index 7c599d7ee0..d6c663b36e 100644 --- a/ios/.swiftformat +++ b/ios/.swiftformat @@ -1,5 +1,5 @@ # file options ---exclude Build, .spm, MullvadVPNScreenshots/SnapshotHelper.swift, PacketTunnelCore/Daita/Maybenot.swift +--exclude Build, .spm, MullvadVPNScreenshots/SnapshotHelper.swift, PacketTunnelCore/Daita/Maybenot.swift, wireguard-apple # general options --swiftversion 5.8 diff --git a/ios/BuildInstructions.md b/ios/BuildInstructions.md index 2ba1cf9e9b..f9bb84a00a 100644 --- a/ios/BuildInstructions.md +++ b/ios/BuildInstructions.md @@ -29,6 +29,14 @@ A protobuf compiler is also required in order to build some of the rust dependen brew install protobuf ``` +## Submodules + +The iOS app imports Mullvad's version of `wireguard-go` as a Git submodule. Before building, this must be checked out with + +```bash +git submodule update --init --recursive ios/wireguard-apple +``` + ## Configure Xcode project Copy template files of Xcode build configuration: |