From c17596ad0654823ddd0cc816e3288222da111bc5 Mon Sep 17 00:00:00 2001 From: Jax DesMarais-Leder Date: Mon, 6 Nov 2023 08:23:54 -0600 Subject: [PATCH] remove unneeded bridging headers; add imports --- Braintree.xcodeproj/project.pbxproj | 20 ++++++------------- .../BTApplePay_Tests.swift | 1 + .../BraintreeApplePayTests-Bridging-Header.h | 1 - .../BTConfiguration+PayPal_Tests.swift | 1 + .../BTPayPalAccountNonce_Tests.swift | 1 + .../BTPayPalRequest_Tests.swift | 1 + .../BTPayPalVaultRequest_Tests.swift | 1 + .../BraintreePayPalTests-Bridging-Header.h | 1 - .../BTConfiguration+ThreeDSecure_Tests.swift | 2 +- .../BTThreeDSecureAuthenticateJWT_Tests.swift | 1 + .../BTThreeDSecureLookup_Tests.swift | 1 + ...aintreeThreeDSecureTests-Bridging-Header.h | 3 --- 12 files changed, 14 insertions(+), 20 deletions(-) delete mode 100644 UnitTests/BraintreeApplePayTests/BraintreeApplePayTests-Bridging-Header.h delete mode 100644 UnitTests/BraintreePayPalTests/BraintreePayPalTests-Bridging-Header.h delete mode 100644 UnitTests/BraintreeThreeDSecureTests/BraintreeThreeDSecureTests-Bridging-Header.h diff --git a/Braintree.xcodeproj/project.pbxproj b/Braintree.xcodeproj/project.pbxproj index 0f8c32d070..25b889de03 100644 --- a/Braintree.xcodeproj/project.pbxproj +++ b/Braintree.xcodeproj/project.pbxproj @@ -761,7 +761,6 @@ A948D6CA24FAB79B00F4F178 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; A948D6DC24FAC6C000F4F178 /* BraintreeApplePayTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = BraintreeApplePayTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; A948D6E024FAC6C000F4F178 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - A948D6EB24FAC7F100F4F178 /* BraintreeApplePayTests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "BraintreeApplePayTests-Bridging-Header.h"; sourceTree = ""; }; A948D6F024FAC8F900F4F178 /* BraintreeVenmoTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = BraintreeVenmoTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; A948D6F424FAC8F900F4F178 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; A948D70224FACF4E00F4F178 /* FakeHTTP.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FakeHTTP.swift; sourceTree = ""; }; @@ -770,17 +769,14 @@ A9589DD924FEA45C00AF4FF7 /* BTConfiguration+Venmo_Tests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "BTConfiguration+Venmo_Tests.swift"; sourceTree = ""; }; A95C410824FAEF2100045045 /* BraintreeCardTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = BraintreeCardTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; A95C410C24FAEF2100045045 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - A977A06924FECBAF006049AB /* BraintreeThreeDSecureTests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "BraintreeThreeDSecureTests-Bridging-Header.h"; sourceTree = ""; }; A977A06A24FECFC3006049AB /* NonceValidator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NonceValidator.swift; sourceTree = ""; }; A9A76CA624F9E92E0044EAEE /* TestClientTokenFactory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestClientTokenFactory.swift; sourceTree = ""; }; A9E5C19E24FD5A7C00EE691F /* BraintreeDataCollectorTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = BraintreeDataCollectorTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; A9E5C1A224FD5A7C00EE691F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; A9E5C1E024FD665D00EE691F /* BraintreePayPalTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = BraintreePayPalTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; A9E5C1E424FD665D00EE691F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - A9E5C1F724FD672A00EE691F /* BraintreePayPalTests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "BraintreePayPalTests-Bridging-Header.h"; sourceTree = ""; }; A9E5C22424FD6D0800EE691F /* BraintreeCoreTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = BraintreeCoreTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; A9E5C22824FD6D0800EE691F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - A9E5C23524FD703B00EE691F /* BraintreeCoreTests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "BraintreeCoreTests-Bridging-Header.h"; sourceTree = ""; }; A9E80AA224FEF4D800196BD3 /* MockLocalPaymentRequestDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockLocalPaymentRequestDelegate.swift; sourceTree = ""; }; BC17F9B328D23C5C004B18CC /* BTGraphQLMultiErrorNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BTGraphQLMultiErrorNode.swift; sourceTree = ""; }; BC17F9BB28D24C9E004B18CC /* BTGraphQLErrorTree.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BTGraphQLErrorTree.swift; sourceTree = ""; }; @@ -1547,7 +1543,6 @@ isa = PBXGroup; children = ( 80FF7D9625882648001C32EF /* ThreeDSecureV2Customization_Tests */, - A977A06924FECBAF006049AB /* BraintreeThreeDSecureTests-Bridging-Header.h */, 80581A8B25531D0A00006F53 /* BTConfiguration+ThreeDSecure_Tests.swift */, 3BEB03C629FD5669001133D5 /* BTThreeDSecureAnalytics_Tests.swift */, 42F75E5A24D48138007DC5E7 /* BTThreeDSecureClient_Tests.swift */, @@ -1578,7 +1573,6 @@ A948D6DD24FAC6C000F4F178 /* BraintreeApplePayTests */ = { isa = PBXGroup; children = ( - A948D6EB24FAC7F100F4F178 /* BraintreeApplePayTests-Bridging-Header.h */, A7D64ABB1B4C93B6005168EF /* BTApplePay_Tests.swift */, BEDB820329B10ADA00075AF3 /* BTApplePayAnalytics_Tests.swift */, 800FC543257FDC5100DEE132 /* BTApplePayCardNonce_Tests.swift */, @@ -1631,7 +1625,6 @@ A9E5C1E124FD665D00EE691F /* BraintreePayPalTests */ = { isa = PBXGroup; children = ( - A9E5C1F724FD672A00EE691F /* BraintreePayPalTests-Bridging-Header.h */, A95229C624FD949D006F7D25 /* BTConfiguration+PayPal_Tests.swift */, BEDEAF102AC1D049004EA970 /* BTPayPalAccountNonce_Tests.swift */, 3B7A261229C35B670087059D /* BTPayPalAnalytics_Tests.swift */, @@ -1663,7 +1656,6 @@ A7E93E571B601EE900957223 /* BTURLUtils_Tests.swift */, A7B861BE1C24B19300A2422E /* BTVersion_Tests.swift */, 8053F05629FAD4790076F988 /* Encodable+Dictionary_Tests.swift */, - A9E5C23524FD703B00EE691F /* BraintreeCoreTests-Bridging-Header.h */, A908436924FD88C3004134CA /* Helpers */, A9E5C22824FD6D0800EE691F /* Info.plist */, ); @@ -5064,7 +5056,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.braintree.BraintreeThreeDSecureTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_OBJC_BRIDGING_HEADER = "UnitTests/BraintreeThreeDSecureTests/BraintreeThreeDSecureTests-Bridging-Header.h"; + SWIFT_OBJC_BRIDGING_HEADER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -5110,7 +5102,7 @@ MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.braintree.BraintreeThreeDSecureTests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OBJC_BRIDGING_HEADER = "UnitTests/BraintreeThreeDSecureTests/BraintreeThreeDSecureTests-Bridging-Header.h"; + SWIFT_OBJC_BRIDGING_HEADER = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; @@ -5246,7 +5238,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.braintree.BraintreeApplePayTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_OBJC_BRIDGING_HEADER = "UnitTests/BraintreeApplePayTests/BraintreeApplePayTests-Bridging-Header.h"; + SWIFT_OBJC_BRIDGING_HEADER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -5289,7 +5281,7 @@ MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.braintree.BraintreeApplePayTests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OBJC_BRIDGING_HEADER = "UnitTests/BraintreeApplePayTests/BraintreeApplePayTests-Bridging-Header.h"; + SWIFT_OBJC_BRIDGING_HEADER = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; USER_HEADER_SEARCH_PATHS = "${PROJECT_DIR}/Demo/**"; @@ -5604,7 +5596,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.braintree.BraintreePayPalTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_OBJC_BRIDGING_HEADER = "UnitTests/BraintreePayPalTests/BraintreePayPalTests-Bridging-Header.h"; + SWIFT_OBJC_BRIDGING_HEADER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -5646,7 +5638,7 @@ MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.braintree.BraintreePayPalTests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OBJC_BRIDGING_HEADER = "UnitTests/BraintreePayPalTests/BraintreePayPalTests-Bridging-Header.h"; + SWIFT_OBJC_BRIDGING_HEADER = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; diff --git a/UnitTests/BraintreeApplePayTests/BTApplePay_Tests.swift b/UnitTests/BraintreeApplePayTests/BTApplePay_Tests.swift index fdcaa898a2..40c3f60fe4 100644 --- a/UnitTests/BraintreeApplePayTests/BTApplePay_Tests.swift +++ b/UnitTests/BraintreeApplePayTests/BTApplePay_Tests.swift @@ -1,5 +1,6 @@ import XCTest import PassKit +@testable import BraintreeCore @testable import BraintreeTestShared @testable import BraintreeApplePay diff --git a/UnitTests/BraintreeApplePayTests/BraintreeApplePayTests-Bridging-Header.h b/UnitTests/BraintreeApplePayTests/BraintreeApplePayTests-Bridging-Header.h deleted file mode 100644 index ffe145070a..0000000000 --- a/UnitTests/BraintreeApplePayTests/BraintreeApplePayTests-Bridging-Header.h +++ /dev/null @@ -1 +0,0 @@ -#import diff --git a/UnitTests/BraintreePayPalTests/BTConfiguration+PayPal_Tests.swift b/UnitTests/BraintreePayPalTests/BTConfiguration+PayPal_Tests.swift index bb002240d3..b23a76138f 100644 --- a/UnitTests/BraintreePayPalTests/BTConfiguration+PayPal_Tests.swift +++ b/UnitTests/BraintreePayPalTests/BTConfiguration+PayPal_Tests.swift @@ -1,5 +1,6 @@ import XCTest import BraintreeTestShared +@testable import BraintreeCore @testable import BraintreePayPal class BTConfiguration_PayPal_Tests : XCTestCase { diff --git a/UnitTests/BraintreePayPalTests/BTPayPalAccountNonce_Tests.swift b/UnitTests/BraintreePayPalTests/BTPayPalAccountNonce_Tests.swift index 3605d52abe..645e695017 100644 --- a/UnitTests/BraintreePayPalTests/BTPayPalAccountNonce_Tests.swift +++ b/UnitTests/BraintreePayPalTests/BTPayPalAccountNonce_Tests.swift @@ -1,4 +1,5 @@ import XCTest +@testable import BraintreeCore @testable import BraintreePayPal final class BTPayPalAccountNonce_Tests: XCTestCase { diff --git a/UnitTests/BraintreePayPalTests/BTPayPalRequest_Tests.swift b/UnitTests/BraintreePayPalTests/BTPayPalRequest_Tests.swift index e32ee50c39..d3136c746f 100644 --- a/UnitTests/BraintreePayPalTests/BTPayPalRequest_Tests.swift +++ b/UnitTests/BraintreePayPalTests/BTPayPalRequest_Tests.swift @@ -1,4 +1,5 @@ import XCTest +@testable import BraintreeCore @testable import BraintreePayPal class BTPayPalRequest_Tests: XCTestCase { diff --git a/UnitTests/BraintreePayPalTests/BTPayPalVaultRequest_Tests.swift b/UnitTests/BraintreePayPalTests/BTPayPalVaultRequest_Tests.swift index bf3d8cd588..7735c26a96 100644 --- a/UnitTests/BraintreePayPalTests/BTPayPalVaultRequest_Tests.swift +++ b/UnitTests/BraintreePayPalTests/BTPayPalVaultRequest_Tests.swift @@ -1,4 +1,5 @@ import XCTest +@testable import BraintreeCore @testable import BraintreePayPal class BTPayPalVaultRequest_Tests: XCTestCase { diff --git a/UnitTests/BraintreePayPalTests/BraintreePayPalTests-Bridging-Header.h b/UnitTests/BraintreePayPalTests/BraintreePayPalTests-Bridging-Header.h deleted file mode 100644 index ffe145070a..0000000000 --- a/UnitTests/BraintreePayPalTests/BraintreePayPalTests-Bridging-Header.h +++ /dev/null @@ -1 +0,0 @@ -#import diff --git a/UnitTests/BraintreeThreeDSecureTests/BTConfiguration+ThreeDSecure_Tests.swift b/UnitTests/BraintreeThreeDSecureTests/BTConfiguration+ThreeDSecure_Tests.swift index 28711c212b..56f7146fd4 100644 --- a/UnitTests/BraintreeThreeDSecureTests/BTConfiguration+ThreeDSecure_Tests.swift +++ b/UnitTests/BraintreeThreeDSecureTests/BTConfiguration+ThreeDSecure_Tests.swift @@ -1,5 +1,5 @@ -import Foundation import XCTest +@testable import BraintreeCore @testable import BraintreeThreeDSecure class BTConfiguration_ThreeDSecure_Tests: XCTestCase { diff --git a/UnitTests/BraintreeThreeDSecureTests/BTThreeDSecureAuthenticateJWT_Tests.swift b/UnitTests/BraintreeThreeDSecureTests/BTThreeDSecureAuthenticateJWT_Tests.swift index a337c5c8e7..772112d239 100644 --- a/UnitTests/BraintreeThreeDSecureTests/BTThreeDSecureAuthenticateJWT_Tests.swift +++ b/UnitTests/BraintreeThreeDSecureTests/BTThreeDSecureAuthenticateJWT_Tests.swift @@ -1,5 +1,6 @@ import UIKit import XCTest +@testable import BraintreeCore @testable import BraintreeTestShared @testable import BraintreeThreeDSecure diff --git a/UnitTests/BraintreeThreeDSecureTests/BTThreeDSecureLookup_Tests.swift b/UnitTests/BraintreeThreeDSecureTests/BTThreeDSecureLookup_Tests.swift index f454319c95..ad9a7fad52 100644 --- a/UnitTests/BraintreeThreeDSecureTests/BTThreeDSecureLookup_Tests.swift +++ b/UnitTests/BraintreeThreeDSecureTests/BTThreeDSecureLookup_Tests.swift @@ -1,4 +1,5 @@ import XCTest +@testable import BraintreeCore @testable import BraintreeThreeDSecure class BTThreeDSecureLookup_Tests: XCTestCase { diff --git a/UnitTests/BraintreeThreeDSecureTests/BraintreeThreeDSecureTests-Bridging-Header.h b/UnitTests/BraintreeThreeDSecureTests/BraintreeThreeDSecureTests-Bridging-Header.h deleted file mode 100644 index 757b56957f..0000000000 --- a/UnitTests/BraintreeThreeDSecureTests/BraintreeThreeDSecureTests-Bridging-Header.h +++ /dev/null @@ -1,3 +0,0 @@ -#import -#import -#import