From 153633d92c4812e8026cfff3fceecdbf80546e5c Mon Sep 17 00:00:00 2001 From: brice Date: Tue, 10 Oct 2023 04:00:51 +0100 Subject: [PATCH] fix compile of FitFileExplorer --- ConnectStats.xcodeproj/project.pbxproj | 14 +- .../xcshareddata/swiftpm/Package.resolved | 4 +- ConnectStats/src/GCGarminRequest.m | 4 + FitFileExplorer/Base.lproj/Main.storyboard | 140 +++++++++--------- Podfile | 1 + Podfile.lock | 2 +- 6 files changed, 88 insertions(+), 77 deletions(-) diff --git a/ConnectStats.xcodeproj/project.pbxproj b/ConnectStats.xcodeproj/project.pbxproj index 64d59e86..b430cb42 100644 --- a/ConnectStats.xcodeproj/project.pbxproj +++ b/ConnectStats.xcodeproj/project.pbxproj @@ -6394,11 +6394,12 @@ CODE_SIGN_ENTITLEMENTS = FitFileExplorer/FitFileExplorer.entitlements; CODE_SIGN_IDENTITY = "Mac Developer"; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 3.5.0; + CURRENT_PROJECT_VERSION = 5; DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = M7QSSF3624; ENABLE_HARDENED_RUNTIME = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "FitFileExplorer/src/FitFileExplorer-Prefix.pch"; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; @@ -6408,7 +6409,7 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 12.0; + MACOSX_DEPLOYMENT_TARGET = 13.0; MARKETING_VERSION = 3.5; MTL_ENABLE_DEBUG_INFO = YES; OTHER_SWIFT_FLAGS = "$(inherited)"; @@ -6437,12 +6438,13 @@ CODE_SIGN_IDENTITY = "Mac Developer"; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 3.5.0; + CURRENT_PROJECT_VERSION = 5; DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = M7QSSF3624; ENABLE_HARDENED_RUNTIME = YES; ENABLE_NS_ASSERTIONS = NO; + ENABLE_USER_SCRIPT_SANDBOXING = NO; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "FitFileExplorer/src/FitFileExplorer-Prefix.pch"; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; @@ -6452,7 +6454,7 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 12.0; + MACOSX_DEPLOYMENT_TARGET = 13.0; MARKETING_VERSION = 3.5; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_BUNDLE_IDENTIFIER = "net.ro-z.FitFileExplorer"; @@ -6589,6 +6591,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 15.0; + MACOSX_DEPLOYMENT_TARGET = 13.0; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; @@ -6636,6 +6639,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 15.0; + MACOSX_DEPLOYMENT_TARGET = 13.0; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; PROVISIONING_PROFILE = "14B235DF-EF8A-4F34-BF15-4452D1620A7C"; "PROVISIONING_PROFILE[sdk=iphoneos*]" = "14B235DF-EF8A-4F34-BF15-4452D1620A7C"; @@ -6770,6 +6774,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = ""; + ENABLE_USER_SCRIPT_SANDBOXING = NO; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "ConnectStats/ConnectStats-Prefix.pch"; @@ -6804,6 +6809,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = ""; + ENABLE_USER_SCRIPT_SANDBOXING = NO; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "ConnectStats/ConnectStats-Prefix.pch"; diff --git a/ConnectStats.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ConnectStats.xcworkspace/xcshareddata/swiftpm/Package.resolved index d7b8103a..2cea0649 100644 --- a/ConnectStats.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/ConnectStats.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -41,8 +41,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/roznet/FitFileParser.git", "state" : { - "revision" : "cf64038c355be65af6f9cb829417efd6b20f9ed2", - "version" : "1.5.1" + "revision" : "afcdf1677d89819f305f7714bb3b6a18dca05cc6", + "version" : "1.5.2" } }, { diff --git a/ConnectStats/src/GCGarminRequest.m b/ConnectStats/src/GCGarminRequest.m index a274c92d..9b7fcb4e 100644 --- a/ConnectStats/src/GCGarminRequest.m +++ b/ConnectStats/src/GCGarminRequest.m @@ -35,7 +35,11 @@ @implementation GCGarminReqBase +(BOOL)killSwitchTriggered{ +#if TARGET_OS_IPHONE return [[GCAppGlobal profile] configGetBool:CONFIG_GARMIN_KILL_SWITCH defaultValue:true]; +#else + return true; +#endif } -(BOOL)checkNoErrors{ diff --git a/FitFileExplorer/Base.lproj/Main.storyboard b/FitFileExplorer/Base.lproj/Main.storyboard index 01365f6d..e5b89302 100644 --- a/FitFileExplorer/Base.lproj/Main.storyboard +++ b/FitFileExplorer/Base.lproj/Main.storyboard @@ -1,9 +1,9 @@ - + - - + + @@ -673,7 +673,7 @@ - + @@ -715,7 +715,7 @@ - + @@ -810,7 +810,7 @@ - + @@ -818,7 +818,7 @@ - + @@ -826,7 +826,7 @@ - + @@ -840,7 +840,7 @@ - + @@ -874,10 +874,10 @@ - + - + @@ -917,7 +917,7 @@ - + @@ -1059,10 +1059,10 @@ - + - + @@ -1095,10 +1095,10 @@ - + - + @@ -1131,10 +1131,10 @@ - + - + @@ -1167,10 +1167,10 @@ - + - + @@ -1203,10 +1203,10 @@ - + - + @@ -1239,10 +1239,10 @@ - + - + @@ -1275,10 +1275,10 @@ - + - + @@ -1318,8 +1318,8 @@ - - + + @@ -1327,7 +1327,7 @@ - + @@ -1345,8 +1345,8 @@ - - + + @@ -1484,19 +1484,19 @@ - + - - + + - - + + @@ -1509,16 +1509,16 @@ - - + + - - + + @@ -1535,7 +1535,7 @@ - + - + - + @@ -1573,7 +1573,7 @@ - + @@ -1609,7 +1609,7 @@ - + @@ -1645,7 +1645,7 @@ - + @@ -1681,7 +1681,7 @@ - + @@ -1717,7 +1717,7 @@ - + @@ -1757,7 +1757,7 @@ - + @@ -1765,7 +1765,7 @@ - + @@ -1894,7 +1894,7 @@ - + @@ -1917,13 +1917,13 @@ - + - + @@ -1931,7 +1931,7 @@ - + @@ -1996,7 +1996,7 @@ - + @@ -2040,9 +2040,6 @@ - - - @@ -2054,6 +2051,9 @@ + + + @@ -2095,7 +2095,7 @@ - + @@ -2103,7 +2103,7 @@ - + @@ -2130,7 +2130,7 @@ - + @@ -2197,7 +2197,7 @@ - + @@ -2211,12 +2211,6 @@ - - - - - - @@ -2227,6 +2221,12 @@ + + + + + + @@ -2249,6 +2249,6 @@ - + diff --git a/Podfile b/Podfile index 307c157e..0ec1132e 100644 --- a/Podfile +++ b/Podfile @@ -32,6 +32,7 @@ post_install do |pi| t.build_configurations.each do |config| # fix warning after update about deployment target config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '15.0' + config.build_settings['MACOSX_DEPLOYMENT_TARGET'] = '13.0' # fix warning after install about overriden architecture config.build_settings.delete('ARCHS') end diff --git a/Podfile.lock b/Podfile.lock index ad06d958..9f9bc475 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -29,6 +29,6 @@ SPEC CHECKSUMS: Flurry-iOS-SDK: 402045d874e9e330d2fbcdf48d82727292ade109 GoogleMaps: 032f676450ba0779bd8ce16840690915f84e57ac -PODFILE CHECKSUM: ea6c2589314a5f7ad49d40441982294bbca724a0 +PODFILE CHECKSUM: 7827c4d5e804c5b3f61d491df253623f483d8f4a COCOAPODS: 1.13.0