Skip to content

Update SalesforceFileLoggerTestApp to use scene life cycle #313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bbirman merged 3 commits into from
Jun 25, 2026
Merged

Update SalesforceFileLoggerTestApp to use scene life cycle #313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b5d87e1
Update SalesforceFileLoggerTestApp to use scene life cycle
bbirman Jun 19, 2026
ab317a6
Latest SalesforceMobileSDK-iOS
bbirman Jun 23, 2026
4d111cc
Keep logging from old view controller
bbirman Jun 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion external/SalesforceMobileSDK-iOS
Open in desktop
Submodule SalesforceMobileSDK-iOS updated 19 files
+2 −0 configuration/Common.xcconfig
+2 −4 libs/MobileSync/MobileSync.xcodeproj/project.pbxproj
+0 −6 libs/SalesforceSDKCommon/SalesforceSDKCommon.xcodeproj/project.pbxproj
+8 −10 libs/SalesforceSDKCore/SalesforceSDKCore.xcodeproj/project.pbxproj
+11 −2 libs/SalesforceSDKCore/SalesforceSDKCore/Classes/OAuth/SFOAuthCredentials.m
+22 −16 libs/SalesforceSDKCore/SalesforceSDKCore/Classes/PushNotification/PushNotificationManager.swift
+4 −4 libs/SalesforceSDKCore/SalesforceSDKCore/Classes/PushNotification/RemoteNotificationRegistering.swift
+17 −1 libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Test/TestSetupUtils.m
+1 −0 libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Util/SFSDKOAuth2+Internal.h
+3 −1 libs/SalesforceSDKCore/SalesforceSDKCore/Classes/Util/SFSDKOAuth2.m
+164 −67 libs/SalesforceSDKCore/SalesforceSDKCoreTests/PushNotificationManagerTests.swift
+0 −12 libs/SalesforceSDKCore/SalesforceSDKCoreTests/SFPushNotificationManagerTests.m
+1 −1 libs/SalesforceSDKCore/SalesforceSDKCoreTests/SFSDKAuthUtilTests.swift
+232 −0 libs/SalesforceSDKCore/SalesforceSDKCoreTests/SFSDKOAuth2RefreshInstanceUrlTests.m
+255 −81 libs/SalesforceSDKCore/SalesforceSDKCoreTests/SalesforceRestAPITests.m
+4 −6 libs/SmartStore/SmartStore.xcodeproj/project.pbxproj
+2 −4 native/SampleApps/AuthFlowTester/AuthFlowTester.xcodeproj/project.pbxproj
+5 −5 native/SampleApps/MobileSyncExplorer/MobileSyncExplorer.xcodeproj/project.pbxproj
+2 −4 native/SampleApps/RestAPIExplorer/RestAPIExplorer.xcodeproj/project.pbxproj
69 changes: 6 additions & 63 deletions libs/SalesforceFileLogger/SalesforceFileLogger.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -147,20 +141,13 @@
4FAE62FF2196714C003A5CD6 /* SFSDKLoggerTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SFSDKLoggerTests.m; sourceTree = "<group>"; };
4FC2B26A219A44880064EB46 /* SalesforceFileLoggerTests-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "SalesforceFileLoggerTests-Info.plist"; sourceTree = "<group>"; };
696E916E2AD0CC8200205884 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
69802DEA2FE5220200B9DA72 /* SalesforceFileLoggerTestApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SalesforceFileLoggerTestApp.swift; sourceTree = "<group>"; };
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 = "<group>"; };
82D0AB3D1C4980200081F833 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
82EFF2FA16E7FFF200A63CDF /* SalesforceSDKResources.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = SalesforceSDKResources.bundle; path = "../../../external/SalesforceMobileSDK-iOS/shared/resources/SalesforceSDKResources.bundle"; sourceTree = "<group>"; };
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 = "<group>"; };
82EFF30916E8049500A63CDF /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
82EFF30B16E8049500A63CDF /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
82EFF31116E8049500A63CDF /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = "<group>"; };
82EFF31316E8049500A63CDF /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default@2x.png"; sourceTree = "<group>"; };
82EFF31516E8049500A63CDF /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
82EFF33D16E8063700A63CDF /* test_credentials.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; name = test_credentials.json; path = ../../../shared/test/test_credentials.json; sourceTree = "<group>"; };
82EFF34216E80B6300A63CDF /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
82EFF34316E80B6300A63CDF /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
B7282F4C1D8C717200475F79 /* SalesforceFileLoggerTestApp.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = SalesforceFileLoggerTestApp.entitlements; sourceTree = "<group>"; };
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 = "<group>"; };
Expand All @@ -169,8 +156,6 @@
CEA2A8B32214C184009D923B /* Lumberjack.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Lumberjack.xcodeproj; path = ../../external/CocoaLumberjack/Lumberjack.xcodeproj; sourceTree = "<group>"; };
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 = "<group>"; };
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 = "<group>"; };
D291DB6A2E468AAF00AA4B64 /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; };
D291DB6B2E468AAF00AA4B64 /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -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 = "<group>";
};
822272A219C39F4500FC537E /* SalesforceFileLoggerTests */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -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 = "<group>";
Expand All @@ -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 = "<group>";
};
82EFF34116E80B6300A63CDF /* Classes */ = {
isa = PBXGroup;
children = (
82EFF34216E80B6300A63CDF /* AppDelegate.h */,
82EFF34316E80B6300A63CDF /* AppDelegate.m */,
);
path = Classes;
sourceTree = "<group>";
};
CE3FE5631AD4804200E65B49 /* Configuration */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -449,6 +408,7 @@
TestTargetID = 82EFF2FE16E8049500A63CDF;
};
82EFF2FE16E8049500A63CDF = {
LastSwiftMigration = 2630;
ProvisioningStyle = Manual;
SystemCapabilities = {
com.apple.Keychain = {
Expand Down Expand Up @@ -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;
};
Expand Down Expand Up @@ -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;
};
Expand Down Expand Up @@ -668,17 +622,6 @@
};
/* End PBXTargetDependency section */

/* Begin PBXVariantGroup section */
82EFF30816E8049500A63CDF /* InfoPlist.strings */ = {
isa = PBXVariantGroup;
children = (
82EFF30916E8049500A63CDF /* en */,
);
name = InfoPlist.strings;
sourceTree = "<group>";
};
/* End PBXVariantGroup section */

/* Begin XCBuildConfiguration section */
2DE48CC118BFA941008345C7 /* Debug */ = {
isa = XCBuildConfiguration;
Expand Down
35 changes: 0 additions & 35 deletions libs/SalesforceFileLogger/SalesforceFileLoggerTestApp/Classes/AppDelegate.h
View file
Open in desktop

This file was deleted.

77 changes: 0 additions & 77 deletions libs/SalesforceFileLogger/SalesforceFileLoggerTestApp/Classes/AppDelegate.m
View file
Open in desktop

This file was deleted.

Binary file removed libs/SalesforceFileLogger/SalesforceFileLoggerTestApp/Default-568h@2x.png
View file
Open in desktop
Binary file not shown.
Binary file removed libs/SalesforceFileLogger/SalesforceFileLoggerTestApp/Default.png
View file
Open in desktop
Binary file not shown.
Binary file removed libs/SalesforceFileLogger/SalesforceFileLoggerTestApp/Default@2x.png
View file
Open in desktop
Binary file not shown.
12 changes: 12 additions & 0 deletions libs/SalesforceFileLogger/SalesforceFileLoggerTestApp/SalesforceFileLoggerTestApp-Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,18 @@
<string>1.0</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>UIApplicationSceneManifest</key>
<dict>
<key>UIApplicationSupportsMultipleScenes</key>
<false/>
<key>UISceneConfigurations</key>
<dict/>
</dict>
<key>UILaunchScreen</key>
<dict>
<key>UILaunchScreen</key>
<string></string>
</dict>
<key>UIRequiredDeviceCapabilities</key>
<array>
<string>armv7</string>
Expand Down
Loading
Loading