From 9975424cab2dd73fc4e982e174f662273d1bd52c Mon Sep 17 00:00:00 2001 From: Joe Susnick Date: Mon, 26 Oct 2020 18:07:01 -0700 Subject: [PATCH] Back out "Fix CoreKit_Basics imports" Summary: Original commit changeset: 8208e9ef8b35 Reviewed By: Mxiim Differential Revision: D24551147 fbshipit-source-id: c88a7d3d3f59adf736d0a297bc233efbb2424832 --- .../FBSDKSKAdNetworkConversionConfigurationTests.m | 6 +----- .../FBSDKCoreKitTests/Internal/FBSDKJSONValueTests.m | 6 +----- .../FBSDKCoreKitTests/Internal/Helpers/UserDefaultsSpy.m | 6 +----- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/FBSDKCoreKit/FBSDKCoreKitTests/Internal/AppEvents/SKAdNetwork/FBSDKSKAdNetworkConversionConfigurationTests.m b/FBSDKCoreKit/FBSDKCoreKitTests/Internal/AppEvents/SKAdNetwork/FBSDKSKAdNetworkConversionConfigurationTests.m index 0dfbabcc8f..4afd96586f 100644 --- a/FBSDKCoreKit/FBSDKCoreKitTests/Internal/AppEvents/SKAdNetwork/FBSDKSKAdNetworkConversionConfigurationTests.m +++ b/FBSDKCoreKit/FBSDKCoreKitTests/Internal/AppEvents/SKAdNetwork/FBSDKSKAdNetworkConversionConfigurationTests.m @@ -24,11 +24,7 @@ #import "FBSDKSKAdNetworkConversionConfiguration.h" #import "FBSDKSKAdNetworkRule.h" #import "FBSDKTestCase.h" - #if defined FBSDKCOCOAPODS || FBSDK_SWIFT_PACKAGE - #import "FBSDKCoreKit_Basics.h" - #else - #import - #endif + #import "FBSDKTypeUtility.h" @interface FBSDKSKAdNetworkConversionConfiguration () diff --git a/FBSDKCoreKit/FBSDKCoreKitTests/Internal/FBSDKJSONValueTests.m b/FBSDKCoreKit/FBSDKCoreKitTests/Internal/FBSDKJSONValueTests.m index 6be1d3a5f6..d12613e655 100644 --- a/FBSDKCoreKit/FBSDKCoreKitTests/Internal/FBSDKJSONValueTests.m +++ b/FBSDKCoreKit/FBSDKCoreKitTests/Internal/FBSDKJSONValueTests.m @@ -19,11 +19,7 @@ #import #import -#if defined FBSDKCOCOAPODS || FBSDK_SWIFT_PACKAGE - #import "FBSDKCoreKit_Basics.h" -#else - #import -#endif +#import "FBSDKJSONValue.h" @interface FBSDKJSONValueTests : XCTestCase @end diff --git a/FBSDKCoreKit/FBSDKCoreKitTests/Internal/Helpers/UserDefaultsSpy.m b/FBSDKCoreKit/FBSDKCoreKitTests/Internal/Helpers/UserDefaultsSpy.m index 1d8f22c1fd..dafcfd2098 100644 --- a/FBSDKCoreKit/FBSDKCoreKitTests/Internal/Helpers/UserDefaultsSpy.m +++ b/FBSDKCoreKit/FBSDKCoreKitTests/Internal/Helpers/UserDefaultsSpy.m @@ -18,11 +18,7 @@ #import "UserDefaultsSpy.h" -#if defined FBSDKCOCOAPODS || FBSDK_SWIFT_PACKAGE - #import "FBSDKCoreKit_Basics.h" -#else - #import -#endif +#import "FBSDKTypeUtility.h" @implementation UserDefaultsSpy