Skip to content

Commit 54d2854

Browse files
authored
Remove GDT from repo (#7384)
1 parent 3e5b0cb commit 54d2854

File tree

271 files changed

+51
-21992
lines changed

Some content is hidden

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

271 files changed

+51
-21992
lines changed

.github/workflows/archiving.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
matrix:
3939
target: [ios, tvos, macos]
4040
# These need to be on a single line or else the formatting won't validate.
41-
pod: ["FirebaseABTesting", "FirebaseAuth", "FirebaseCore", "FirebaseCrashlytics", "FirebaseDatabase", "FirebaseFirestore", "FirebaseFunctions", "FirebaseMessaging", "FirebaseRemoteConfig", "FirebaseStorage", "GoogleDataTransport"]
41+
pod: ["FirebaseABTesting", "FirebaseAuth", "FirebaseCore", "FirebaseCrashlytics", "FirebaseDatabase", "FirebaseFirestore", "FirebaseFunctions", "FirebaseMessaging", "FirebaseRemoteConfig", "FirebaseStorage"]
4242
steps:
4343
- uses: actions/checkout@v2
4444
- name: Setup Bundler

.github/workflows/datatransport.yml

-79
This file was deleted.

.swiftpm/xcode/xcshareddata/xcschemes/Firebase-Package.xcscheme

+14
Original file line numberDiff line numberDiff line change
@@ -720,6 +720,20 @@
720720
ReferencedContainer = "container:">
721721
</BuildableReference>
722722
</BuildActionEntry>
723+
<BuildActionEntry
724+
buildForTesting = "YES"
725+
buildForRunning = "YES"
726+
buildForProfiling = "YES"
727+
buildForArchiving = "YES"
728+
buildForAnalyzing = "YES">
729+
<BuildableReference
730+
BuildableIdentifier = "primary"
731+
BlueprintIdentifier = "Firebase_RemoteConfigUnit"
732+
BuildableName = "Firebase_RemoteConfigUnit"
733+
BlueprintName = "Firebase_RemoteConfigUnit"
734+
ReferencedContainer = "container:">
735+
</BuildableReference>
736+
</BuildActionEntry>
723737
</BuildActionEntries>
724738
</BuildAction>
725739
<TestAction

CocoapodsIntegrationTest/TestEnvironments/Cocoapods_multiprojects_frameworks/Podfile

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ target 'CocoapodsIntegrationTest' do
2020
pod 'FirebaseMessaging', :path => '../'
2121
pod 'FirebasePerformance', :path => '../'
2222
pod 'FirebaseStorage', :path => '../'
23-
pod 'GoogleDataTransport', :path => '../'
2423
end
2524

2625
# Using the new speed-enhancing features available with CocoaPods 1.7+

CocoapodsIntegrationTest/TestEnvironments/Cocoapods_multiprojects_staticLibs/Podfile

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ target 'CocoapodsIntegrationTest' do
1818
pod 'FirebaseMessaging', :path => '../'
1919
pod 'FirebasePerformance', :path => '../'
2020
pod 'FirebaseStorage', :path => '../'
21-
pod 'GoogleDataTransport', :path => '../'
2221
end
2322

2423
# Using the new speed-enhancing features available with CocoaPods 1.7+

CoreOnly/Tests/FirebasePodTest/Podfile

-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ target 'FirebasePodTest' do
2929

3030
# Get dependent pods from the repo also
3131
pod 'FirebaseCoreDiagnostics', :path => '../../../'
32-
pod 'GoogleDataTransport', :path => '../../../'
3332

3433
pod 'FirebaseAnalytics' # Analytics is not open source
3534
end

Crashlytics/Crashlytics/Controllers/FIRCLSReportUploader.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#import "Crashlytics/Shared/FIRCLSNetworking/FIRCLSMultipartMimeStreamEncoder.h"
3535
#import "Crashlytics/Shared/FIRCLSNetworking/FIRCLSURLBuilder.h"
3636

37-
#import "GoogleDataTransport/GDTCORLibrary/Internal/GoogleDataTransportInternal.h"
37+
#import <GoogleDataTransport/GoogleDataTransport.h>
3838

3939
@interface FIRCLSReportUploader () {
4040
id<FIRAnalyticsInterop> _analytics;

Crashlytics/Crashlytics/FIRCrashlytics.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
#import "FirebaseInstallations/Source/Library/Private/FirebaseInstallationsInternal.h"
4747
#import "Interop/Analytics/Public/FIRAnalyticsInterop.h"
4848

49-
#import "GoogleDataTransport/GDTCORLibrary/Internal/GoogleDataTransportInternal.h"
49+
#import <GoogleDataTransport/GoogleDataTransport.h>
5050

5151
#if TARGET_OS_IPHONE
5252
#import <UIKit/UIKit.h>

Crashlytics/Crashlytics/Models/Record/FIRCLSReportAdapter.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
#include "Crashlytics/Protogen/nanopb/crashlytics.nanopb.h"
2020

21-
#import "GoogleDataTransport/GDTCORLibrary/Internal/GoogleDataTransportInternal.h"
21+
#import <GoogleDataTransport/GoogleDataTransport.h>
2222

2323
/// This class is responsible for reading the persisted crash reports from disk and converting them
2424
/// the information into the nanopb model to be used with GoogleDataTransport

Crashlytics/UnitTests/FIRCLSReportAdapterTests.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
#import "Crashlytics/Crashlytics/Helpers/FIRCLSFile.h"
2525

26-
#import "GoogleDataTransport/GDTCORLibrary/Internal/GoogleDataTransportInternal.h"
26+
#import <GoogleDataTransport/GoogleDataTransport.h>
2727

2828
@interface FIRCLSReportAdapterTests : XCTestCase
2929

Crashlytics/UnitTests/Mocks/FIRMockGDTCoreTransport.h

+1-1
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 "GoogleDataTransport/GDTCORLibrary/Internal/GoogleDataTransportInternal.h"
15+
#import <GoogleDataTransport/GoogleDataTransport.h>
1616

1717
@interface FIRMockGDTCORTransport : GDTCORTransport
1818

Dangerfile

-3
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ def labelsForModifiedFiles()
5252
labels.push("api: remoteconfig") if @has_remoteconfig_changes
5353
labels.push("api: segmentation") if @has_segmentation_changes
5454
labels.push("api: storage") if @has_storage_changes
55-
labels.push("GoogleDataTransport") if @has_gdt_changes
5655
labels.push("release-tooling") if @has_releasetooling_changes
5756
labels.push("public-api-change") if @has_api_changes
5857
return labels
@@ -110,8 +109,6 @@ has_license_changes = didModify(["LICENSE"])
110109
@has_storage_changes = hasChangesIn("FirebaseStorage/")
111110
@has_storage_api_changes = hasChangesIn("FirebaseStorage/Sources/Public/")
112111

113-
@has_gdt_changes = hasChangesIn(["GoogleDataTransport/"])
114-
@has_gdt_api_changes = hasChangesIn("GoogleDataTransport/GDTCORLibrary/Public")
115112
@has_releasetooling_changes = hasChangesIn("ReleaseTooling/")
116113

117114
# Convenient flag for all API changes.

Example/CoreDiagnostics/Tests/FIRCoreDiagnosticsTest.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
#import <UIKit/UIKit.h>
2020
#endif // TARGET_OS_IOS || TARGET_OS_TV
2121

22+
#import <GoogleDataTransport/GoogleDataTransport.h>
2223
#import <GoogleUtilities/GULAppEnvironmentUtil.h>
2324
#import <GoogleUtilities/GULHeartbeatDateStorage.h>
2425
#import <GoogleUtilities/GULUserDefaults.h>
2526
#import <OCMock/OCMock.h>
2627
#import <nanopb/pb_decode.h>
2728
#import <nanopb/pb_encode.h>
28-
#import "GoogleDataTransport/GDTCORLibrary/Internal/GoogleDataTransportInternal.h"
2929
#import "Interop/CoreDiagnostics/Public/FIRCoreDiagnosticsData.h"
3030
#import "Interop/CoreDiagnostics/Public/FIRCoreDiagnosticsInterop.h"
3131

Example/tvOSSample/Podfile

-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,5 @@ target 'tvOSSample' do
1010
pod 'FirebaseAuth', :path => '../../'
1111
pod 'FirebaseDatabase', :path => '../../'
1212
pod 'FirebaseStorage', :path => '../../'
13-
pod 'GoogleDataTransport', :path => '../../'
1413

1514
end

Example/watchOSSample/Podfile

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ target 'SampleWatchAppWatchKitExtension' do
1010
pod 'FirebaseMessaging', :path => '../../'
1111
pod 'FirebaseInstanceID', :path => '../../'
1212
pod 'FirebaseCoreDiagnostics', :path => '../../'
13-
pod 'GoogleDataTransport', :path => '../../'
1413
pod 'FirebaseInstallations', :path => '../../'
1514
pod 'FirebaseStorage', :path => '../../'
1615

Firebase/CoreDiagnostics/FIRCDLibrary/FIRCoreDiagnostics.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#import <objc/runtime.h>
1818
#include <sys/utsname.h>
1919

20-
#import "GoogleDataTransport/GDTCORLibrary/Internal/GoogleDataTransportInternal.h"
20+
#import <GoogleDataTransport/GoogleDataTransport.h>
2121

2222
#import <GoogleUtilities/GULAppEnvironmentUtil.h>
2323
#import <GoogleUtilities/GULHeartbeatDateStorage.h>

FirebaseAppDistribution.podspec

-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ iOS SDK for App Distribution for Firebase.
2525
base_dir + '**/*.{c,h,m,mm}',
2626
'FirebaseCore/Sources/Private/*.h',
2727
'FirebaseInstallations/Source/Library/Private/*.h',
28-
'GoogleDataTransport/GDTCORLibrary/Internal/*.h',
2928
]
3029
s.public_header_files = base_dir + 'Public/FirebaseAppDistribution/*.h'
3130

FirebaseAuth/Tests/Sample/Podfile

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ target 'AuthSample' do
1111
platform :ios, '10.0'
1212
pod 'FirebaseCore', :path => '../../../'
1313
pod 'FirebaseCoreDiagnostics', :path => '../../../'
14-
pod 'GoogleDataTransport', :path => '../../../'
1514
pod 'FirebaseAuth', :path => '../../../', :testspecs => ['unit']
1615
pod 'FirebaseInstallations', :path => '../../..'
1716
pod 'FirebaseInstanceID', :path => '../../..'

FirebaseCoreDiagnostics.podspec

-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ non-Cocoapod integration. This library also respects the Firebase global data co
5050

5151
s.source_files = [
5252
'Firebase/CoreDiagnostics/FIRCDLibrary/**/*.[cmh]',
53-
'GoogleDataTransport/GDTCORLibrary/Internal/*.h',
5453
'Interop/CoreDiagnostics/Public/*.h',
5554
]
5655
s.public_header_files = 'Firebase/CoreDiagnostics/FIRCDLibrary/Public/*.h'

FirebaseCrashlytics.podspec

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ Pod::Spec.new do |s|
2626
'Crashlytics/third_party/**/*.{c,h,m,mm}',
2727
'FirebaseCore/Sources/Private/*.h',
2828
'FirebaseInstallations/Source/Library/Private/*.h',
29-
'GoogleDataTransport/GDTCORLibrary/Internal/*.h',
3029
'Interop/Analytics/Public/*.h',
3130
]
3231

FirebaseDynamicLinks/Sources/Logging/FDLLogging.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
#if __LP64__ // 64-bit
3131
NSString *const FDLMessageCodeIntegerFormat = @"%06ld";
32-
#else // 32-bit
32+
#else // 32-bit
3333
NSString *const FDLMessageCodeIntegerFormat = @"%06d";
3434
#endif // #if __LP64__
3535

FirebaseDynamicLinks/Tests/Sample/Podfile

-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,5 @@ target 'FDLBuilderTestAppObjC' do
77

88
pod 'FirebaseCore', :path => '../../../'
99
pod 'FirebaseCoreDiagnostics', :path => '../../../'
10-
pod 'GoogleDataTransport', :path => '../../../'
1110
pod 'FirebaseDynamicLinks', :path => '../../../'
1211
end

FirebaseInAppMessaging/Tests/Integration/DefaultUITestApp/Podfile

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ use_frameworks!
66
pod 'FirebaseCore', :path => '../../../..'
77
pod 'FirebaseInstallations', :path => '../../../..'
88
pod 'FirebaseCoreDiagnostics', :path => '../../../..'
9-
pod 'GoogleDataTransport', :path => '../../../..'
109
pod 'FirebaseABTesting', :path => '../../../..'
1110

1211
target 'FiamDisplaySwiftExample' do

FirebaseInAppMessaging/Tests/Integration/FunctionalTestApp/Podfile

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ pod 'FirebaseAnalytics'
77
pod 'FirebaseCore', :path => '../../../..'
88
pod 'FirebaseInstallations', :path => '../../../..'
99
pod 'FirebaseCoreDiagnostics', :path => '../../../..'
10-
pod 'GoogleDataTransport', :path => '../../../..'
1110
pod 'FirebaseABTesting', :path => '../../../..'
1211

1312
target 'InAppMessaging_Example_iOS' do

FirebaseMessaging/Apps/AdvancedSample/Podfile

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ def shared_pods
88
pod 'FirebaseMessaging', :path => '../../../'
99
pod 'FirebaseInstanceID', :path => '../../../'
1010
pod 'FirebaseCoreDiagnostics', :path => '../../../'
11-
pod 'GoogleDataTransport', :path => '../../../'
1211
pod 'FirebaseInstallations', :path => '../../../'
1312
end
1413

FirebaseMessaging/Apps/Sample/Podfile

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ target 'Sample' do
1010
pod 'FirebaseMessaging', :path => '../../../'
1111
pod 'FirebaseInstanceID', :path => '../../../'
1212
pod 'FirebaseCoreDiagnostics', :path => '../../../'
13-
pod 'GoogleDataTransport', :path => '../../../'
1413
pod 'FirebaseInstallations', :path => '../../../'
1514

1615
end

FirebasePerformance.podspec

-4
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,6 @@ Firebase Performance library to measure performance of Mobile and Web Apps.
2929
'FirebaseCore/Sources/Private/*.h',
3030
'FirebaseInstallations/Source/Library/Private/*.h',
3131
'FirebaseRemoteConfig/Sources/Private/*.h',
32-
'GoogleDataTransport/GDTCORLibrary/Internal/*.h',
33-
'GoogleUtilities/ISASwizzler/Private/*.h',
34-
'GoogleUtilities/MethodSwizzler/Private/*.h',
35-
'GoogleUtilities/Environment/Private/*.h',
3632
]
3733

3834
s.requires_arc = [

FirebasePerformance/Sources/FPRURLFilter.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
#import "FirebasePerformance/Sources/FPRConsoleLogger.h"
1919

20-
#import "GoogleDataTransport/GDTCORLibrary/Internal/GoogleDataTransportInternal.h"
20+
#import <GoogleDataTransport/GoogleDataTransport.h>
2121

2222
/** The expected key of the domain allowlist array. */
2323
static NSString *const kFPRAllowlistDomainsKey = @"FPRWhitelistedDomains";

FirebasePerformance/Sources/Loggers/FPRGDTCCLogger.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#import "FirebasePerformance/Sources/Loggers/FPRGDTLogSampler.h"
2222
#import "FirebasePerformance/Sources/Loggers/FPRGDTRateLimiter.h"
2323

24-
#import "GoogleDataTransport/GDTCORLibrary/Internal/GoogleDataTransportInternal.h"
24+
#import <GoogleDataTransport/GoogleDataTransport.h>
2525

2626
#import "FirebasePerformance/ProtoSupport/PerfMetric.pbobjc.h"
2727

FirebasePerformance/Sources/Loggers/FPRGDTCCLogger_Private.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
#import "FirebasePerformance/Sources/Loggers/FPRGDTCCLogger.h"
1818

19+
#import <GoogleDataTransport/GoogleDataTransport.h>
1920
#import "FirebasePerformance/Sources/Configurations/FPRConfigurations.h"
20-
#import "GoogleDataTransport/GDTCORLibrary/Internal/GoogleDataTransportInternal.h"
2121

2222
/** FPRGDTCCLogger private definition used for unit testing. */
2323
@interface FPRGDTCCLogger ()

FirebasePerformance/Sources/Loggers/FPRGDTEvent.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
#import <Foundation/Foundation.h>
1616

17-
#import "GoogleDataTransport/GDTCORLibrary/Internal/GoogleDataTransportInternal.h"
17+
#import <GoogleDataTransport/GoogleDataTransport.h>
1818

1919
NS_ASSUME_NONNULL_BEGIN
2020

FirebasePerformance/Sources/Loggers/FPRGDTLogSampler.h

+1-1
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 "GoogleDataTransport/GDTCORLibrary/Internal/GoogleDataTransportInternal.h"
15+
#import <GoogleDataTransport/GoogleDataTransport.h>
1616

1717
NS_ASSUME_NONNULL_BEGIN
1818

FirebasePerformance/Sources/Loggers/FPRGDTLogSampler.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
#import "FirebasePerformance/Sources/Loggers/FPRGDTLogSampler.h"
1616

17-
#import "GoogleDataTransport/GDTCORLibrary/Internal/GoogleDataTransportInternal.h"
17+
#import <GoogleDataTransport/GoogleDataTransport.h>
1818

1919
#import "FirebasePerformance/Sources/AppActivity/FPRSessionManager.h"
2020
#import "FirebasePerformance/Sources/Common/FPRDiagnostics.h"

FirebasePerformance/Sources/Loggers/FPRGDTRateLimiter.h

+1-1
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 "GoogleDataTransport/GDTCORLibrary/Internal/GoogleDataTransportInternal.h"
15+
#import <GoogleDataTransport/GoogleDataTransport.h>
1616

1717
/**
1818
* FPRGDTRateLimiter class helps in limiting the number of events that are sent

FirebasePerformance/Sources/Loggers/FPRGDTRateLimiter.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#import "FirebasePerformance/Sources/Common/FPRPerfDate.h"
2323
#import "FirebasePerformance/Sources/Loggers/FPRGDTEvent.h"
2424

25-
#import "GoogleDataTransport/GDTCORLibrary/Internal/GoogleDataTransportInternal.h"
25+
#import <GoogleDataTransport/GoogleDataTransport.h>
2626

2727
#import "FirebasePerformance/ProtoSupport/PerfMetric.pbobjc.h"
2828

0 commit comments

Comments
 (0)