Skip to content

Commit 09b4eb7

Browse files
bbirmanbbirman
committed
Merge branch 'swift-xcconfig' of github.com:bbirman/SalesforceMobileSDK-iOS into app-scene
2 parents 870ee7e + 86cd620 commit 09b4eb7

8 files changed

Lines changed: 17 additions & 35 deletions

File tree

‎configuration/Common.xcconfig‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
//
77
//
88

9+
SWIFT_VERSION = 5.0
10+
911
ALWAYS_SEARCH_USER_PATHS = NO
1012
OTHER_LDFLAGS = -ObjC -weak_framework Combine
1113
ENABLE_TESTABILITY = YES

‎libs/MobileSync/MobileSync.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1356,6 +1356,7 @@
13561356
/* Begin XCBuildConfiguration section */
13571357
4F06AF421C499FD100F70798 /* Debug */ = {
13581358
isa = XCBuildConfiguration;
1359+
baseConfigurationReference = CECB662A1C1BB8A9008038AE /* MobileSync-Dynamic-iOS-Debug.xcconfig */;
13591360
buildSettings = {
13601361
APPLICATION_EXTENSION_API_ONLY = YES;
13611362
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
@@ -1382,6 +1383,7 @@
13821383
};
13831384
4F06AF431C499FD100F70798 /* Release */ = {
13841385
isa = XCBuildConfiguration;
1386+
baseConfigurationReference = CECB662B1C1BB8A9008038AE /* MobileSync-Dynamic-iOS-Release.xcconfig */;
13851387
buildSettings = {
13861388
APPLICATION_EXTENSION_API_ONLY = YES;
13871389
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
@@ -1437,7 +1439,6 @@
14371439
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator";
14381440
SUPPORTS_MACCATALYST = YES;
14391441
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1440-
SWIFT_VERSION = 5.0;
14411442
TARGETED_DEVICE_FAMILY = "1,2,7";
14421443
VERSIONING_SYSTEM = "apple-generic";
14431444
VERSION_INFO_PREFIX = "";
@@ -1475,7 +1476,6 @@
14751476
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator";
14761477
SUPPORTS_MACCATALYST = YES;
14771478
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1478-
SWIFT_VERSION = 5.0;
14791479
TARGETED_DEVICE_FAMILY = "1,2,7";
14801480
VERSIONING_SYSTEM = "apple-generic";
14811481
VERSION_INFO_PREFIX = "";
@@ -1613,7 +1613,6 @@
16131613
PRODUCT_NAME = "$(TARGET_NAME)";
16141614
SWIFT_OBJC_BRIDGING_HEADER = "MobileSyncTests/MobileSyncTests-Bridging-Header.h";
16151615
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1616-
SWIFT_VERSION = 5.0;
16171616
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MobileSyncTestApp.app/MobileSyncTestApp";
16181617
WRAPPER_EXTENSION = xctest;
16191618
};
@@ -1644,7 +1643,6 @@
16441643
PRODUCT_NAME = "$(TARGET_NAME)";
16451644
SWIFT_OBJC_BRIDGING_HEADER = "MobileSyncTests/MobileSyncTests-Bridging-Header.h";
16461645
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1647-
SWIFT_VERSION = 5.0;
16481646
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MobileSyncTestApp.app/MobileSyncTestApp";
16491647
WRAPPER_EXTENSION = xctest;
16501648
};

‎libs/SalesforceSDKCommon/SalesforceSDKCommon.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -701,7 +701,6 @@
701701
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator";
702702
SUPPORTS_MACCATALYST = YES;
703703
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
704-
SWIFT_VERSION = 5.0;
705704
TARGETED_DEVICE_FAMILY = "1,2,7";
706705
};
707706
name = Debug;
@@ -731,7 +730,6 @@
731730
SKIP_INSTALL = YES;
732731
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator";
733732
SUPPORTS_MACCATALYST = YES;
734-
SWIFT_VERSION = 5.0;
735733
TARGETED_DEVICE_FAMILY = "1,2,7";
736734
};
737735
name = Release;
@@ -752,7 +750,6 @@
752750
PRODUCT_NAME = "$(TARGET_NAME)";
753751
SWIFT_OBJC_BRIDGING_HEADER = "";
754752
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
755-
SWIFT_VERSION = 5.0;
756753
TARGETED_DEVICE_FAMILY = "1,2";
757754
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SalesforceSDKCommonTestApp.app/SalesforceSDKCommonTestApp";
758755
};
@@ -773,7 +770,6 @@
773770
PRODUCT_BUNDLE_IDENTIFIER = com.salesforce.mobilesdk.SalesforceSDKCommonTests;
774771
PRODUCT_NAME = "$(TARGET_NAME)";
775772
SWIFT_OBJC_BRIDGING_HEADER = "";
776-
SWIFT_VERSION = 5.0;
777773
TARGETED_DEVICE_FAMILY = "1,2";
778774
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SalesforceSDKCommonTestApp.app/SalesforceSDKCommonTestApp";
779775
};
@@ -807,7 +803,6 @@
807803
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
808804
SWIFT_EMIT_LOC_STRINGS = YES;
809805
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
810-
SWIFT_VERSION = 5.0;
811806
TARGETED_DEVICE_FAMILY = "1,2";
812807
};
813808
name = Debug;
@@ -839,7 +834,6 @@
839834
PRODUCT_NAME = "$(TARGET_NAME)";
840835
SWIFT_EMIT_LOC_STRINGS = YES;
841836
SWIFT_OPTIMIZATION_LEVEL = "-O";
842-
SWIFT_VERSION = 5.0;
843837
TARGETED_DEVICE_FAMILY = "1,2";
844838
};
845839
name = Release;

‎libs/SalesforceSDKCore/SalesforceSDKCore.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2524,7 +2524,6 @@
25242524
PRODUCT_NAME = "$(TARGET_NAME)";
25252525
SWIFT_OBJC_BRIDGING_HEADER = "SalesforceSDKCoreTests/SalesforceSDKCoreTests-Bridging-Header.h";
25262526
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
2527-
SWIFT_VERSION = 5.0;
25282527
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SalesforceSDKCoreTestApp.app/SalesforceSDKCoreTestApp";
25292528
WRAPPER_EXTENSION = xctest;
25302529
};
@@ -2561,7 +2560,6 @@
25612560
PRODUCT_NAME = "$(TARGET_NAME)";
25622561
SWIFT_OBJC_BRIDGING_HEADER = "SalesforceSDKCoreTests/SalesforceSDKCoreTests-Bridging-Header.h";
25632562
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
2564-
SWIFT_VERSION = 5.0;
25652563
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SalesforceSDKCoreTestApp.app/SalesforceSDKCoreTestApp";
25662564
WRAPPER_EXTENSION = xctest;
25672565
};
@@ -2602,7 +2600,6 @@
26022600
IPHONEOS_DEPLOYMENT_TARGET = 18.0;
26032601
ONLY_ACTIVE_ARCH = YES;
26042602
SDKROOT = iphoneos;
2605-
SWIFT_VERSION = 5.0;
26062603
XROS_DEPLOYMENT_TARGET = 2.0;
26072604
};
26082605
name = Debug;
@@ -2641,7 +2638,6 @@
26412638
IPHONEOS_DEPLOYMENT_TARGET = 18.0;
26422639
SDKROOT = iphoneos;
26432640
SWIFT_COMPILATION_MODE = wholemodule;
2644-
SWIFT_VERSION = 5.0;
26452641
XROS_DEPLOYMENT_TARGET = 2.0;
26462642
};
26472643
name = Release;
@@ -2793,7 +2789,6 @@
27932789
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator";
27942790
SUPPORTS_MACCATALYST = YES;
27952791
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
2796-
SWIFT_VERSION = 5.0;
27972792
TARGETED_DEVICE_FAMILY = "1,2,7";
27982793
VERSIONING_SYSTEM = "apple-generic";
27992794
VERSION_INFO_PREFIX = "";
@@ -2851,7 +2846,6 @@
28512846
SKIP_INSTALL = YES;
28522847
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator";
28532848
SUPPORTS_MACCATALYST = YES;
2854-
SWIFT_VERSION = 5.0;
28552849
TARGETED_DEVICE_FAMILY = "1,2,7";
28562850
VALIDATE_PRODUCT = YES;
28572851
VERSIONING_SYSTEM = "apple-generic";

‎libs/SmartStore/SmartStore.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@
4848
4FEE44881BFD5CD900F09C43 /* SFSmartStoreFullTextSearchTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4F96015A1BFD33B30022F021 /* SFSmartStoreFullTextSearchTests.m */; };
4949
4FEE44891BFD5CDC00F09C43 /* SFSmartStoreTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 4F96015C1BFD33B30022F021 /* SFSmartStoreTestCase.m */; };
5050
4FEE448A1BFD5CE500F09C43 /* SFSmartStoreTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4F96015E1BFD33B30022F021 /* SFSmartStoreTests.m */; };
51-
4FSSSDKMGR001234567890AB /* SmartStoreSDKManagerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4FSSSDKMGR112345678901AB /* SmartStoreSDKManagerTests.m */; };
5251
4FF4DC671CF51D9300385C2C /* SFQuerySpecTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4FF4DC661CF51D9300385C2C /* SFQuerySpecTests.m */; };
5352
4FFEE6351BFE98E100B7AA8A /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = CEAAAE61195911E600CBBFE9 /* InfoPlist.strings */; };
53+
4FSSSDKMGR001234567890AB /* SmartStoreSDKManagerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4FSSSDKMGR112345678901AB /* SmartStoreSDKManagerTests.m */; };
5454
696E912D2AD0977600205884 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 696E91232AD0975B00205884 /* PrivacyInfo.xcprivacy */; };
5555
829DA2AA1C1266F70040F5F1 /* SmartStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 829DA2A91C1266F70040F5F1 /* SmartStore.h */; settings = {ATTRIBUTES = (Public, ); }; };
5656
B716A3D7218F6AD6009D407F /* SalesforceAnalytics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B716A3B2218F6AAC009D407F /* SalesforceAnalytics.framework */; };
@@ -242,7 +242,6 @@
242242
4F96015C1BFD33B30022F021 /* SFSmartStoreTestCase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SFSmartStoreTestCase.m; path = SmartStoreTests/SFSmartStoreTestCase.m; sourceTree = SOURCE_ROOT; };
243243
4F96015D1BFD33B30022F021 /* SFSmartStoreTests.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SFSmartStoreTests.h; path = SmartStoreTests/SFSmartStoreTests.h; sourceTree = SOURCE_ROOT; };
244244
4F96015E1BFD33B30022F021 /* SFSmartStoreTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SFSmartStoreTests.m; path = SmartStoreTests/SFSmartStoreTests.m; sourceTree = SOURCE_ROOT; };
245-
4FSSSDKMGR112345678901AB /* SmartStoreSDKManagerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = SmartStoreSDKManagerTests.m; path = SmartStoreTests/SmartStoreSDKManagerTests.m; sourceTree = SOURCE_ROOT; };
246245
4F96FBC21BFD30030022F021 /* SFAlterSoupLongOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SFAlterSoupLongOperation.h; path = SmartStore/Classes/SFAlterSoupLongOperation.h; sourceTree = SOURCE_ROOT; };
247246
4F96FBC31BFD30030022F021 /* SFAlterSoupLongOperation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SFAlterSoupLongOperation.m; path = SmartStore/Classes/SFAlterSoupLongOperation.m; sourceTree = SOURCE_ROOT; };
248247
4F96FBC41BFD30030022F021 /* SFQuerySpec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SFQuerySpec.h; path = SmartStore/Classes/SFQuerySpec.h; sourceTree = SOURCE_ROOT; };
@@ -272,6 +271,7 @@
272271
4FAB7D801F8D8C3C00226249 /* SFSDKStoreConfigTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SFSDKStoreConfigTests.m; sourceTree = "<group>"; };
273272
4FF4DC661CF51D9300385C2C /* SFQuerySpecTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SFQuerySpecTests.m; sourceTree = "<group>"; };
274273
4FFEE6341BFE98B600B7AA8A /* SmartStoreTests-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "SmartStoreTests-Info.plist"; path = "SmartStoreTests/SmartStoreTests-Info.plist"; sourceTree = SOURCE_ROOT; };
274+
4FSSSDKMGR112345678901AB /* SmartStoreSDKManagerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = SmartStoreSDKManagerTests.m; path = SmartStoreTests/SmartStoreSDKManagerTests.m; sourceTree = SOURCE_ROOT; };
275275
696E91232AD0975B00205884 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
276276
829DA2A91C1266F70040F5F1 /* SmartStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SmartStore.h; sourceTree = "<group>"; };
277277
82D0AB331C497FD90081F833 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -1071,7 +1071,6 @@
10711071
SUPPORTS_MACCATALYST = YES;
10721072
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
10731073
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1074-
SWIFT_VERSION = 5.0;
10751074
TARGETED_DEVICE_FAMILY = "1,2,7";
10761075
VERSIONING_SYSTEM = "apple-generic";
10771076
VERSION_INFO_PREFIX = "";
@@ -1113,7 +1112,6 @@
11131112
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator";
11141113
SUPPORTS_MACCATALYST = YES;
11151114
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
1116-
SWIFT_VERSION = 5.0;
11171115
TARGETED_DEVICE_FAMILY = "1,2,7";
11181116
VERSIONING_SYSTEM = "apple-generic";
11191117
VERSION_INFO_PREFIX = "";
@@ -1171,6 +1169,7 @@
11711169
IPHONEOS_DEPLOYMENT_TARGET = 18.0;
11721170
ONLY_ACTIVE_ARCH = YES;
11731171
SDKROOT = iphoneos;
1172+
SWIFT_VERSION = 5.0;
11741173
XROS_DEPLOYMENT_TARGET = 2.0;
11751174
};
11761175
name = Debug;
@@ -1219,6 +1218,7 @@
12191218
IPHONEOS_DEPLOYMENT_TARGET = 18.0;
12201219
SDKROOT = iphoneos;
12211220
SWIFT_COMPILATION_MODE = wholemodule;
1221+
SWIFT_VERSION = 5.0;
12221222
VALIDATE_PRODUCT = YES;
12231223
XROS_DEPLOYMENT_TARGET = 2.0;
12241224
};
@@ -1251,7 +1251,6 @@
12511251
PRODUCT_BUNDLE_IDENTIFIER = "com.salesforce.mobilesdk.${PRODUCT_NAME:rfc1034identifier}";
12521252
PRODUCT_NAME = "$(TARGET_NAME)";
12531253
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1254-
SWIFT_VERSION = 5.0;
12551254
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SmartStoreTestApp.app/SmartStoreTestApp";
12561255
WRAPPER_EXTENSION = xctest;
12571256
};
@@ -1280,7 +1279,6 @@
12801279
PRODUCT_BUNDLE_IDENTIFIER = "com.salesforce.mobilesdk.${PRODUCT_NAME:rfc1034identifier}";
12811280
PRODUCT_NAME = "$(TARGET_NAME)";
12821281
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1283-
SWIFT_VERSION = 5.0;
12841282
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SmartStoreTestApp.app/SmartStoreTestApp";
12851283
WRAPPER_EXTENSION = xctest;
12861284
};

‎native/SampleApps/AuthFlowTester/AuthFlowTester.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,6 @@
367367
SWIFT_APPROACHABLE_CONCURRENCY = YES;
368368
SWIFT_EMIT_LOC_STRINGS = NO;
369369
SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES;
370-
SWIFT_VERSION = 5.0;
371370
TARGETED_DEVICE_FAMILY = "1,2";
372371
TEST_TARGET_NAME = AuthFlowTester;
373372
};
@@ -387,7 +386,6 @@
387386
SWIFT_APPROACHABLE_CONCURRENCY = YES;
388387
SWIFT_EMIT_LOC_STRINGS = NO;
389388
SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES;
390-
SWIFT_VERSION = 5.0;
391389
TARGETED_DEVICE_FAMILY = "1,2";
392390
TEST_TARGET_NAME = AuthFlowTester;
393391
};
@@ -454,6 +452,7 @@
454452
STRING_CATALOG_GENERATE_SYMBOLS = YES;
455453
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
456454
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
455+
SWIFT_VERSION = 5.0;
457456
};
458457
name = Debug;
459458
};
@@ -510,6 +509,7 @@
510509
SDKROOT = iphoneos;
511510
STRING_CATALOG_GENERATE_SYMBOLS = YES;
512511
SWIFT_COMPILATION_MODE = wholemodule;
512+
SWIFT_VERSION = 5.0;
513513
VALIDATE_PRODUCT = YES;
514514
};
515515
name = Release;
@@ -539,7 +539,6 @@
539539
PRODUCT_BUNDLE_IDENTIFIER = com.salesforce.mobilesdk.AuthFlowTester;
540540
PRODUCT_NAME = "$(TARGET_NAME)";
541541
SWIFT_EMIT_LOC_STRINGS = YES;
542-
SWIFT_VERSION = 5.0;
543542
TARGETED_DEVICE_FAMILY = "1,2";
544543
};
545544
name = Debug;
@@ -569,7 +568,6 @@
569568
PRODUCT_BUNDLE_IDENTIFIER = com.salesforce.mobilesdk.AuthFlowTester;
570569
PRODUCT_NAME = "$(TARGET_NAME)";
571570
SWIFT_EMIT_LOC_STRINGS = YES;
572-
SWIFT_VERSION = 5.0;
573571
TARGETED_DEVICE_FAMILY = "1,2";
574572
};
575573
name = Release;

‎native/SampleApps/MobileSyncExplorer/MobileSyncExplorer.xcodeproj/project.pbxproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
696A8B6A2AD0F7B300A85A1D /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 696A8B692AD0F7B300A85A1D /* PrivacyInfo.xcprivacy */; };
1818
820C8B0E19E6054E00E9BE5C /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 820C8B0D19E6054E00E9BE5C /* AppDelegate.m */; };
1919
820C8B1119E6059400E9BE5C /* InitialViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 820C8B1019E6059400E9BE5C /* InitialViewController.m */; };
20-
SD00000119E6054E00D37B27 /* SceneDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = SD00000019E6054E00D37B27 /* SceneDelegate.m */; };
2120
820C8B1F19E6081C00E9BE5C /* ImageIO.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 820C8B1E19E6081C00E9BE5C /* ImageIO.framework */; };
2221
820C8B2319E6088400E9BE5C /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 820C8B2219E6088400E9BE5C /* MessageUI.framework */; };
2322
820C8B2719E6091100E9BE5C /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 820C8B2619E6091100E9BE5C /* SystemConfiguration.framework */; };
@@ -61,6 +60,7 @@
6160
BCAE02051D7F7A9A00944153 /* SalesforceAnalytics.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = CE2B8D4C1CE932BD00C6FC6A /* SalesforceAnalytics.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
6261
CE2B8D671CE932D600C6FC6A /* SalesforceAnalytics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE2B8D4C1CE932BD00C6FC6A /* SalesforceAnalytics.framework */; };
6362
CE6AB39B1C10C4F50012125E /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = CE6AB39A1C10C4F50012125E /* libz.tbd */; };
63+
SD00000119E6054E00D37B27 /* SceneDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = SD00000019E6054E00D37B27 /* SceneDelegate.m */; };
6464
/* End PBXBuildFile section */
6565

6666
/* Begin PBXContainerItemProxy section */
@@ -273,8 +273,6 @@
273273
696A8B692AD0F7B300A85A1D /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
274274
820C8B0C19E6054E00E9BE5C /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
275275
820C8B0D19E6054E00E9BE5C /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
276-
SD00000219E6054E00D37B27 /* SceneDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SceneDelegate.h; sourceTree = "<group>"; };
277-
SD00000019E6054E00D37B27 /* SceneDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SceneDelegate.m; sourceTree = "<group>"; };
278276
820C8B0F19E6059400E9BE5C /* InitialViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InitialViewController.h; sourceTree = "<group>"; };
279277
820C8B1019E6059400E9BE5C /* InitialViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InitialViewController.m; sourceTree = "<group>"; };
280278
820C8B1E19E6081C00E9BE5C /* ImageIO.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ImageIO.framework; path = System/Library/Frameworks/ImageIO.framework; sourceTree = SDKROOT; };
@@ -322,6 +320,8 @@
322320
B7E0CF321D91CECE0050A1F4 /* NotificationCenter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NotificationCenter.framework; path = System/Library/Frameworks/NotificationCenter.framework; sourceTree = SDKROOT; };
323321
CE2B8D341CE932BD00C6FC6A /* SalesforceAnalytics.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SalesforceAnalytics.xcodeproj; path = ../../../libs/SalesforceAnalytics/SalesforceAnalytics.xcodeproj; sourceTree = "<group>"; };
324322
CE6AB39A1C10C4F50012125E /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
323+
SD00000019E6054E00D37B27 /* SceneDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SceneDelegate.m; sourceTree = "<group>"; };
324+
SD00000219E6054E00D37B27 /* SceneDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SceneDelegate.h; sourceTree = "<group>"; };
325325
/* End PBXFileReference section */
326326

327327
/* Begin PBXFrameworksBuildPhase section */
@@ -958,6 +958,7 @@
958958
ONLY_ACTIVE_ARCH = YES;
959959
SDKROOT = iphoneos;
960960
SWIFT_OBJC_BRIDGING_HEADER = "../../../shared/test/XCUITest-Bridging-Header.h";
961+
SWIFT_VERSION = 5.0;
961962
TARGETED_DEVICE_FAMILY = "1,2";
962963
};
963964
name = Debug;
@@ -1016,6 +1017,7 @@
10161017
SWIFT_COMPILATION_MODE = wholemodule;
10171018
SWIFT_OBJC_BRIDGING_HEADER = "../../../shared/test/XCUITest-Bridging-Header.h";
10181019
SWIFT_OPTIMIZATION_LEVEL = "-O";
1020+
SWIFT_VERSION = 5.0;
10191021
TARGETED_DEVICE_FAMILY = "1,2";
10201022
VALIDATE_PRODUCT = YES;
10211023
};
@@ -1039,7 +1041,6 @@
10391041
PRODUCT_BUNDLE_IDENTIFIER = com.salesforce.mobilesdk.MobileSyncExplorer;
10401042
PRODUCT_NAME = "$(TARGET_NAME)";
10411043
SUPPORTS_MACCATALYST = NO;
1042-
SWIFT_VERSION = 4.0;
10431044
TARGETED_DEVICE_FAMILY = "1,2";
10441045
WRAPPER_EXTENSION = app;
10451046
};
@@ -1063,7 +1064,6 @@
10631064
PRODUCT_BUNDLE_IDENTIFIER = com.salesforce.mobilesdk.MobileSyncExplorer;
10641065
PRODUCT_NAME = "$(TARGET_NAME)";
10651066
SUPPORTS_MACCATALYST = NO;
1066-
SWIFT_VERSION = 4.0;
10671067
TARGETED_DEVICE_FAMILY = "1,2";
10681068
WRAPPER_EXTENSION = app;
10691069
};

‎native/SampleApps/RestAPIExplorer/RestAPIExplorer.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,7 @@
666666
SDKROOT = iphoneos;
667667
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
668668
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
669-
SWIFT_VERSION = 4.0;
669+
SWIFT_VERSION = 5.0;
670670
};
671671
name = Debug;
672672
};
@@ -721,7 +721,7 @@
721721
SDKROOT = iphoneos;
722722
SWIFT_COMPILATION_MODE = wholemodule;
723723
SWIFT_OPTIMIZATION_LEVEL = "-O";
724-
SWIFT_VERSION = 4.0;
724+
SWIFT_VERSION = 5.0;
725725
VALIDATE_PRODUCT = YES;
726726
};
727727
name = Release;
@@ -742,7 +742,6 @@
742742
PRODUCT_BUNDLE_IDENTIFIER = com.salesforce.mobilesdk.RestAPIExplorer;
743743
PRODUCT_NAME = "$(TARGET_NAME)";
744744
SUPPORTS_MACCATALYST = YES;
745-
SWIFT_VERSION = 5.0;
746745
TARGETED_DEVICE_FAMILY = "1,2";
747746
};
748747
name = Debug;
@@ -763,7 +762,6 @@
763762
PRODUCT_BUNDLE_IDENTIFIER = com.salesforce.mobilesdk.RestAPIExplorer;
764763
PRODUCT_NAME = "$(TARGET_NAME)";
765764
SUPPORTS_MACCATALYST = YES;
766-
SWIFT_VERSION = 5.0;
767765
TARGETED_DEVICE_FAMILY = "1,2";
768766
};
769767
name = Release;

0 commit comments

Comments
 (0)