Merge branch 'release/2.6.1'

cryptomator · Sep 14, 2024 · 6ebfec2 · 6ebfec2
2 parents 59d83fe + 2cfc241
commit 6ebfec2
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/Cryptomator.xcodeproj/project.pbxproj b/Cryptomator.xcodeproj/project.pbxproj
@@ -3320,7 +3320,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
-				MARKETING_VERSION = 2.6.0;
+				MARKETING_VERSION = 2.6.1;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -3382,7 +3382,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
-				MARKETING_VERSION = 2.6.0;
+				MARKETING_VERSION = 2.6.1;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				OTHER_SWIFT_FLAGS = "-Xfrontend -warn-long-expression-type-checking=200 -Xfrontend -warn-long-function-bodies=200";

diff --git a/Cryptomator.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Cryptomator.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -68,8 +68,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/cryptomator/cloud-access-swift.git",
       "state" : {
-        "revision" : "ff48ad0c1c0f8493ef6eeed172752cf0c03b509e",
-        "version" : "1.11.1"
+        "revision" : "92e6e3d8c592c1189acd5c9a765a388e296b9b04",
+        "version" : "1.11.2"
       }
     },
     {

diff --git a/fastlane/Scanfile b/fastlane/Scanfile
@@ -1,5 +1,5 @@
 scheme("AllTests")
-device("iPhone 14")
+device("iPhone 15")
 clean(true)
 output_types("html")
 skip_slack(true)
diff --git a/fastlane/Snapfile b/fastlane/Snapfile
@@ -1,7 +1,10 @@
+# Workaround: https://www.jessesquires.com/blog/2024/01/04/simctl-status_bar-still-broken/
+ios_version("16.0")
+
 # A list of devices you want to take the screenshots from
 devices([
-  "iPhone 15 Pro Max",
-  "iPad Pro 13-inch (M4)",
+  "iPhone 14 Pro Max",
+  "iPad Pro (12.9-inch) (5th generation)",
 ])
 
 languages([
@@ -13,7 +16,9 @@ languages([
 scheme("Snapshots")
 
 # Set the status bar to 9:41 AM, and show full battery and reception. See also override_status_bar_arguments for custom options.
+ENV["SNAPSHOT_SIMULATOR_WAIT_FOR_BOOT_TIMEOUT"] = "10" # This should already be the default value, but it isn't for some reason
 override_status_bar(true)
+override_status_bar_arguments("--time 2007-01-09T09:41:00+02:00 --dataNetwork wifi --wifiMode active --wifiBars 3 --cellularMode active --operatorName '' --cellularBars 4 --batteryState charged --batteryLevel 100 --dataNetwork wifi") # Workaround for daylight saving time, probably not needed otherwise
 
 localize_simulator(true)