Skip to content

Commit 6592cad

Browse files
NidhiDixit09NidhiDixit09
authored
Removed Swift version of ConfigurationController class (#1569)
* Removed swift version of Configuration Controller. *Unit tests - Updated unit test to use objc version of Configuration Controller. Fixed ODM test And deleted BNCAppleReceiptTests.m * Removed Private path prefix from header include.
1 parent 0762015 commit 6592cad

12 files changed

Lines changed: 52 additions & 177 deletions

File tree

‎Branch-TestBed/Branch-TestBed.xcodeproj/project.pbxproj‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -243,9 +243,10 @@
243243
E7AC747E2DB0714B002D8C40 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = E7AC747D2DB07145002D8C40 /* libc++.tbd */; };
244244
E7AE4A092DFB2C4400696805 /* BranchConfigurationControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E7AE4A082DFB2C4400696805 /* BranchConfigurationControllerTests.m */; };
245245
E7CA74B22E1B4890002EFB40 /* BranchConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = E7CA74B12E1B4890002EFB40 /* BranchConstants.h */; };
246-
E7CA74B42E1B4944002EFB40 /* ConfigurationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E7CA74B32E1B4944002EFB40 /* ConfigurationController.swift */; };
247246
E7E28ECA2DD2424C00F75D0D /* BNCInAppBrowser.m in Sources */ = {isa = PBXBuildFile; fileRef = E7E28EC82DD2424C00F75D0D /* BNCInAppBrowser.m */; };
248247
F1CF14111F4CC79F00BB2694 /* CoreSpotlight.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 67F270881BA9FCFF002546A7 /* CoreSpotlight.framework */; settings = {ATTRIBUTES = (Required, ); }; };
248+
AA00000003000000000000B1 /* BranchConfigurationController.h in Headers */ = {isa = PBXBuildFile; fileRef = AA00000003000000000000A1 /* BranchConfigurationController.h */; };
249+
AA00000004000000000000B1 /* BranchConfigurationController.m in Sources */ = {isa = PBXBuildFile; fileRef = AA00000004000000000000A1 /* BranchConfigurationController.m */; };
249250
/* End PBXBuildFile section */
250251

251252
/* Begin PBXContainerItemProxy section */
@@ -381,7 +382,7 @@
381382
5F644B3B2B7AA810000DCD78 /* BNCNetworkInterface.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BNCNetworkInterface.m; sourceTree = "<group>"; };
382383
5F644B3C2B7AA810000DCD78 /* BNCPreferenceHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BNCPreferenceHelper.m; sourceTree = "<group>"; };
383384
5F644B3D2B7AA810000DCD78 /* BNCConfig.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BNCConfig.m; sourceTree = "<group>"; };
384-
5F644B3E2B7AA810000DCD78 /* BranchConstants.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BranchConstants.m; path = ../BranchSDK_ObjC/BranchConstants.m; sourceTree = "<group>"; };
385+
5F644B3E2B7AA810000DCD78 /* BranchConstants.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BranchConstants.m; sourceTree = "<group>"; };
385386
5F644B3F2B7AA810000DCD78 /* BranchContentDiscoveryManifest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BranchContentDiscoveryManifest.m; sourceTree = "<group>"; };
386387
5F644B402B7AA810000DCD78 /* BranchSpotlightUrlRequest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BranchSpotlightUrlRequest.m; sourceTree = "<group>"; };
387388
5F644B422B7AA810000DCD78 /* BranchContentDiscoverer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BranchContentDiscoverer.m; sourceTree = "<group>"; };
@@ -572,9 +573,10 @@
572573
E7AC74782DB06D47002D8C40 /* NSError+Branch.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSError+Branch.h"; sourceTree = "<group>"; };
573574
E7AC747D2DB07145002D8C40 /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "Platforms/MacOSX.platform/Developer/SDKs/MacOSX15.2.sdk/usr/lib/libc++.tbd"; sourceTree = DEVELOPER_DIR; };
574575
E7AE4A082DFB2C4400696805 /* BranchConfigurationControllerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BranchConfigurationControllerTests.m; sourceTree = "<group>"; };
575-
E7CA74B12E1B4890002EFB40 /* BranchConstants.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = BranchConstants.h; path = ../Sources/BranchSDK_ObjC/Public/BranchConstants.h; sourceTree = SOURCE_ROOT; };
576-
E7CA74B32E1B4944002EFB40 /* ConfigurationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = ConfigurationController.swift; path = ../Sources/BranchSDK_Swift/ConfigurationController.swift; sourceTree = SOURCE_ROOT; };
576+
E7CA74B12E1B4890002EFB40 /* BranchConstants.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BranchConstants.h; sourceTree = "<group>"; };
577577
E7E28EC82DD2424C00F75D0D /* BNCInAppBrowser.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BNCInAppBrowser.m; sourceTree = "<group>"; };
578+
AA00000003000000000000A1 /* BranchConfigurationController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BranchConfigurationController.h; sourceTree = "<group>"; };
579+
AA00000004000000000000A1 /* BranchConfigurationController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BranchConfigurationController.m; sourceTree = "<group>"; };
578580
F1D4F9AC1F323F01002D13FF /* Branch-TestBed-UITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Branch-TestBed-UITests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
579581
/* End PBXFileReference section */
580582

@@ -724,7 +726,6 @@
724726
5F644B252B7AA810000DCD78 /* BranchSDK */ = {
725727
isa = PBXGroup;
726728
children = (
727-
E7CA74B32E1B4944002EFB40 /* ConfigurationController.swift */,
728729
E563942F2CC7AC9500E18E65 /* BranchFileLogger.m */,
729730
5F644BB02B7AA811000DCD78 /* BNCAppGroupsData.m */,
730731
5F644B2B2B7AA810000DCD78 /* BNCApplication.m */,
@@ -797,6 +798,7 @@
797798
5F644B2D2B7AA810000DCD78 /* NSMutableDictionary+Branch.m */,
798799
5F644B362B7AA810000DCD78 /* NSString+Branch.m */,
799800
5F644BAF2B7AA811000DCD78 /* UIViewController+Branch.m */,
801+
AA00000004000000000000A1 /* BranchConfigurationController.m */,
800802
5F644B6E2B7AA810000DCD78 /* Private */,
801803
5F644B522B7AA810000DCD78 /* Public */,
802804
);
@@ -890,6 +892,7 @@
890892
E51F64292CF46899000858D2 /* BranchFileLogger.h */,
891893
5F644B752B7AA810000DCD78 /* UIViewController+Branch.h */,
892894
E7AC74782DB06D47002D8C40 /* NSError+Branch.h */,
895+
AA00000003000000000000A1 /* BranchConfigurationController.h */,
893896
);
894897
path = Private;
895898
sourceTree = "<group>";
@@ -1092,6 +1095,7 @@
10921095
5F644C0F2B7AA811000DCD78 /* BranchOpenRequest.h in Headers */,
10931096
5F644C2C2B7AA811000DCD78 /* BNCRequestFactory.h in Headers */,
10941097
5F644C142B7AA811000DCD78 /* BNCDeviceSystem.h in Headers */,
1098+
AA00000003000000000000B1 /* BranchConfigurationController.h in Headers */,
10951099
);
10961100
runOnlyForDeploymentPostprocessing = 0;
10971101
};
@@ -1366,7 +1370,6 @@
13661370
isa = PBXSourcesBuildPhase;
13671371
buildActionMask = 2147483647;
13681372
files = (
1369-
E7CA74B42E1B4944002EFB40 /* ConfigurationController.swift in Sources */,
13701373
5F644BB92B7AA811000DCD78 /* NSError+Branch.m in Sources */,
13711374
5F644C482B7AA811000DCD78 /* BNCCallbackMap.m in Sources */,
13721375
5F644BBE2B7AA811000DCD78 /* BNCApplication.m in Sources */,
@@ -1438,6 +1441,7 @@
14381441
5F644C3B2B7AA811000DCD78 /* BNCInitSessionResponse.m in Sources */,
14391442
5F644BCF2B7AA811000DCD78 /* BNCPreferenceHelper.m in Sources */,
14401443
5F644C372B7AA811000DCD78 /* BranchContentPathProperties.m in Sources */,
1444+
AA00000004000000000000B1 /* BranchConfigurationController.m in Sources */,
14411445
);
14421446
runOnlyForDeploymentPostprocessing = 0;
14431447
};

‎BranchSDK.podspec‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,10 @@ Use the Branch SDK (branch.io) to create and power the links that point back to
1818
s.ios.deployment_target = '12.0'
1919
s.tvos.deployment_target = '12.0'
2020

21-
s.swift_versions = ['5.0', '5.1', '5.2', '5.3', '5.4', '5.5', '5.6', '5.7', '5.8', '5.9', '6.0']
22-
2321
s.resource_bundles = { 'BranchSDK' => 'Sources/Resources/*.xcprivacy' }
24-
s.ios.source_files = "Sources/BranchSDK/**/*.{h,m}", "Sources/BranchSDK_Swift/**/*.swift", "Sources/BranchSDK_ObjC/**/*.{h,m}"
22+
s.ios.source_files = "Sources/BranchSDK/**/*.{h,m}"
2523

26-
s.tvos.source_files = "Sources/BranchSDK/**/*.{h,m}", "Sources/BranchSDK_Swift/**/*.swift", "Sources/BranchSDK_ObjC/**/*.{h,m}"
24+
s.tvos.source_files = "Sources/BranchSDK/**/*.{h,m}"
2725
s.tvos.exclude_files = "Sources/BranchSDK/**/BNCContentDiscoveryManager.{h,m}",
2826
"Sources/BranchSDK/**/BNCUserAgentCollector.{h,m}",
2927
"Sources/BranchSDK/**/BNCSpotlightService.{h,m}",

0 commit comments

Comments
 (0)
⚡