From 28842d673e5b9523c6f513075fa4f454c457b24b Mon Sep 17 00:00:00 2001 From: Kyle Hedden Date: Wed, 26 Jul 2023 19:44:30 -0400 Subject: [PATCH] migrate DEBUG flags to proper feature flags. dev configs for local debug build defaults. --- MVMCore/MVMCore.xcodeproj/project.pbxproj | 5 +++- .../MVMCore/LoadHandling/MVMCoreLoadHandler.m | 2 +- .../OtherHandlers/MVMCoreLoggingHandler.m | 2 +- MVMCore/MVMCore/mvmcore.xcconfig | 4 ++++ MVMCore/MVMCore/mvmcore_dev.xcconfig | 23 +++++++++++++++++++ 5 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 MVMCore/MVMCore/mvmcore_dev.xcconfig diff --git a/MVMCore/MVMCore.xcodeproj/project.pbxproj b/MVMCore/MVMCore.xcodeproj/project.pbxproj index 1932c4b..b6af26f 100644 --- a/MVMCore/MVMCore.xcodeproj/project.pbxproj +++ b/MVMCore/MVMCore.xcodeproj/project.pbxproj @@ -198,6 +198,7 @@ 1DAD0FFD26AAB3FF00216E83 /* ActionRunJavaScriptModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ActionRunJavaScriptModel.swift; sourceTree = ""; }; 2723337A28BD534D004EAEE0 /* MVMCoreEvent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MVMCoreEvent.swift; sourceTree = ""; }; 2723337C28BD53C2004EAEE0 /* Date+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Date+Extension.swift"; sourceTree = ""; }; + 581FABEE2A71D0E6003A8508 /* mvmcore_dev.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = mvmcore_dev.xcconfig; sourceTree = ""; }; 5836B8E22A4338DF002553D9 /* mvmcore.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = mvmcore.xcconfig; sourceTree = ""; }; 60CBD0532A02397A00056CB0 /* MVMCoreSessionTimeHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MVMCoreSessionTimeHandler.swift; sourceTree = ""; }; 881D268F1FCC9D180079C521 /* MVMCoreErrorObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MVMCoreErrorObject.m; sourceTree = ""; }; @@ -399,6 +400,7 @@ 8876D5CC1FB50A9E00EB2E3D /* MVMCore.h */, 8876D5CD1FB50A9E00EB2E3D /* Info.plist */, 5836B8E22A4338DF002553D9 /* mvmcore.xcconfig */, + 581FABEE2A71D0E6003A8508 /* mvmcore_dev.xcconfig */, ); path = MVMCore; sourceTree = ""; @@ -1000,7 +1002,7 @@ /* Begin XCBuildConfiguration section */ 8876D5CF1FB50A9E00EB2E3D /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 5836B8E22A4338DF002553D9 /* mvmcore.xcconfig */; + baseConfigurationReference = 581FABEE2A71D0E6003A8508 /* mvmcore_dev.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; BUILD_LIBRARY_FOR_DISTRIBUTION = YES; @@ -1057,6 +1059,7 @@ MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) DEBUG"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; diff --git a/MVMCore/MVMCore/LoadHandling/MVMCoreLoadHandler.m b/MVMCore/MVMCore/LoadHandling/MVMCoreLoadHandler.m index 64d67ce..b6bb76c 100644 --- a/MVMCore/MVMCore/LoadHandling/MVMCoreLoadHandler.m +++ b/MVMCore/MVMCore/LoadHandling/MVMCoreLoadHandler.m @@ -235,7 +235,7 @@ NSError *jsonError = nil; NSData *data = nil; -#if DEBUG +#if LOGGING // Pretty print for logging the request parameters. data = [NSJSONSerialization dataWithJSONObject:parameters options:NSJSONWritingPrettyPrinted error:&jsonError]; if (!data) { diff --git a/MVMCore/MVMCore/OtherHandlers/MVMCoreLoggingHandler.m b/MVMCore/MVMCore/OtherHandlers/MVMCoreLoggingHandler.m index 4fb541a..6978815 100644 --- a/MVMCore/MVMCore/OtherHandlers/MVMCoreLoggingHandler.m +++ b/MVMCore/MVMCore/OtherHandlers/MVMCoreLoggingHandler.m @@ -50,7 +50,7 @@ #pragma mark - logging delegate - (void)handleDebugMessage:(nullable NSString *)message { -#ifdef DEBUG +#ifdef LOGGING [self printWith:message]; #endif } diff --git a/MVMCore/MVMCore/mvmcore.xcconfig b/MVMCore/MVMCore/mvmcore.xcconfig index 789489e..a098409 100644 --- a/MVMCore/MVMCore/mvmcore.xcconfig +++ b/MVMCore/MVMCore/mvmcore.xcconfig @@ -2,6 +2,10 @@ // mvmcore.xcconfig // MVMCore // +// Preprocessor definitions include: +// 1. LOGGING - For enabling logging to the device logs. +// 2. ENABLE_HARD_CODED_RESPONSE - For enabling hard coded responses. +// // Created by Kyle Hedden on 6/21/23. // Copyright © 2023 myverizon. All rights reserved. // diff --git a/MVMCore/MVMCore/mvmcore_dev.xcconfig b/MVMCore/MVMCore/mvmcore_dev.xcconfig new file mode 100644 index 0000000..470d90c --- /dev/null +++ b/MVMCore/MVMCore/mvmcore_dev.xcconfig @@ -0,0 +1,23 @@ +// +// mvmcore_dev.xcconfig +// MVMCore +// +// Preprocessor definitions include: +// 1. LOGGING - For enabling logging to the device logs. +// 2. ENABLE_HARD_CODED_RESPONSE - For enabling hard coded responses. +// +// Created by Kyle Hedden on 7/26/23. +// Copyright © 2023 myverizon. All rights reserved. +// + +// Configuration settings file format documentation can be found at: +// https://help.apple.com/xcode/#/dev745c5c974 + +SWIFT_ACTIVE_COMPILATION_CONDITIONS = $(inherited) LOGGING +GCC_PREPROCESSOR_DEFINITIONS = $(inherited) LOGGING=1 + +// Refer back to the workspace settings if they exist. +#include? "../../../workspaceSettings.xcconfig" + +// For enabling hardcoded JSON payloads. +//GCC_PREPROCESSOR_DEFINITIONS = $(inherited) ENABLE_HARD_CODED_RESPONSE=1