diff --git a/external/SalesforceMobileSDK-iOS b/external/SalesforceMobileSDK-iOS index 26a51334..26922360 160000 --- a/external/SalesforceMobileSDK-iOS +++ b/external/SalesforceMobileSDK-iOS @@ -1 +1 @@ -Subproject commit 26a5133475aa47845f31f9bed10f2e486ba9fb64 +Subproject commit 2692236005c6a2aff9412eed61ad08c6dd469f99 diff --git a/libs/SalesforceFileLogger/SalesforceFileLogger.xcodeproj/project.pbxproj b/libs/SalesforceFileLogger/SalesforceFileLogger.xcodeproj/project.pbxproj index 59e8d36f..a774fe83 100644 --- a/libs/SalesforceFileLogger/SalesforceFileLogger.xcodeproj/project.pbxproj +++ b/libs/SalesforceFileLogger/SalesforceFileLogger.xcodeproj/project.pbxproj @@ -32,19 +32,13 @@ 691BBAAD278663820098A716 /* CocoaLumberjack.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = CEA2A8C72214C184009D923B /* CocoaLumberjack.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 691BBAB02786638C0098A716 /* SalesforceSDKCommon.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = CEA2A8AC2214C174009D923B /* SalesforceSDKCommon.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 696E91742AD0CD7E00205884 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 696E916E2AD0CC8200205884 /* PrivacyInfo.xcprivacy */; }; + 69802DEB2FE5220200B9DA72 /* SalesforceFileLoggerTestApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 69802DEA2FE5220200B9DA72 /* SalesforceFileLoggerTestApp.swift */; }; 829DA2B11C12677B0040F5F1 /* SalesforceFileLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 829DA2B01C12677B0040F5F1 /* SalesforceFileLogger.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 82EFF30A16E8049500A63CDF /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 82EFF30816E8049500A63CDF /* InfoPlist.strings */; }; - 82EFF30C16E8049500A63CDF /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 82EFF30B16E8049500A63CDF /* main.m */; }; - 82EFF31216E8049500A63CDF /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 82EFF31116E8049500A63CDF /* Default.png */; }; - 82EFF31416E8049500A63CDF /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 82EFF31316E8049500A63CDF /* Default@2x.png */; }; - 82EFF31616E8049500A63CDF /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 82EFF31516E8049500A63CDF /* Default-568h@2x.png */; }; - 82EFF34416E80B6300A63CDF /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 82EFF34316E80B6300A63CDF /* AppDelegate.m */; }; CE0AB0A51C10D60400BFAEED /* SalesforceFileLogger.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE4CE2E11C0E465B009F6029 /* SalesforceFileLogger.framework */; }; CE4CE2E81C0E465B009F6029 /* SalesforceFileLogger.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE4CE2E11C0E465B009F6029 /* SalesforceFileLogger.framework */; }; CE4CE2E91C0E465B009F6029 /* SalesforceFileLogger.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = CE4CE2E11C0E465B009F6029 /* SalesforceFileLogger.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; CEA2A8EA2214C1B1009D923B /* CocoaLumberjack.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CEA2A8C72214C184009D923B /* CocoaLumberjack.framework */; }; CEA2A8EB2214C1B9009D923B /* SalesforceSDKCommon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CEA2A8AC2214C174009D923B /* SalesforceSDKCommon.framework */; }; - D291DB6C2E468AAF00AA4B64 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D291DB6B2E468AAF00AA4B64 /* ViewController.m */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -147,20 +141,13 @@ 4FAE62FF2196714C003A5CD6 /* SFSDKLoggerTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SFSDKLoggerTests.m; sourceTree = ""; }; 4FC2B26A219A44880064EB46 /* SalesforceFileLoggerTests-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "SalesforceFileLoggerTests-Info.plist"; sourceTree = ""; }; 696E916E2AD0CC8200205884 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = ""; }; + 69802DEA2FE5220200B9DA72 /* SalesforceFileLoggerTestApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SalesforceFileLoggerTestApp.swift; sourceTree = ""; }; 8222729D19C39F4500FC537E /* SalesforceFileLoggerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SalesforceFileLoggerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 829DA2B01C12677B0040F5F1 /* SalesforceFileLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SalesforceFileLogger.h; sourceTree = ""; }; 82D0AB3D1C4980200081F833 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 82EFF2FA16E7FFF200A63CDF /* SalesforceSDKResources.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = SalesforceSDKResources.bundle; path = "../../../external/SalesforceMobileSDK-iOS/shared/resources/SalesforceSDKResources.bundle"; sourceTree = ""; }; 82EFF2FF16E8049500A63CDF /* SalesforceFileLoggerTestApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SalesforceFileLoggerTestApp.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 82EFF30716E8049500A63CDF /* SalesforceFileLoggerTestApp-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "SalesforceFileLoggerTestApp-Info.plist"; sourceTree = ""; }; - 82EFF30916E8049500A63CDF /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; - 82EFF30B16E8049500A63CDF /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; - 82EFF31116E8049500A63CDF /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = ""; }; - 82EFF31316E8049500A63CDF /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default@2x.png"; sourceTree = ""; }; - 82EFF31516E8049500A63CDF /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = ""; }; 82EFF33D16E8063700A63CDF /* test_credentials.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; name = test_credentials.json; path = ../../../shared/test/test_credentials.json; sourceTree = ""; }; - 82EFF34216E80B6300A63CDF /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; - 82EFF34316E80B6300A63CDF /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; B7282F4C1D8C717200475F79 /* SalesforceFileLoggerTestApp.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = SalesforceFileLoggerTestApp.entitlements; sourceTree = ""; }; CE4CE2E11C0E465B009F6029 /* SalesforceFileLogger.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SalesforceFileLogger.framework; sourceTree = BUILT_PRODUCTS_DIR; }; CE8F13061AD4A87200233F2F /* SalesforceFileLogger-Common.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = "SalesforceFileLogger-Common.xcconfig"; path = "Configuration/SalesforceFileLogger-Common.xcconfig"; sourceTree = ""; }; @@ -169,8 +156,6 @@ CEA2A8B32214C184009D923B /* Lumberjack.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Lumberjack.xcodeproj; path = ../../external/CocoaLumberjack/Lumberjack.xcodeproj; sourceTree = ""; }; CECB662E1C1BB8CB008038AE /* SalesforceFileLogger-Dynamic-iOS-Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = "SalesforceFileLogger-Dynamic-iOS-Debug.xcconfig"; path = "Configuration/SalesforceFileLogger-Dynamic-iOS-Debug.xcconfig"; sourceTree = ""; }; CECB662F1C1BB8CB008038AE /* SalesforceFileLogger-Dynamic-iOS-Release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = "SalesforceFileLogger-Dynamic-iOS-Release.xcconfig"; path = "Configuration/SalesforceFileLogger-Dynamic-iOS-Release.xcconfig"; sourceTree = ""; }; - D291DB6A2E468AAF00AA4B64 /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = ""; }; - D291DB6B2E468AAF00AA4B64 /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -202,15 +187,6 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 4F06AFC31C49A87F00F70798 /* Supporting Files */ = { - isa = PBXGroup; - children = ( - 4F06AFC41C49A88B00F70798 /* SalesforceFileLoggerTestApp-Info.plist */, - ); - name = "Supporting Files"; - path = SalesforceFileLoggerTests; - sourceTree = ""; - }; 822272A219C39F4500FC537E /* SalesforceFileLoggerTests */ = { isa = PBXGroup; children = ( @@ -296,11 +272,9 @@ 82EFF30516E8049500A63CDF /* SalesforceFileLoggerTestApp */ = { isa = PBXGroup; children = ( - D291DB6A2E468AAF00AA4B64 /* ViewController.h */, - D291DB6B2E468AAF00AA4B64 /* ViewController.m */, - 4F06AFC31C49A87F00F70798 /* Supporting Files */, + 69802DEA2FE5220200B9DA72 /* SalesforceFileLoggerTestApp.swift */, + 4F06AFC41C49A88B00F70798 /* SalesforceFileLoggerTestApp-Info.plist */, B7282F4C1D8C717200475F79 /* SalesforceFileLoggerTestApp.entitlements */, - 82EFF34116E80B6300A63CDF /* Classes */, ); path = SalesforceFileLoggerTestApp; sourceTree = ""; @@ -309,26 +283,11 @@ isa = PBXGroup; children = ( 82EFF33D16E8063700A63CDF /* test_credentials.json */, - 82EFF30716E8049500A63CDF /* SalesforceFileLoggerTestApp-Info.plist */, - 82EFF30816E8049500A63CDF /* InfoPlist.strings */, - 82EFF30B16E8049500A63CDF /* main.m */, - 82EFF31116E8049500A63CDF /* Default.png */, - 82EFF31316E8049500A63CDF /* Default@2x.png */, - 82EFF31516E8049500A63CDF /* Default-568h@2x.png */, ); name = "Supporting Files"; path = SalesforceFileLoggerTestApp; sourceTree = ""; }; - 82EFF34116E80B6300A63CDF /* Classes */ = { - isa = PBXGroup; - children = ( - 82EFF34216E80B6300A63CDF /* AppDelegate.h */, - 82EFF34316E80B6300A63CDF /* AppDelegate.m */, - ); - path = Classes; - sourceTree = ""; - }; CE3FE5631AD4804200E65B49 /* Configuration */ = { isa = PBXGroup; children = ( @@ -449,6 +408,7 @@ TestTargetID = 82EFF2FE16E8049500A63CDF; }; 82EFF2FE16E8049500A63CDF = { + LastSwiftMigration = 2630; ProvisioningStyle = Manual; SystemCapabilities = { com.apple.Keychain = { @@ -557,10 +517,6 @@ buildActionMask = 2147483647; files = ( 4F06AFEB1C49D35B00F70798 /* test_credentials.json in Resources */, - 82EFF30A16E8049500A63CDF /* InfoPlist.strings in Resources */, - 82EFF31216E8049500A63CDF /* Default.png in Resources */, - 82EFF31416E8049500A63CDF /* Default@2x.png in Resources */, - 82EFF31616E8049500A63CDF /* Default-568h@2x.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -627,9 +583,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - D291DB6C2E468AAF00AA4B64 /* ViewController.m in Sources */, - 82EFF30C16E8049500A63CDF /* main.m in Sources */, - 82EFF34416E80B6300A63CDF /* AppDelegate.m in Sources */, + 69802DEB2FE5220200B9DA72 /* SalesforceFileLoggerTestApp.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -668,17 +622,6 @@ }; /* End PBXTargetDependency section */ -/* Begin PBXVariantGroup section */ - 82EFF30816E8049500A63CDF /* InfoPlist.strings */ = { - isa = PBXVariantGroup; - children = ( - 82EFF30916E8049500A63CDF /* en */, - ); - name = InfoPlist.strings; - sourceTree = ""; - }; -/* End PBXVariantGroup section */ - /* Begin XCBuildConfiguration section */ 2DE48CC118BFA941008345C7 /* Debug */ = { isa = XCBuildConfiguration; diff --git a/libs/SalesforceFileLogger/SalesforceFileLoggerTestApp/Classes/AppDelegate.h b/libs/SalesforceFileLogger/SalesforceFileLoggerTestApp/Classes/AppDelegate.h deleted file mode 100644 index 9f8babdf..00000000 --- a/libs/SalesforceFileLogger/SalesforceFileLoggerTestApp/Classes/AppDelegate.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - AppDelegate.h - AppDelegate - - Copyright (c) 2018-present, salesforce.com, inc. All rights reserved. - - Redistribution and use of this software in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright notice, this list of conditions - and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, this list of - conditions and the following disclaimer in the documentation and/or other materials provided - with the distribution. - * Neither the name of salesforce.com, inc. nor the names of its contributors may be used to - endorse or promote products derived from this software without specific prior written - permission of salesforce.com, inc. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR - IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY - WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -#import - -@interface AppDelegate : UIResponder - -@property (strong, nonatomic) UIWindow *window; - - -@end - diff --git a/libs/SalesforceFileLogger/SalesforceFileLoggerTestApp/Classes/AppDelegate.m b/libs/SalesforceFileLogger/SalesforceFileLoggerTestApp/Classes/AppDelegate.m deleted file mode 100644 index faed7bce..00000000 --- a/libs/SalesforceFileLogger/SalesforceFileLoggerTestApp/Classes/AppDelegate.m +++ /dev/null @@ -1,77 +0,0 @@ -/* - AppDelegate.m - AppDelegate - - Copyright (c) 2018-present, salesforce.com, inc. All rights reserved. - - Redistribution and use of this software in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright notice, this list of conditions - and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, this list of - conditions and the following disclaimer in the documentation and/or other materials provided - with the distribution. - * Neither the name of salesforce.com, inc. nor the names of its contributors may be used to - endorse or promote products derived from this software without specific prior written - permission of salesforce.com, inc. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR - IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY - WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -#import "AppDelegate.h" -#import "ViewController.h" - -@interface AppDelegate () - -@end - -@implementation AppDelegate - - -- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { - // Override point for customization after application launch. - - // Create window and set up the view controller - self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]]; - ViewController *viewController = [[ViewController alloc] init]; - self.window.rootViewController = viewController; - [self.window makeKeyAndVisible]; - - return YES; -} - - -- (void)applicationWillResignActive:(UIApplication *)application { - // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state. - // Use this method to pause ongoing tasks, disable timers, and invalidate graphics rendering callbacks. Games should use this method to pause the game. -} - - -- (void)applicationDidEnterBackground:(UIApplication *)application { - // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. - // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits. -} - - -- (void)applicationWillEnterForeground:(UIApplication *)application { - // Called as part of the transition from the background to the active state; here you can undo many of the changes made on entering the background. -} - - -- (void)applicationDidBecomeActive:(UIApplication *)application { - // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface. -} - - -- (void)applicationWillTerminate:(UIApplication *)application { - // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:. -} - - -@end diff --git a/libs/SalesforceFileLogger/SalesforceFileLoggerTestApp/Default-568h@2x.png b/libs/SalesforceFileLogger/SalesforceFileLoggerTestApp/Default-568h@2x.png deleted file mode 100644 index 0891b7aa..00000000 Binary files a/libs/SalesforceFileLogger/SalesforceFileLoggerTestApp/Default-568h@2x.png and /dev/null differ diff --git a/libs/SalesforceFileLogger/SalesforceFileLoggerTestApp/Default.png b/libs/SalesforceFileLogger/SalesforceFileLoggerTestApp/Default.png deleted file mode 100644 index 4c8ca6f6..00000000 Binary files a/libs/SalesforceFileLogger/SalesforceFileLoggerTestApp/Default.png and /dev/null differ diff --git a/libs/SalesforceFileLogger/SalesforceFileLoggerTestApp/Default@2x.png b/libs/SalesforceFileLogger/SalesforceFileLoggerTestApp/Default@2x.png deleted file mode 100644 index 35b84cff..00000000 Binary files a/libs/SalesforceFileLogger/SalesforceFileLoggerTestApp/Default@2x.png and /dev/null differ diff --git a/libs/SalesforceFileLogger/SalesforceFileLoggerTestApp/SalesforceFileLoggerTestApp-Info.plist b/libs/SalesforceFileLogger/SalesforceFileLoggerTestApp/SalesforceFileLoggerTestApp-Info.plist index 6a012bd3..28ca336c 100644 --- a/libs/SalesforceFileLogger/SalesforceFileLoggerTestApp/SalesforceFileLoggerTestApp-Info.plist +++ b/libs/SalesforceFileLogger/SalesforceFileLoggerTestApp/SalesforceFileLoggerTestApp-Info.plist @@ -24,6 +24,18 @@ 1.0 LSRequiresIPhoneOS + UIApplicationSceneManifest + + UIApplicationSupportsMultipleScenes + + UISceneConfigurations + + + UILaunchScreen + + UILaunchScreen + + UIRequiredDeviceCapabilities armv7 diff --git a/libs/SalesforceFileLogger/SalesforceFileLoggerTestApp/SalesforceFileLoggerTestApp.swift b/libs/SalesforceFileLogger/SalesforceFileLoggerTestApp/SalesforceFileLoggerTestApp.swift new file mode 100644 index 00000000..49bbe89b --- /dev/null +++ b/libs/SalesforceFileLogger/SalesforceFileLoggerTestApp/SalesforceFileLoggerTestApp.swift @@ -0,0 +1,59 @@ +// +// SalesforceFileLoggerTestApp.swift +// SalesforceFileLogger +// +// Created by Brianna Birman on 6/19/26. +// Copyright (c) 2026-present, salesforce.com, inc. All rights reserved. +// +// Redistribution and use of this software in source and binary forms, with or without modification, +// are permitted provided that the following conditions are met: +// * Redistributions of source code must retain the above copyright notice, this list of conditions +// and the following disclaimer. +// * Redistributions in binary form must reproduce the above copyright notice, this list of +// conditions and the following disclaimer in the documentation and/or other materials provided +// with the distribution. +// * Neither the name of salesforce.com, inc. nor the names of its contributors may be used to +// endorse or promote products derived from this software without specific prior written +// permission of salesforce.com, inc. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR +// IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND +// FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY +// WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import SwiftUI +import SalesforceFileLogger + +private class LogTag: NSObject {} + +@main +struct SalesforceFileLoggerTestApp: App { + + init() { + // Log some messages using SFSDKLogger without enabling OSLog + SFSDKLogger.sharedInstance().i(LogTag.self, message: "Info log message without OSLog") + SFSDKLogger.sharedInstance().w(LogTag.self, message: "Warning log message without OSLog") + SFSDKLogger.sharedInstance().e(LogTag.self, message: "Error log message without OSLog") + SFSDKLogger.sharedInstance().d(LogTag.self, message: "Debug log message without OSLog") + + SFSDKLogger.useOSLog = true + + // Create a new logger instance with OSLog enabled and log some more messages + let osLogTestLogger = SFSDKLogger.sharedInstance(withComponent: "OSLog Test") + osLogTestLogger.i(LogTag.self, message: "Info log message with OSLog") + osLogTestLogger.w(LogTag.self, message: "Warning log message with OSLog") + osLogTestLogger.e(LogTag.self, message: "Error log message with OSLog") + osLogTestLogger.d(LogTag.self, message: "Debug log message with OSLog") + } + + var body: some Scene { + WindowGroup { + Text("SalesforceFileLogger Test App") + .padding() + } + } +} diff --git a/libs/SalesforceFileLogger/SalesforceFileLoggerTestApp/ViewController.h b/libs/SalesforceFileLogger/SalesforceFileLoggerTestApp/ViewController.h deleted file mode 100644 index d1138e07..00000000 --- a/libs/SalesforceFileLogger/SalesforceFileLoggerTestApp/ViewController.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - ViewController.h - ViewController - - Copyright (c) 2018-present, salesforce.com, inc. All rights reserved. - - Redistribution and use of this software in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright notice, this list of conditions - and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, this list of - conditions and the following disclaimer in the documentation and/or other materials provided - with the distribution. - * Neither the name of salesforce.com, inc. nor the names of its contributors may be used to - endorse or promote products derived from this software without specific prior written - permission of salesforce.com, inc. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR - IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY - WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -#import - -@interface ViewController : UIViewController - - -@end - diff --git a/libs/SalesforceFileLogger/SalesforceFileLoggerTestApp/ViewController.m b/libs/SalesforceFileLogger/SalesforceFileLoggerTestApp/ViewController.m deleted file mode 100644 index c41e8112..00000000 --- a/libs/SalesforceFileLogger/SalesforceFileLoggerTestApp/ViewController.m +++ /dev/null @@ -1,56 +0,0 @@ -/* - ViewController.m - ViewController - - Copyright (c) 2018-present, salesforce.com, inc. All rights reserved. - - Redistribution and use of this software in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright notice, this list of conditions - and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, this list of - conditions and the following disclaimer in the documentation and/or other materials provided - with the distribution. - * Neither the name of salesforce.com, inc. nor the names of its contributors may be used to - endorse or promote products derived from this software without specific prior written - permission of salesforce.com, inc. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR - IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY - WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -#import "ViewController.h" -#import - -@interface ViewController () - -@end - -@implementation ViewController - -- (void)viewDidLoad { - [super viewDidLoad]; - // Do any additional setup after loading the view, typically from a nib. - - // Log some messages using SFSDKLogger without enabling OSLog - [[SFSDKLogger sharedInstance] i:[self class] message:@"Info log message without OSLog"]; - [[SFSDKLogger sharedInstance] w:[self class] message:@"Warning log message without OSLog"]; - [[SFSDKLogger sharedInstance] e:[self class] message:@"Error log message without OSLog"]; - [[SFSDKLogger sharedInstance] d:[self class] message:@"Debug log message without OSLog"]; - - [SFSDKLogger setUseOSLog:YES]; - - // Create a new logger instance with OSLog enabled and log some more messages - SFSDKLogger *osLogTestLogger = [SFSDKLogger sharedInstanceWithComponent:@"OSLog Test"]; - [osLogTestLogger i:[self class] message:@"Info log message with OSLog"]; - [osLogTestLogger w:[self class] message:@"Warning log message with OSLog"]; - [osLogTestLogger e:[self class] message:@"Error log message with OSLog"]; - [osLogTestLogger d:[self class] message:@"Debug log message with OSLog"]; -} - -@end diff --git a/libs/SalesforceFileLogger/SalesforceFileLoggerTestApp/en.lproj/InfoPlist.strings b/libs/SalesforceFileLogger/SalesforceFileLoggerTestApp/en.lproj/InfoPlist.strings deleted file mode 100644 index 477b28ff..00000000 --- a/libs/SalesforceFileLogger/SalesforceFileLoggerTestApp/en.lproj/InfoPlist.strings +++ /dev/null @@ -1,2 +0,0 @@ -/* Localized versions of Info.plist keys */ - diff --git a/libs/SalesforceFileLogger/SalesforceFileLoggerTestApp/main.m b/libs/SalesforceFileLogger/SalesforceFileLoggerTestApp/main.m deleted file mode 100644 index 49e5a0ee..00000000 --- a/libs/SalesforceFileLogger/SalesforceFileLoggerTestApp/main.m +++ /dev/null @@ -1,18 +0,0 @@ -// -// main.m -// HybridPluginTestApp -// -// Created by Kevin Hawkins on 3/6/13. -// Copyright (c) 2013-present, salesforce.com. All rights reserved. -// - -#import - -#import "AppDelegate.h" - -int main(int argc, char *argv[]) -{ - @autoreleasepool { - return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class])); - } -}