[Analytics] Remove deprecated subspecs/targets (#15061)

Author: ncooke3

.github/workflows/analytics.yml

@@ -43,11 +43,6 @@ jobs:
       run: scripts/third_party/travis/retry.sh pod spec lint GoogleAppMeasurement.podspec --platforms=${{ matrix.target }} --sources=https://github.com/firebase/SpecsDev.git,https://github.com/firebase/SpecsStaging.git,https://cdn.cocoapods.org/
     - name: FirebaseAnalytics
       run: scripts/third_party/travis/retry.sh pod spec lint FirebaseAnalytics.podspec --platforms=${{ matrix.target }} --sources=https://github.com/firebase/SpecsDev.git,https://github.com/firebase/SpecsStaging.git,https://cdn.cocoapods.org/
-    # The following steps are only run on `ios` due to product availability.
-    - name: GoogleAppMeasurementOnDeviceConversion
-      run: scripts/third_party/travis/retry.sh pod spec lint GoogleAppMeasurementOnDeviceConversion.podspec --platforms=ios --sources=https://github.com/firebase/SpecsDev.git,https://github.com/firebase/SpecsStaging.git,https://cdn.cocoapods.org/
-    - name: FirebaseAnalyticsOnDeviceConversion
-      run: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseAnalyticsOnDeviceConversion.podspec --platforms=ios
 
 # TODO: Consider pushing GoogleAppMeasurement.podspec to SpecsDev to enable similar test
 # for FirebaseAnalytics.podspec

Dangerfile

@@ -105,14 +105,10 @@ has_license_changes = didModify(["LICENSE"])
 
 ## Product directories
 @has_analytics_changes = hasChangesIn([
-  "FirebaseAnalyticsOnDeviceConversionWrapper",
-  "FirebaseAnalyticsWithoutAdIdSupportWrapper",
   "FirebaseAnalyticsWrapper"
 ]) || didModify([
   "FirebaseAnalytics.podspec",
-  "FirebaseAnalyticsOnDeviceConversion.podspec",
-  "GoogleAppMeasurement.podspec",
-  "GoogleAppMeasurementOnDeviceConversion.podspec"
+  "GoogleAppMeasurement.podspec"
 ])
 @has_abtesting_changes = hasChangesIn("FirebaseABTesting")
 @has_abtesting_api_changes = hasChangesIn("FirebaseABTesting/Sources/Public/")

Firebase.podspec

@@ -68,21 +68,6 @@ Simplify your app development, grow your user base, and monetize more effectivel
     ss.dependency 'Firebase/Core'
   end
 
-  s.subspec 'AnalyticsWithAdIdSupport' do |ss|
-    ss.ios.deployment_target = '15.0'
-    ss.osx.deployment_target = '10.15'
-    ss.tvos.deployment_target = '15.0'
-    ss.dependency 'Firebase/Core'
-  end
-
-  s.subspec 'AnalyticsWithoutAdIdSupport' do |ss|
-    ss.ios.deployment_target = '15.0'
-    ss.osx.deployment_target = '10.15'
-    ss.tvos.deployment_target = '15.0'
-    ss.dependency 'FirebaseAnalytics/WithoutAdIdSupport', '~> 12.0.0'
-    ss.dependency 'Firebase/CoreOnly'
-  end
-
   s.subspec 'ABTesting' do |ss|
     ss.dependency 'Firebase/CoreOnly'
     ss.dependency 'FirebaseABTesting', '~> 12.0.0'

FirebaseAnalytics.podspec

@@ -51,16 +51,4 @@ Pod::Spec.new do |s|
         ss.vendored_frameworks = 'Frameworks/FirebaseAnalytics.xcframework'
     end
 
-    # Deprecated. Use IdentitySupport subspec instead.
-    s.subspec 'AdIdSupport' do |ss|
-        ss.dependency 'GoogleAppMeasurement/AdIdSupport', '12.0.0'
-        ss.vendored_frameworks = 'Frameworks/FirebaseAnalytics.xcframework'
-    end
-
-    # Deprecated. Use Core subspec instead.
-    s.subspec 'WithoutAdIdSupport' do |ss|
-        ss.dependency 'GoogleAppMeasurement/WithoutAdIdSupport', '12.0.0'
-        ss.vendored_frameworks = 'Frameworks/FirebaseAnalytics.xcframework'
-    end
-
 end

FirebaseAnalyticsOnDeviceConversion.podspec

@@ -50,14 +50,4 @@ Pod::Spec.new do |s|
         ss.dependency 'GoogleAppMeasurement/Core', '12.0.0'
         ss.vendored_frameworks = 'Frameworks/GoogleAppMeasurementIdentitySupport.xcframework'
     end
-
-    # Deprecated. Use IdentitySupport subspec instead.
-    s.subspec 'AdIdSupport' do |ss|
-        ss.dependency 'GoogleAppMeasurement/IdentitySupport', '12.0.0'
-    end
-
-    # Deprecated. Use Core subspec instead.
-    s.subspec 'WithoutAdIdSupport' do |ss|
-        ss.dependency 'GoogleAppMeasurement/Core', '12.0.0'
-    end
 end