summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAndrej Mihajlov <and@mullvad.net>2023-02-14 15:48:06 +0100
committerAndrej Mihajlov <and@mullvad.net>2023-02-14 15:48:06 +0100
commit6e818e8a762d998ec8c69fcc3345020b4c27c6aa (patch)
treecc44bd0a01050e5038001d6bcef9c009a85c7ea4
parentbd399abf090c7a062e4d48073018e6ea1a9ce928 (diff)
parent1babf1194a71255b71001038a2f0779a527822e0 (diff)
downloadmullvadvpn-6e818e8a762d998ec8c69fcc3345020b4c27c6aa.tar.xz
mullvadvpn-6e818e8a762d998ec8c69fcc3345020b4c27c6aa.zip
Merge branch 'add-6-7inch-device'
-rw-r--r--ios/CHANGELOG.md1
-rw-r--r--ios/Gemfile.lock24
-rw-r--r--ios/Snapfile10
3 files changed, 17 insertions, 18 deletions
diff --git a/ios/CHANGELOG.md b/ios/CHANGELOG.md
index 6595ac0de3..62f5fae546 100644
--- a/ios/CHANGELOG.md
+++ b/ios/CHANGELOG.md
@@ -39,6 +39,7 @@ Line wrap the file at 100 chars. Th
- When logged into an account with no time left, a new view is shown instead of account settings,
with the option to buy more time.
- Use exponential backoff with jitter for delay interval when retrying REST API requests.
+- REST API requests will bypass VPN when tunnel is not functional.
### Fixed
- Improve random port distribution. Should be less biased towards port 53.
diff --git a/ios/Gemfile.lock b/ios/Gemfile.lock
index d205e03c44..38a2ee55ec 100644
--- a/ios/Gemfile.lock
+++ b/ios/Gemfile.lock
@@ -1,23 +1,23 @@
GEM
remote: https://rubygems.org/
specs:
- CFPropertyList (3.0.5)
+ CFPropertyList (3.0.6)
rexml
addressable (2.8.1)
public_suffix (>= 2.0.2, < 6.0)
artifactory (3.0.15)
atomos (0.1.3)
aws-eventstream (1.2.0)
- aws-partitions (1.680.0)
- aws-sdk-core (3.168.4)
+ aws-partitions (1.710.0)
+ aws-sdk-core (3.170.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.5)
jmespath (~> 1, >= 1.6.1)
- aws-sdk-kms (1.61.0)
+ aws-sdk-kms (1.62.0)
aws-sdk-core (~> 3, >= 3.165.0)
aws-sigv4 (~> 1.1)
- aws-sdk-s3 (1.117.2)
+ aws-sdk-s3 (1.119.0)
aws-sdk-core (~> 3, >= 3.165.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.4)
@@ -36,8 +36,8 @@ GEM
unf (>= 0.0.5, < 1.0.0)
dotenv (2.8.1)
emoji_regex (3.2.3)
- excon (0.95.0)
- faraday (1.10.2)
+ excon (0.99.0)
+ faraday (1.10.3)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
@@ -106,9 +106,9 @@ GEM
xcpretty (~> 0.3.0)
xcpretty-travis-formatter (>= 0.0.3)
gh_inspector (1.1.3)
- google-apis-androidpublisher_v3 (0.32.0)
+ google-apis-androidpublisher_v3 (0.34.0)
google-apis-core (>= 0.9.1, < 2.a)
- google-apis-core (0.9.2)
+ google-apis-core (0.11.0)
addressable (~> 2.5, >= 2.5.1)
googleauth (>= 0.16.2, < 2.a)
httpclient (>= 2.8.1, < 3.a)
@@ -150,7 +150,7 @@ GEM
httpclient (2.8.3)
jmespath (1.6.2)
json (2.6.3)
- jwt (2.5.0)
+ jwt (2.7.0)
memoist (0.16.2)
mini_magick (4.12.0)
mini_mime (1.1.2)
@@ -178,7 +178,7 @@ GEM
faraday (>= 0.17.5, < 3.a)
jwt (>= 1.5, < 3.0)
multi_json (~> 1.10)
- simctl (1.6.8)
+ simctl (1.6.10)
CFPropertyList
naturally
terminal-notifier (2.0.0)
@@ -194,7 +194,7 @@ GEM
unf_ext
unf_ext (0.0.8.2)
unicode-display_width (1.8.0)
- webrick (1.7.0)
+ webrick (1.8.1)
word_wrap (1.0.0)
xcodeproj (1.22.0)
CFPropertyList (>= 2.3.3, < 4.0)
diff --git a/ios/Snapfile b/ios/Snapfile
index 5633df4fe2..1bb026abbb 100644
--- a/ios/Snapfile
+++ b/ios/Snapfile
@@ -1,12 +1,10 @@
# A list of devices you want to take the screenshots from
devices([
- "iPhone 8",
- "iPhone 8 Plus",
- "iPhone 11",
- "iPhone 11 Pro",
- "iPhone 11 Pro Max",
+ "iPhone 8 Plus", # 5.5"
+ "iPhone 11 Pro Max", # 6.5"
+ "iPhone 14 Pro Max", # 6.7"
"iPad Pro (12.9-inch) (2nd generation)",
- "iPad Pro (12.9-inch) (3rd generation)"
+ "iPad Pro (12.9-inch) (6th generation)"
])
languages([