Skip to content

Commit ec26a56

Browse files
bbirmanbbirman
authored
Merge pull request #4081 from bbirman/analytics-test-app
Update SalesforceAnalyticsTestApp to use scene lifecycle
2 parents 4532322 + 9b160f2 commit ec26a56

10 files changed

Lines changed: 55 additions & 287 deletions

File tree

‎libs/SalesforceAnalytics/SalesforceAnalytics.xcodeproj/project.pbxproj‎

Lines changed: 5 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,9 @@
2525
B716A37F218F5D9F009D407F /* SalesforceSDKCommon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B716A378218F5D60009D407F /* SalesforceSDKCommon.framework */; };
2626
CE1F09E4201A6C18006FA9D2 /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE1F09D5201A6C17006FA9D2 /* CoreTelephony.framework */; platformFilters = (ios, maccatalyst, ); };
2727
CE2B8BD31CE900F500C6FC6A /* SalesforceAnalytics.h in Headers */ = {isa = PBXBuildFile; fileRef = CE2B8BD21CE900F500C6FC6A /* SalesforceAnalytics.h */; settings = {ATTRIBUTES = (Public, ); }; };
28-
CE2B8C2E1CE9218900C6FC6A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = CE2B8C2D1CE9218900C6FC6A /* main.m */; };
29-
CE2B8C311CE9218900C6FC6A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = CE2B8C301CE9218900C6FC6A /* AppDelegate.m */; };
28+
695583B12FE4DB6C0042CF82 /* SalesforceAnalyticsTestApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 695583B02FE4DB5E0042CF82 /* SalesforceAnalyticsTestApp.swift */; };
3029
CE2B8C441CE921E000C6FC6A /* SalesforceAnalytics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE2B8BCF1CE900F500C6FC6A /* SalesforceAnalytics.framework */; };
3130
CE2B8C451CE921E000C6FC6A /* SalesforceAnalytics.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = CE2B8BCF1CE900F500C6FC6A /* SalesforceAnalytics.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
32-
CE2B8C4E1CE9243600C6FC6A /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CE2B8C4D1CE9243600C6FC6A /* ViewController.m */; };
3331
CE2B8E111CE9352B00C6FC6A /* en.lproj in Resources */ = {isa = PBXBuildFile; fileRef = CE2B8C501CE9245B00C6FC6A /* en.lproj */; };
3432
CE2B8E131CE9352B00C6FC6A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = CE2B8C3B1CE9218900C6FC6A /* Assets.xcassets */; };
3533
CE2B8FEB1CF5515E00C6FC6A /* SalesforceAnalytics-Prefix.pch in Headers */ = {isa = PBXBuildFile; fileRef = CE2B8FEA1CF5515E00C6FC6A /* SalesforceAnalytics-Prefix.pch */; };
@@ -48,8 +46,6 @@
4846
CEF371AF1D0E58260004A237 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CEF371A71D0E57ED0004A237 /* Foundation.framework */; };
4947
CEF371B01D0E582C0004A237 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CEF371A91D0E57F50004A237 /* UIKit.framework */; };
5048
CEF371B41D0F6E6D0004A237 /* SFSDKInstrumentationEvent+Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = CEF371B31D0F6E6D0004A237 /* SFSDKInstrumentationEvent+Internal.h */; };
51-
CEF371E51D10D7E60004A237 /* Main_iPad.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = CEF371E31D10D7E60004A237 /* Main_iPad.storyboard */; };
52-
CEF371E61D10D7E60004A237 /* Main_iPhone.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = CEF371E41D10D7E60004A237 /* Main_iPhone.storyboard */; };
5349
CEF371E81D11B76E0004A237 /* EventStoreManagerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = CEF371E71D11B76E0004A237 /* EventStoreManagerTests.m */; };
5450
CEF372461D12100D0004A237 /* AnalyticsTestUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = CEF372451D12100D0004A237 /* AnalyticsTestUtil.m */; };
5551
CEF372CB1D1324040004A237 /* SFSDKAILTNTransform.h in Headers */ = {isa = PBXBuildFile; fileRef = CEF372C81D1324040004A237 /* SFSDKAILTNTransform.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -131,13 +127,9 @@
131127
CE2B8BD21CE900F500C6FC6A /* SalesforceAnalytics.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SalesforceAnalytics.h; sourceTree = "<group>"; };
132128
CE2B8BD91CE900F500C6FC6A /* SalesforceAnalyticsTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SalesforceAnalyticsTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
133129
CE2B8C2A1CE9218900C6FC6A /* SalesforceAnalyticsTestApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SalesforceAnalyticsTestApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
134-
CE2B8C2D1CE9218900C6FC6A /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
135-
CE2B8C2F1CE9218900C6FC6A /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
136-
CE2B8C301CE9218900C6FC6A /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
130+
695583B02FE4DB5E0042CF82 /* SalesforceAnalyticsTestApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SalesforceAnalyticsTestApp.swift; sourceTree = "<group>"; };
137131
CE2B8C3B1CE9218900C6FC6A /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
138132
CE2B8C4B1CE9243600C6FC6A /* SalesforceAnalyticsTestApp-Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "SalesforceAnalyticsTestApp-Prefix.pch"; sourceTree = "<group>"; };
139-
CE2B8C4C1CE9243600C6FC6A /* ViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; };
140-
CE2B8C4D1CE9243600C6FC6A /* ViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
141133
CE2B8C501CE9245B00C6FC6A /* en.lproj */ = {isa = PBXFileReference; lastKnownFileType = folder; path = en.lproj; sourceTree = "<group>"; };
142134
CE2B8C521CE9245B00C6FC6A /* SalesforceAnalyticsTestApp-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "SalesforceAnalyticsTestApp-Info.plist"; sourceTree = "<group>"; };
143135
CE2B8CA71CE9281F00C6FC6A /* SalesforceAnalytics-Common-Dynamic.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = "SalesforceAnalytics-Common-Dynamic.xcconfig"; path = "Configuration/SalesforceAnalytics-Common-Dynamic.xcconfig"; sourceTree = "<group>"; };
@@ -158,8 +150,6 @@
158150
CEF371A71D0E57ED0004A237 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
159151
CEF371A91D0E57F50004A237 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
160152
CEF371B31D0F6E6D0004A237 /* SFSDKInstrumentationEvent+Internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "SFSDKInstrumentationEvent+Internal.h"; path = "Classes/Model/SFSDKInstrumentationEvent+Internal.h"; sourceTree = "<group>"; };
161-
CEF371E31D10D7E60004A237 /* Main_iPad.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = Main_iPad.storyboard; path = Base.lproj/Main_iPad.storyboard; sourceTree = "<group>"; };
162-
CEF371E41D10D7E60004A237 /* Main_iPhone.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = Main_iPhone.storyboard; path = Base.lproj/Main_iPhone.storyboard; sourceTree = "<group>"; };
163153
CEF371E71D11B76E0004A237 /* EventStoreManagerTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EventStoreManagerTests.m; sourceTree = "<group>"; };
164154
CEF372441D120FEE0004A237 /* AnalyticsTestUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AnalyticsTestUtil.h; sourceTree = "<group>"; };
165155
CEF372451D12100D0004A237 /* AnalyticsTestUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AnalyticsTestUtil.m; sourceTree = "<group>"; };
@@ -264,30 +254,16 @@
264254
CE2B8C2B1CE9218900C6FC6A /* SalesforceAnalyticsTestApp */ = {
265255
isa = PBXGroup;
266256
children = (
257+
695583B02FE4DB5E0042CF82 /* SalesforceAnalyticsTestApp.swift */,
267258
B7282F401D8C711100475F79 /* SalesforceAnalyticsTestApp.entitlements */,
268-
CEF371E31D10D7E60004A237 /* Main_iPad.storyboard */,
269-
CEF371E41D10D7E60004A237 /* Main_iPhone.storyboard */,
270259
CE2B8C501CE9245B00C6FC6A /* en.lproj */,
271260
CE2B8C521CE9245B00C6FC6A /* SalesforceAnalyticsTestApp-Info.plist */,
272261
CE2B8C4B1CE9243600C6FC6A /* SalesforceAnalyticsTestApp-Prefix.pch */,
273-
CE2B8C4C1CE9243600C6FC6A /* ViewController.h */,
274-
CE2B8C4D1CE9243600C6FC6A /* ViewController.m */,
275-
CE2B8C2F1CE9218900C6FC6A /* AppDelegate.h */,
276-
CE2B8C301CE9218900C6FC6A /* AppDelegate.m */,
277262
CE2B8C3B1CE9218900C6FC6A /* Assets.xcassets */,
278-
CE2B8C2C1CE9218900C6FC6A /* Supporting Files */,
279263
);
280264
path = SalesforceAnalyticsTestApp;
281265
sourceTree = "<group>";
282266
};
283-
CE2B8C2C1CE9218900C6FC6A /* Supporting Files */ = {
284-
isa = PBXGroup;
285-
children = (
286-
CE2B8C2D1CE9218900C6FC6A /* main.m */,
287-
);
288-
name = "Supporting Files";
289-
sourceTree = "<group>";
290-
};
291267
CE2B8CA61CE9281300C6FC6A /* Configuration */ = {
292268
isa = PBXGroup;
293269
children = (
@@ -490,6 +466,7 @@
490466
};
491467
CE2B8C291CE9218900C6FC6A = {
492468
CreatedOnToolsVersion = 7.3.1;
469+
LastSwiftMigration = 2630;
493470
ProvisioningStyle = Manual;
494471
SystemCapabilities = {
495472
com.apple.Keychain = {
@@ -570,8 +547,6 @@
570547
isa = PBXResourcesBuildPhase;
571548
buildActionMask = 2147483647;
572549
files = (
573-
CEF371E51D10D7E60004A237 /* Main_iPad.storyboard in Resources */,
574-
CEF371E61D10D7E60004A237 /* Main_iPhone.storyboard in Resources */,
575550
CE2B8E111CE9352B00C6FC6A /* en.lproj in Resources */,
576551
CE2B8E131CE9352B00C6FC6A /* Assets.xcassets in Resources */,
577552
);
@@ -652,9 +627,7 @@
652627
isa = PBXSourcesBuildPhase;
653628
buildActionMask = 2147483647;
654629
files = (
655-
CE2B8C4E1CE9243600C6FC6A /* ViewController.m in Sources */,
656-
CE2B8C311CE9218900C6FC6A /* AppDelegate.m in Sources */,
657-
CE2B8C2E1CE9218900C6FC6A /* main.m in Sources */,
630+
695583B12FE4DB6C0042CF82 /* SalesforceAnalyticsTestApp.swift in Sources */,
658631
);
659632
runOnlyForDeploymentPostprocessing = 0;
660633
};

‎libs/SalesforceAnalytics/SalesforceAnalyticsTestApp/AppDelegate.h‎

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

‎libs/SalesforceAnalytics/SalesforceAnalyticsTestApp/AppDelegate.m‎

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

‎libs/SalesforceAnalytics/SalesforceAnalyticsTestApp/Base.lproj/Main_iPad.storyboard‎

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

‎libs/SalesforceAnalytics/SalesforceAnalyticsTestApp/Base.lproj/Main_iPhone.storyboard‎

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

‎libs/SalesforceAnalytics/SalesforceAnalyticsTestApp/SalesforceAnalyticsTestApp-Info.plist‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,18 @@
2424
<string>1.0</string>
2525
<key>LSRequiresIPhoneOS</key>
2626
<true/>
27-
<key>UIMainStoryboardFile</key>
28-
<string>Main_iPhone</string>
29-
<key>UIMainStoryboardFile~ipad</key>
30-
<string>Main_iPad</string>
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>
3139
<key>UIRequiredDeviceCapabilities</key>
3240
<array>
3341
<string>armv7</string>

0 commit comments

Comments
 (0)