diff --git a/PadelClub.xcodeproj/project.pbxproj b/PadelClub.xcodeproj/project.pbxproj index 2745959..a3d49d0 100644 --- a/PadelClub.xcodeproj/project.pbxproj +++ b/PadelClub.xcodeproj/project.pbxproj @@ -8,6 +8,7 @@ /* Begin PBXBuildFile section */ C40CD2F32C412681000DBD9A /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C40CD2F22C412681000DBD9A /* AppDelegate.swift */; }; + C410F54E2DF340FE009713ED /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C4D05D462DC10AE5009B053C /* WebKit.framework */; }; C411C9C32BEBA453003017AD /* ServerDataTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C411C9C22BEBA453003017AD /* ServerDataTests.swift */; }; C411C9C92BF219CB003017AD /* UserDataTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C411C9C82BF219CB003017AD /* UserDataTests.swift */; }; C411C9D02BF38F41003017AD /* TokenExemptionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C411C9CF2BF38F41003017AD /* TokenExemptionTests.swift */; }; @@ -615,7 +616,6 @@ FF70FBAF2C90584900129CC2 /* UpdateSourceRankDateView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF0EC5212BB173E70056B6D1 /* UpdateSourceRankDateView.swift */; }; FF70FBB02C90584900129CC2 /* GlobalSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF025AE62BD1111000A86CF8 /* GlobalSettingsView.swift */; }; FF70FBB22C90584900129CC2 /* PurchaseListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C49EF0182BD694290077B5AA /* PurchaseListView.swift */; }; - FF70FBB42C90584900129CC2 /* Algorithms in Frameworks */ = {isa = PBXBuildFile; productRef = FF70FABE2C90584900129CC2 /* Algorithms */; }; FF70FBB52C90584900129CC2 /* Zip in Frameworks */ = {isa = PBXBuildFile; productRef = FF70FAC02C90584900129CC2 /* Zip */; }; FF70FBB62C90584900129CC2 /* LeStorage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C49EF0372BDFF3000077B5AA /* LeStorage.framework */; }; FF70FBB82C90584900129CC2 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C425D4072B6D249E002A7B48 /* Preview Assets.xcassets */; }; @@ -1205,7 +1205,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - FF70FBB42C90584900129CC2 /* Algorithms in Frameworks */, + C410F54E2DF340FE009713ED /* WebKit.framework in Frameworks */, FF39B6172DC88267004E10CE /* PadelClubData.framework in Frameworks */, FF70FBB52C90584900129CC2 /* Zip in Frameworks */, FF70FBB62C90584900129CC2 /* LeStorage.framework in Frameworks */, @@ -2050,7 +2050,6 @@ ); name = "PadelClub TestFlight"; packageProductDependencies = ( - FF70FABE2C90584900129CC2 /* Algorithms */, FF70FAC02C90584900129CC2 /* Zip */, ); productName = PadelClub; @@ -3352,7 +3351,7 @@ CODE_SIGN_ENTITLEMENTS = PadelClub/PadelClub.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 3; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEFINES_MODULE = YES; DEVELOPMENT_ASSET_PATHS = "\"PadelClub/Preview Content\""; @@ -3375,13 +3374,14 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.2.33; + MARKETING_VERSION = 1.2.34; PRODUCT_BUNDLE_IDENTIFIER = app.padelclub.beta; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = NO; SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -3395,7 +3395,7 @@ CODE_SIGN_ENTITLEMENTS = PadelClub/PadelClub.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 3; DEFINES_MODULE = YES; DEVELOPMENT_ASSET_PATHS = "\"PadelClub/Preview Content\""; DEVELOPMENT_TEAM = BQ3Y44M3Q6; @@ -3417,7 +3417,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.2.33; + MARKETING_VERSION = 1.2.34; PRODUCT_BUNDLE_IDENTIFIER = app.padelclub.beta; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -3425,6 +3425,7 @@ SUPPORTS_MACCATALYST = NO; SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO; SWIFT_ACTIVE_COMPILATION_CONDITIONS = TESTFLIGHT; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -3506,14 +3507,6 @@ minimumVersion = 2.1.2; }; }; - FF70FABF2C90584900129CC2 /* XCRemoteSwiftPackageReference "swift-algorithms" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/apple/swift-algorithms.git"; - requirement = { - kind = upToNextMajorVersion; - minimumVersion = 1.2.0; - }; - }; FF70FAC12C90584900129CC2 /* XCRemoteSwiftPackageReference "Zip" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/marmelroy/Zip"; @@ -3543,11 +3536,6 @@ package = FF4CBF422C996C0600151637 /* XCRemoteSwiftPackageReference "Zip" */; productName = Zip; }; - FF70FABE2C90584900129CC2 /* Algorithms */ = { - isa = XCSwiftPackageProductDependency; - package = FF70FABF2C90584900129CC2 /* XCRemoteSwiftPackageReference "swift-algorithms" */; - productName = Algorithms; - }; FF70FAC02C90584900129CC2 /* Zip */ = { isa = XCSwiftPackageProductDependency; package = FF70FAC12C90584900129CC2 /* XCRemoteSwiftPackageReference "Zip" */; diff --git a/PadelClub/AppDelegate.swift b/PadelClub/AppDelegate.swift index b58e458..05b217c 100644 --- a/PadelClub/AppDelegate.swift +++ b/PadelClub/AppDelegate.swift @@ -26,11 +26,23 @@ class AppDelegate : NSObject, UIApplicationDelegate, UNUserNotificationCenterDel return true } + fileprivate func _domain() -> String { +#if DEBUG + return "xlr.alwaysdata.net" +#elseif TESTFLIGHT + return "asgi.padelclub.app" +#elseif PRODTEST + return "padelclub.app" +#else + return "padelclub.app" +#endif + } + fileprivate func _configureLeStorage() { StoreCenter.main.blackListUserName("apple-test") StoreCenter.main.classProject = "PadelClubData" // let secureScheme = true - let domain: String = URLs.activationHost.rawValue + let domain: String = self._domain() #if DEBUG if let secure = PListReader.readBool(plist: "local", key: "secure_server"), @@ -40,7 +52,7 @@ class AppDelegate : NSObject, UIApplicationDelegate, UNUserNotificationCenterDel StoreCenter.main.configureURLs(secureScheme: true, domain: domain, webSockets: true, useSynchronization: true) } #else - StoreCenter.main.configureURLs(secureScheme: true, domain: domain, webSockets: false) + StoreCenter.main.configureURLs(secureScheme: true, domain: domain, webSockets: true, useSynchronization: true) #endif StoreCenter.main.logsFailedAPICalls()