Skip to content

Commit d140bb1

Browse files
bbirmanbbirman
authored
Merge pull request #313 from bbirman/app-scene
Update SalesforceFileLoggerTestApp to use scene life cycle
2 parents add8b71 + 4d111cc commit d140bb1

13 files changed

Lines changed: 78 additions & 285 deletions

File tree

‎external/SalesforceMobileSDK-iOS‎

Submodule SalesforceMobileSDK-iOS updated 19 files

‎libs/SalesforceFileLogger/SalesforceFileLogger.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,13 @@
3232
691BBAAD278663820098A716 /* CocoaLumberjack.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = CEA2A8C72214C184009D923B /* CocoaLumberjack.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
3333
691BBAB02786638C0098A716 /* SalesforceSDKCommon.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = CEA2A8AC2214C174009D923B /* SalesforceSDKCommon.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
3434
696E91742AD0CD7E00205884 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 696E916E2AD0CC8200205884 /* PrivacyInfo.xcprivacy */; };
35+
69802DEB2FE5220200B9DA72 /* SalesforceFileLoggerTestApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 69802DEA2FE5220200B9DA72 /* SalesforceFileLoggerTestApp.swift */; };
3536
829DA2B11C12677B0040F5F1 /* SalesforceFileLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 829DA2B01C12677B0040F5F1 /* SalesforceFileLogger.h */; settings = {ATTRIBUTES = (Public, ); }; };
36-
82EFF30A16E8049500A63CDF /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 82EFF30816E8049500A63CDF /* InfoPlist.strings */; };
37-
82EFF30C16E8049500A63CDF /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 82EFF30B16E8049500A63CDF /* main.m */; };
38-
82EFF31216E8049500A63CDF /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 82EFF31116E8049500A63CDF /* Default.png */; };
39-
82EFF31416E8049500A63CDF /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 82EFF31316E8049500A63CDF /* Default@2x.png */; };
40-
82EFF31616E8049500A63CDF /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 82EFF31516E8049500A63CDF /* Default-568h@2x.png */; };
41-
82EFF34416E80B6300A63CDF /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 82EFF34316E80B6300A63CDF /* AppDelegate.m */; };
4237
CE0AB0A51C10D60400BFAEED /* SalesforceFileLogger.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE4CE2E11C0E465B009F6029 /* SalesforceFileLogger.framework */; };
4338
CE4CE2E81C0E465B009F6029 /* SalesforceFileLogger.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE4CE2E11C0E465B009F6029 /* SalesforceFileLogger.framework */; };
4439
CE4CE2E91C0E465B009F6029 /* SalesforceFileLogger.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = CE4CE2E11C0E465B009F6029 /* SalesforceFileLogger.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
4540
CEA2A8EA2214C1B1009D923B /* CocoaLumberjack.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CEA2A8C72214C184009D923B /* CocoaLumberjack.framework */; };
4641
CEA2A8EB2214C1B9009D923B /* SalesforceSDKCommon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CEA2A8AC2214C174009D923B /* SalesforceSDKCommon.framework */; };
47-
D291DB6C2E468AAF00AA4B64 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D291DB6B2E468AAF00AA4B64 /* ViewController.m */; };
4842
/* End PBXBuildFile section */
4943

5044
/* Begin PBXContainerItemProxy section */
@@ -147,20 +141,13 @@
147141
4FAE62FF2196714C003A5CD6 /* SFSDKLoggerTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SFSDKLoggerTests.m; sourceTree = "<group>"; };
148142
4FC2B26A219A44880064EB46 /* SalesforceFileLoggerTests-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "SalesforceFileLoggerTests-Info.plist"; sourceTree = "<group>"; };
149143
696E916E2AD0CC8200205884 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
144+
69802DEA2FE5220200B9DA72 /* SalesforceFileLoggerTestApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SalesforceFileLoggerTestApp.swift; sourceTree = "<group>"; };
150145
8222729D19C39F4500FC537E /* SalesforceFileLoggerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SalesforceFileLoggerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
151146
829DA2B01C12677B0040F5F1 /* SalesforceFileLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SalesforceFileLogger.h; sourceTree = "<group>"; };
152147
82D0AB3D1C4980200081F833 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
153148
82EFF2FA16E7FFF200A63CDF /* SalesforceSDKResources.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = SalesforceSDKResources.bundle; path = "../../../external/SalesforceMobileSDK-iOS/shared/resources/SalesforceSDKResources.bundle"; sourceTree = "<group>"; };
154149
82EFF2FF16E8049500A63CDF /* SalesforceFileLoggerTestApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SalesforceFileLoggerTestApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
155-
82EFF30716E8049500A63CDF /* SalesforceFileLoggerTestApp-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "SalesforceFileLoggerTestApp-Info.plist"; sourceTree = "<group>"; };
156-
82EFF30916E8049500A63CDF /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
157-
82EFF30B16E8049500A63CDF /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
158-
82EFF31116E8049500A63CDF /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = "<group>"; };
159-
82EFF31316E8049500A63CDF /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default@2x.png"; sourceTree = "<group>"; };
160-
82EFF31516E8049500A63CDF /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
161150
82EFF33D16E8063700A63CDF /* test_credentials.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; name = test_credentials.json; path = ../../../shared/test/test_credentials.json; sourceTree = "<group>"; };
162-
82EFF34216E80B6300A63CDF /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
163-
82EFF34316E80B6300A63CDF /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
164151
B7282F4C1D8C717200475F79 /* SalesforceFileLoggerTestApp.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = SalesforceFileLoggerTestApp.entitlements; sourceTree = "<group>"; };
165152
CE4CE2E11C0E465B009F6029 /* SalesforceFileLogger.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SalesforceFileLogger.framework; sourceTree = BUILT_PRODUCTS_DIR; };
166153
CE8F13061AD4A87200233F2F /* SalesforceFileLogger-Common.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = "SalesforceFileLogger-Common.xcconfig"; path = "Configuration/SalesforceFileLogger-Common.xcconfig"; sourceTree = "<group>"; };
@@ -169,8 +156,6 @@
169156
CEA2A8B32214C184009D923B /* Lumberjack.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Lumberjack.xcodeproj; path = ../../external/CocoaLumberjack/Lumberjack.xcodeproj; sourceTree = "<group>"; };
170157
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>"; };
171158
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>"; };
172-
D291DB6A2E468AAF00AA4B64 /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; };
173-
D291DB6B2E468AAF00AA4B64 /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
174159
/* End PBXFileReference section */
175160

176161
/* Begin PBXFrameworksBuildPhase section */
@@ -202,15 +187,6 @@
202187
/* End PBXFrameworksBuildPhase section */
203188

204189
/* Begin PBXGroup section */
205-
4F06AFC31C49A87F00F70798 /* Supporting Files */ = {
206-
isa = PBXGroup;
207-
children = (
208-
4F06AFC41C49A88B00F70798 /* SalesforceFileLoggerTestApp-Info.plist */,
209-
);
210-
name = "Supporting Files";
211-
path = SalesforceFileLoggerTests;
212-
sourceTree = "<group>";
213-
};
214190
822272A219C39F4500FC537E /* SalesforceFileLoggerTests */ = {
215191
isa = PBXGroup;
216192
children = (
@@ -296,11 +272,9 @@
296272
82EFF30516E8049500A63CDF /* SalesforceFileLoggerTestApp */ = {
297273
isa = PBXGroup;
298274
children = (
299-
D291DB6A2E468AAF00AA4B64 /* ViewController.h */,
300-
D291DB6B2E468AAF00AA4B64 /* ViewController.m */,
301-
4F06AFC31C49A87F00F70798 /* Supporting Files */,
275+
69802DEA2FE5220200B9DA72 /* SalesforceFileLoggerTestApp.swift */,
276+
4F06AFC41C49A88B00F70798 /* SalesforceFileLoggerTestApp-Info.plist */,
302277
B7282F4C1D8C717200475F79 /* SalesforceFileLoggerTestApp.entitlements */,
303-
82EFF34116E80B6300A63CDF /* Classes */,
304278
);
305279
path = SalesforceFileLoggerTestApp;
306280
sourceTree = "<group>";
@@ -309,26 +283,11 @@
309283
isa = PBXGroup;
310284
children = (
311285
82EFF33D16E8063700A63CDF /* test_credentials.json */,
312-
82EFF30716E8049500A63CDF /* SalesforceFileLoggerTestApp-Info.plist */,
313-
82EFF30816E8049500A63CDF /* InfoPlist.strings */,
314-
82EFF30B16E8049500A63CDF /* main.m */,
315-
82EFF31116E8049500A63CDF /* Default.png */,
316-
82EFF31316E8049500A63CDF /* Default@2x.png */,
317-
82EFF31516E8049500A63CDF /* Default-568h@2x.png */,
318286
);
319287
name = "Supporting Files";
320288
path = SalesforceFileLoggerTestApp;
321289
sourceTree = "<group>";
322290
};
323-
82EFF34116E80B6300A63CDF /* Classes */ = {
324-
isa = PBXGroup;
325-
children = (
326-
82EFF34216E80B6300A63CDF /* AppDelegate.h */,
327-
82EFF34316E80B6300A63CDF /* AppDelegate.m */,
328-
);
329-
path = Classes;
330-
sourceTree = "<group>";
331-
};
332291
CE3FE5631AD4804200E65B49 /* Configuration */ = {
333292
isa = PBXGroup;
334293
children = (
@@ -449,6 +408,7 @@
449408
TestTargetID = 82EFF2FE16E8049500A63CDF;
450409
};
451410
82EFF2FE16E8049500A63CDF = {
411+
LastSwiftMigration = 2630;
452412
ProvisioningStyle = Manual;
453413
SystemCapabilities = {
454414
com.apple.Keychain = {
@@ -557,10 +517,6 @@
557517
buildActionMask = 2147483647;
558518
files = (
559519
4F06AFEB1C49D35B00F70798 /* test_credentials.json in Resources */,
560-
82EFF30A16E8049500A63CDF /* InfoPlist.strings in Resources */,
561-
82EFF31216E8049500A63CDF /* Default.png in Resources */,
562-
82EFF31416E8049500A63CDF /* Default@2x.png in Resources */,
563-
82EFF31616E8049500A63CDF /* Default-568h@2x.png in Resources */,
564520
);
565521
runOnlyForDeploymentPostprocessing = 0;
566522
};
@@ -627,9 +583,7 @@
627583
isa = PBXSourcesBuildPhase;
628584
buildActionMask = 2147483647;
629585
files = (
630-
D291DB6C2E468AAF00AA4B64 /* ViewController.m in Sources */,
631-
82EFF30C16E8049500A63CDF /* main.m in Sources */,
632-
82EFF34416E80B6300A63CDF /* AppDelegate.m in Sources */,
586+
69802DEB2FE5220200B9DA72 /* SalesforceFileLoggerTestApp.swift in Sources */,
633587
);
634588
runOnlyForDeploymentPostprocessing = 0;
635589
};
@@ -668,17 +622,6 @@
668622
};
669623
/* End PBXTargetDependency section */
670624

671-
/* Begin PBXVariantGroup section */
672-
82EFF30816E8049500A63CDF /* InfoPlist.strings */ = {
673-
isa = PBXVariantGroup;
674-
children = (
675-
82EFF30916E8049500A63CDF /* en */,
676-
);
677-
name = InfoPlist.strings;
678-
sourceTree = "<group>";
679-
};
680-
/* End PBXVariantGroup section */
681-
682625
/* Begin XCBuildConfiguration section */
683626
2DE48CC118BFA941008345C7 /* Debug */ = {
684627
isa = XCBuildConfiguration;

‎libs/SalesforceFileLogger/SalesforceFileLoggerTestApp/Classes/AppDelegate.h‎

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎libs/SalesforceFileLogger/SalesforceFileLoggerTestApp/Classes/AppDelegate.m‎

Lines changed: 0 additions & 77 deletions
This file was deleted.

‎libs/SalesforceFileLogger/SalesforceFileLoggerTestApp/Default-568h@2x.png‎

-18.2 KB
Binary file not shown.

‎libs/SalesforceFileLogger/SalesforceFileLoggerTestApp/Default.png‎

-6.39 KB
Binary file not shown.

‎libs/SalesforceFileLogger/SalesforceFileLoggerTestApp/Default@2x.png‎

-15.7 KB
Binary file not shown.

‎libs/SalesforceFileLogger/SalesforceFileLoggerTestApp/SalesforceFileLoggerTestApp-Info.plist‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,18 @@
2424
<string>1.0</string>
2525
<key>LSRequiresIPhoneOS</key>
2626
<true/>
27+
<key>UIApplicationSceneManifest</key>
28+
<dict>
29+
<key>UIApplicationSupportsMultipleScenes</key>
30+
<false/>
31+
<key>UISceneConfigurations</key>
32+
<dict/>
33+
</dict>
34+
<key>UILaunchScreen</key>
35+
<dict>
36+
<key>UILaunchScreen</key>
37+
<string></string>
38+
</dict>
2739
<key>UIRequiredDeviceCapabilities</key>
2840
<array>
2941
<string>armv7</string>

0 commit comments

Comments
 (0)