Consolidate GDT and GDTCCT to a single pod (#5902)

Author: paulb777

.github/workflows/datatransport.yml

@@ -4,7 +4,6 @@ on:
   pull_request:
     paths:
     - 'GoogleDataTransport**'
-    - 'GoogleDataTransportCCTSupport**'
     - '.github/workflows/datatransport.yml'
     - 'Gemfile'
   schedule:
@@ -27,40 +26,33 @@ jobs:
     - name: PodLibLint DataTransport
       run: |
         scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb GoogleDataTransport.podspec --platforms=${{ matrix.target }}
-        scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb GoogleDataTransportCCTSupport.podspec --platforms=${{ matrix.target }}
 
   catalyst:
     # Don't run on private repo unless it is a PR.
     if: github.repository != 'FirebasePrivate/firebase-ios-sdk' || github.event_name == 'pull_request'
 
     runs-on: macOS-latest
-    strategy:
-      matrix:
-        pod: [GoogleDataTransport, GoogleDataTransportCCTSupport]
     steps:
     - uses: actions/checkout@v2
     - name: Setup Bundler
       run: scripts/setup_bundler.sh
     - name: Setup project and Test Catalyst
       # Only build the unit tests on Catalyst. Test stopped working when GHA moved to Xcode 11.4.1.
-      run: scripts/third_party/travis/retry.sh scripts/test_catalyst.sh ${{ matrix.pod }} build
+      run: scripts/third_party/travis/retry.sh scripts/test_catalyst.sh GoogleDataTransport build
 
   watchos-testapp:
     # Don't run on private repo unless it is a PR.
     if: github.repository != 'FirebasePrivate/firebase-ios-sdk' || github.event_name == 'pull_request'
 
     runs-on: macOS-latest
-    strategy:
-      matrix:
-        pod: [GoogleDataTransport, GoogleDataTransportCCTSupport]
     steps:
     - uses: actions/checkout@v2
     - name: Setup Bundler
       run: scripts/setup_bundler.sh
     - name: Prereqs
-      run: scripts/install_prereqs.sh ${{ matrix.pod }} watchOS xcodebuild
+      run: scripts/install_prereqs.sh GoogleDataTransport watchOS xcodebuild
     - name: Setup project and build watchOS test app
-      run: scripts/third_party/travis/retry.sh scripts/build.sh ${{ matrix.pod }} watchOS xcodebuild
+      run: scripts/third_party/travis/retry.sh scripts/build.sh GoogleDataTransport watchOS xcodebuild
 
 # Scheduled jobs
 
@@ -84,4 +76,3 @@ jobs:
     - name: PodLibLint DataTransport Cron
       run: |
         scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb GoogleDataTransport.podspec --platforms=${{ matrix.target }} ${{ matrix.flags }}
-        scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb GoogleDataTransportCCTSupport.podspec --platforms=${{ matrix.target }} ${{ matrix.flags }}

.travis.yml

@@ -231,7 +231,6 @@ jobs:
         - PROJECT=GoogleDataTransport METHOD=pod-lib-lint
       script:
         - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb GoogleDataTransport.podspec --platforms=ios
-        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.rb GoogleDataTransportCCTSupport.podspec --platforms=ios
 
     # Validate Cocoapods configurations
     # This may take long time, so we would like to run it only once all other tests pass

CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_6_1_frameworks/Podfile

@@ -19,6 +19,5 @@ target 'CocoapodsIntegrationTest' do
   pod 'FirebaseMessaging', :path => '../'
   pod 'FirebaseStorage', :path => '../'
   pod 'GoogleDataTransport', :path => '../'
-  pod 'GoogleDataTransportCCTSupport', :path => '../'
   pod 'GoogleUtilities', :path => '../'
 end

CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_6_1_staticLibs/Podfile

@@ -17,6 +17,5 @@ target 'CocoapodsIntegrationTest' do
   pod 'FirebaseMessaging', :path => '../'
   pod 'FirebaseStorage', :path => '../'
   pod 'GoogleDataTransport', :path => '../'
-  pod 'GoogleDataTransportCCTSupport', :path => '../'
   pod 'GoogleUtilities', :path => '../'
 end

CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_7_0_frameworks/Podfile

@@ -18,6 +18,5 @@ target 'CocoapodsIntegrationTest' do
   pod 'FirebaseMessaging', :path => '../'
   pod 'FirebaseStorage', :path => '../'
   pod 'GoogleDataTransport', :path => '../'
-  pod 'GoogleDataTransportCCTSupport', :path => '../'
   pod 'GoogleUtilities', :path => '../'
 end

CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_7_0_multiprojects_frameworks/Podfile

@@ -19,7 +19,6 @@ target 'CocoapodsIntegrationTest' do
   pod 'FirebaseMessaging', :path => '../'
   pod 'FirebaseStorage', :path => '../'
   pod 'GoogleDataTransport', :path => '../'
-  pod 'GoogleDataTransportCCTSupport', :path => '../'
   pod 'GoogleUtilities', :path => '../'
 end
 

CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_7_0_multiprojects_staticLibs/Podfile

@@ -17,7 +17,6 @@ target 'CocoapodsIntegrationTest' do
   pod 'FirebaseMessaging', :path => '../'
   pod 'FirebaseStorage', :path => '../'
   pod 'GoogleDataTransport', :path => '../'
-  pod 'GoogleDataTransportCCTSupport', :path => '../'
   pod 'GoogleUtilities', :path => '../'
 end
 

CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_7_0_staticLibs/Podfile

@@ -17,6 +17,5 @@ target 'CocoapodsIntegrationTest' do
   pod 'FirebaseMessaging', :path => '../'
   pod 'FirebaseStorage', :path => '../'
   pod 'GoogleDataTransport', :path => '../'
-  pod 'GoogleDataTransportCCTSupport', :path => '../'
   pod 'GoogleUtilities', :path => '../'
 end

CoreOnly/Tests/FirebasePodTest/FirebasePodTest.xcodeproj/project.pbxproj

@@ -300,7 +300,6 @@
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreDiagnostics/FirebaseCoreDiagnostics.framework/Headers\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseInstanceID/FirebaseInstanceID.framework/Headers\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleDataTransport/GoogleDataTransport.framework/Headers\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleDataTransportCCTSupport/GoogleDataTransportCCTSupport.framework/Headers\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities/GoogleUtilities.framework/Headers\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/nanopb/nanopb.framework/Headers\"",
 					"\"${PODS_ROOT}/Headers/Public\"",
@@ -331,7 +330,6 @@
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCoreDiagnostics/FirebaseCoreDiagnostics.framework/Headers\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseInstanceID/FirebaseInstanceID.framework/Headers\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleDataTransport/GoogleDataTransport.framework/Headers\"",
-					"\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleDataTransportCCTSupport/GoogleDataTransportCCTSupport.framework/Headers\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities/GoogleUtilities.framework/Headers\"",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/nanopb/nanopb.framework/Headers\"",
 					"\"${PODS_ROOT}/Headers/Public\"",

CoreOnly/Tests/FirebasePodTest/Podfile

@@ -28,7 +28,6 @@ target 'FirebasePodTest' do
   # Get dependent pods from the repo also
   pod 'FirebaseCoreDiagnostics', :path => '../../../'
   pod 'GoogleDataTransport', :path => '../../../'
-  pod 'GoogleDataTransportCCTSupport', :path => '../../../'
   pod 'GoogleUtilities', :path => '../../../'
 
   pod 'FirebaseAnalytics' # Analytics is not open source