Skip to content

Commit d4621a6

Browse files
authored
Use preserve_paths instead of CocoaPods private (#5758)
1 parent 9d054ec commit d4621a6

File tree

179 files changed

+271
-341
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

179 files changed

+271
-341
lines changed

Crashlytics/Crashlytics/DataCollection/FIRCLSDataCollectionArbiter.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#import "FBLPromises.h"
2121
#endif
2222

23-
#import <FirebaseCore/FIRApp.h>
23+
#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
2424

2525
#import "FIRCLSUserDefaults.h"
2626

Crashlytics/Crashlytics/FIRCrashlytics.m

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,8 @@
4242
#import "FIRCLSReportManager.h"
4343

4444
#import <FirebaseAnalyticsInterop/FIRAnalyticsInterop.h>
45-
#import <FirebaseCore/FIRAppInternal.h>
46-
#import <FirebaseCore/FIRComponent.h>
47-
#import <FirebaseCore/FIRComponentContainer.h>
48-
#import <FirebaseCore/FIRDependency.h>
49-
#import <FirebaseCore/FIRLibrary.h>
50-
#import <FirebaseCore/FIROptionsInternal.h>
5145
#import <FirebaseInstallations/FirebaseInstallations.h>
46+
#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
5247

5348
#import <GoogleDataTransport/GDTCORTargets.h>
5449
#import <GoogleDataTransport/GDTCORTransport.h>

Crashlytics/Crashlytics/Helpers/FIRCLSLogger.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
#import "FIRCLSLogger.h"
1616

17-
#import <FirebaseCore/FIRLogger.h>
17+
#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
1818

1919
FIRLoggerService kFIRLoggerCrashlytics = @"[Firebase/Crashlytics]";
2020

Crashlytics/UnitTests/FIRCLSReportManagerTests.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#import <Foundation/Foundation.h>
1616
#import <XCTest/XCTest.h>
1717

18-
#import <FirebaseCore/FIRLogger.h>
18+
#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
1919

2020
#if __has_include(<FBLPromises/FBLPromises.h>)
2121
#import <FBLPromises/FBLPromises.h>

Crashlytics/UnitTests/Mocks/FIRAppFake.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#import <FirebaseCore/FIRApp.h>
15+
#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
1616

1717
@interface FIRAppFake : NSObject
1818

Example/Database/Tests/Helpers/FTestBase.m

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
#import <FirebaseCore/FIRApp.h>
18-
#import <FirebaseCore/FIROptions.h>
17+
#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
1918

2019
#import "FIRDatabaseQuery_Private.h"
2120
#import "FIRTestAuthTokenProvider.h"

Example/Database/Tests/Helpers/FTestHelpers.m

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,7 @@
1717
#import "FTestHelpers.h"
1818

1919
#import <FirebaseAuthInterop/FIRAuthInterop.h>
20-
#import <FirebaseCore/FIRAppInternal.h>
21-
#import <FirebaseCore/FIRComponent.h>
22-
#import <FirebaseCore/FIRComponentContainer.h>
23-
#import <FirebaseCore/FIROptions.h>
20+
#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
2421

2522
#import "FConstants.h"
2623
#import "FIRAuthInteropFake.h"

Example/Database/Tests/Integration/FConnectionTest.m

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616

1717
#import <Foundation/Foundation.h>
1818

19-
#import <FirebaseCore/FIRApp.h>
20-
#import <FirebaseCore/FIROptions.h>
19+
#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
2120

2221
#import "FConnection.h"
2322
#import "FIRDatabaseQuery_Private.h"

Example/Database/Tests/Integration/FData.m

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
*/
1616

1717
#import "FData.h"
18-
#import <FirebaseCore/FIRApp.h>
19-
#import <FirebaseCore/FIROptions.h>
2018
#import <limits.h>
2119
#import "FEventTester.h"
2220
#import "FIRDatabaseConfig_Private.h"
@@ -25,6 +23,7 @@
2523
#import "FRepo_Private.h"
2624
#import "FTestHelpers.h"
2725
#import "FTupleEventTypeString.h"
26+
#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
2827

2928
@implementation FData
3029

Example/Database/Tests/Integration/FIRAuthTests.m

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@
1717
#import <XCTest/XCTest.h>
1818

1919
#import <FirebaseAuthInterop/FIRAuthInterop.h>
20-
#import <FirebaseCore/FIRAppInternal.h>
21-
#import <FirebaseCore/FIRComponent.h>
22-
#import <FirebaseCore/FIRComponentContainer.h>
20+
#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
2321

2422
#import "FIRAuthInteropFake.h"
2523
#import "FIRDatabaseConfig_Private.h"

0 commit comments

Comments
 (0)