Increased min fastlane version, updated SnapshotHelper

[ci skip]

Author: tobihagemann

Snapshots/SnapshotHelper.swift

@@ -15,13 +15,12 @@
 import Foundation
 import XCTest
 
-var deviceLanguage = ""
-var locale = ""
-
+@MainActor
 func setupSnapshot(_ app: XCUIApplication, waitForAnimations: Bool = true) {
 	Snapshot.setupSnapshot(app, waitForAnimations: waitForAnimations)
 }
 
+@MainActor
 func snapshot(_ name: String, waitForLoadingIndicator: Bool) {
 	if waitForLoadingIndicator {
 		Snapshot.snapshot(name)
@@ -33,6 +32,7 @@ func snapshot(_ name: String, waitForLoadingIndicator: Bool) {
 /// - Parameters:
 ///   - name: The name of the snapshot
 ///   - timeout: Amount of seconds to wait until the network loading indicator disappears. Pass `0` if you don't want to wait.
+@MainActor
 func snapshot(_ name: String, timeWaitingForIdle timeout: TimeInterval = 20) {
 	Snapshot.snapshot(name, timeWaitingForIdle: timeout)
 }
@@ -52,6 +52,7 @@ enum SnapshotError: Error, CustomDebugStringConvertible {
 }
 
 @objcMembers
+@MainActor
 open class Snapshot: NSObject {
 	static var app: XCUIApplication?
 	static var waitForAnimations = true
@@ -60,6 +61,9 @@ open class Snapshot: NSObject {
 		return cacheDirectory?.appendingPathComponent("screenshots", isDirectory: true)
 	}
 
+	static var deviceLanguage = ""
+	static var currentLocale = ""
+
 	open class func setupSnapshot(_ app: XCUIApplication, waitForAnimations: Bool = true) {
 		Snapshot.app = app
 		Snapshot.waitForAnimations = waitForAnimations
@@ -102,17 +106,17 @@ open class Snapshot: NSObject {
 
 		do {
 			let trimCharacterSet = CharacterSet.whitespacesAndNewlines
-			locale = try String(contentsOf: path, encoding: .utf8).trimmingCharacters(in: trimCharacterSet)
+			currentLocale = try String(contentsOf: path, encoding: .utf8).trimmingCharacters(in: trimCharacterSet)
 		} catch {
 			NSLog("Couldn't detect/set locale...")
 		}
 
-		if locale.isEmpty, !deviceLanguage.isEmpty {
-			locale = Locale(identifier: deviceLanguage).identifier
+		if currentLocale.isEmpty && !deviceLanguage.isEmpty {
+			currentLocale = Locale(identifier: deviceLanguage).identifier
 		}
 
-		if !locale.isEmpty {
-			app.launchArguments += ["-AppleLocale", "\"\(locale)\""]
+		if !currentLocale.isEmpty {
+			app.launchArguments += ["-AppleLocale", "\"\(currentLocale)\""]
 		}
 	}
 
@@ -180,7 +184,7 @@ open class Snapshot: NSObject {
 
 			let path = screenshotsDir.appendingPathComponent("\(simulator)-\(name).png")
 			#if swift(<5.0)
-			UIImagePNGRepresentation(image)?.write(to: path, options: .atomic)
+			try UIImagePNGRepresentation(image)?.write(to: path, options: .atomic)
 			#else
 			try image.pngData()?.write(to: path, options: .atomic)
 			#endif
@@ -280,6 +284,7 @@ private extension XCUIElementQuery {
 		return containing(isNetworkLoadingIndicator)
 	}
 
+	@MainActor
 	var deviceStatusBars: XCUIElementQuery {
 		guard let app = Snapshot.app else {
 			fatalError("XCUIApplication is not set. Please call setupSnapshot(app) before snapshot().")
@@ -305,4 +310,4 @@ private extension CGFloat {
 
 // Please don't remove the lines below
 // They are used to detect outdated configuration files
-// SnapshotHelperVersion [1.28]
+// SnapshotHelperVersion [1.30]

fastlane/Fastfile

@@ -1,4 +1,4 @@
-fastlane_version("2.206.2")
+fastlane_version("2.222.0")
 
 default_platform(:ios)