Merge remote-tracking branch 'refs/remotes/origin/main'

sync2
Raz 9 months ago
commit bff0e29536
  1. 4
      PadelClub.xcodeproj/project.pbxproj
  2. 11
      PadelClub/PadelClubApp.swift

@ -3337,7 +3337,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 1.1.9; MARKETING_VERSION = 1.1.10;
PRODUCT_BUNDLE_IDENTIFIER = app.padelclub; PRODUCT_BUNDLE_IDENTIFIER = app.padelclub;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";
@ -3384,7 +3384,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 1.1.9; MARKETING_VERSION = 1.1.10;
PRODUCT_BUNDLE_IDENTIFIER = app.padelclub; PRODUCT_BUNDLE_IDENTIFIER = app.padelclub;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";

@ -122,7 +122,7 @@ struct PadelClubApp: App {
Task.detached(priority: .high) { Task.detached(priority: .high) {
if let requiredVersion = await self._retrieveRequiredVersion() { if let requiredVersion = await self._retrieveRequiredVersion() {
let cleanedRequired = requiredVersion.replacingOccurrences(of: "\n", with: "") let cleanedRequired = requiredVersion.replacingOccurrences(of: "\n", with: "")
Logger.log(">>> VERSION = \(requiredVersion)") Logger.log(">>> REQUIRED VERSION = \(requiredVersion)")
if let currentVersion = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String { if let currentVersion = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String {
await MainActor.run { await MainActor.run {
self.blockApp = VersionComparator.compare(cleanedRequired, currentVersion) == 1 self.blockApp = VersionComparator.compare(cleanedRequired, currentVersion) == 1
@ -134,7 +134,14 @@ struct PadelClubApp: App {
fileprivate func _retrieveRequiredVersion() async -> String? { fileprivate func _retrieveRequiredVersion() async -> String? {
let requiredVersionURL = URLs.main.extend(path: "static/misc/required-version.txt") let requiredVersionURL = URLs.main.extend(path: "static/misc/required-version.txt")
return try? String(contentsOf: requiredVersionURL, encoding: .utf8)
do {
let (data, _) = try await URLSession.shared.data(from: requiredVersionURL)
return String(data: data, encoding: .utf8)
} catch {
Logger.log("Error fetching required version: \(error)")
return nil
}
} }
private func _handleIncomingURL(_ url: URL) { private func _handleIncomingURL(_ url: URL) {

Loading…
Cancel
Save