infra(zip): refactor zip bundle id prefix (#16678)

Firebase.podspec

@@ -30,6 +30,10 @@ Simplify your app development, grow your user base, and monetize more effectivel
 
   s.swift_version = '5.9'
 
+  s.pod_target_xcconfig = {
+    'PRODUCT_BUNDLE_IDENTIFIER' => 'com.google.firebase.Firebase'
+  }
+
   s.default_subspec = 'Core'
 
   s.subspec 'Core' do |ss|

FirebaseABTesting.podspec

@@ -49,7 +49,8 @@ Firebase Cloud Messaging and Firebase Remote Config in your app.
   s.requires_arc = base_dir + '*.m'
   s.public_header_files = base_dir + 'Public/FirebaseABTesting/*.h'
   s.pod_target_xcconfig = {
-    'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"'
+    'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"',
+    'PRODUCT_BUNDLE_IDENTIFIER' => 'com.google.firebase.FirebaseABTesting'
   }
   s.dependency 'FirebaseCore', '~> 13.0.0'
 

FirebaseAILogic.podspec

@@ -43,6 +43,10 @@ Build AI-powered apps and features with the Gemini API using the Firebase AI Log
   s.tvos.framework = 'UIKit'
   s.watchos.framework = 'WatchKit'
 
+  s.pod_target_xcconfig = {
+    'PRODUCT_BUNDLE_IDENTIFIER' => 'com.google.firebase.FirebaseAILogic'
+  }
+
   swift_flags_xcconfig = {
     'OTHER_SWIFT_FLAGS' => '$(inherited) -D IS_FOUNDATION_MODELS_SUPPORTED_PLATFORM'
   }

FirebaseAnalytics.podspec

@@ -26,6 +26,10 @@ Pod::Spec.new do |s|
     s.libraries  = 'c++', 'sqlite3', 'z'
     s.frameworks = 'StoreKit'
 
+    s.pod_target_xcconfig = {
+      'PRODUCT_BUNDLE_IDENTIFIER' => 'com.google.firebase.FirebaseAnalytics'
+    }
+
     s.dependency 'FirebaseCore', '~> 13.0.0'
     s.dependency 'FirebaseInstallations', '~> 13.0.0'
     s.dependency 'GoogleUtilities/AppDelegateSwizzler', '>= 8.1.3', '< 9.0'

FirebaseAppCheck.podspec

@@ -51,7 +51,8 @@ Pod::Spec.new do |s|
   s.dependency 'GoogleUtilities/UserDefaults', '>= 8.1.3', '< 9.0'
 
   s.pod_target_xcconfig = {
-    'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"'
+    'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"',
+    'PRODUCT_BUNDLE_IDENTIFIER' => 'com.google.firebase.FirebaseAppCheck'
   }
 
   s.test_spec 'unit' do |unit_tests|

FirebaseAppCheckInterop.podspec

@@ -34,6 +34,10 @@ Pod::Spec.new do |s|
   s.source_files = 'FirebaseAppCheck/Interop/**/*.[hm]'
   s.public_header_files = 'FirebaseAppCheck/Interop/Public/FirebaseAppCheckInterop/*.h'
 
+  s.pod_target_xcconfig = {
+    'PRODUCT_BUNDLE_IDENTIFIER' => 'com.google.firebase.FirebaseAppCheckInterop'
+  }
+
   s.test_spec 'objc-unit' do |unit_tests|
     unit_tests.platforms = {
       :ios => ios_deployment_target,

FirebaseAppDistribution.podspec

@@ -36,7 +36,8 @@ iOS SDK for App Distribution for Firebase.
   s.dependency 'FirebaseInstallations', '~> 13.0.0'
 
   s.pod_target_xcconfig = {
-    'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"'
+    'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"',
+    'PRODUCT_BUNDLE_IDENTIFIER' => 'com.google.firebase.FirebaseAppDistribution'
   }
 
   s.test_spec 'unit' do |unit_tests|

FirebaseAuth.podspec

@@ -51,7 +51,8 @@ supports email and password accounts, as well as several 3rd party authenticatio
   s.pod_target_xcconfig = {
     # The second path is to find FirebaseAuth-Swift.h from a pod gen project
     'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}" "${OBJECT_FILE_DIR_normal}/${NATIVE_ARCH_ACTUAL}"',
-    'OTHER_SWIFT_FLAGS' => "$(inherited) #{ENV.key?('FIREBASE_CI') ? '-D FIREBASE_CI -warnings-as-errors' : ''}"
+    'OTHER_SWIFT_FLAGS' => "$(inherited) #{ENV.key?('FIREBASE_CI') ? '-D FIREBASE_CI -warnings-as-errors' : ''}",
+    'PRODUCT_BUNDLE_IDENTIFIER' => 'com.google.firebase.FirebaseAuth'
   }
   s.framework = 'Security'
   s.ios.framework = 'SafariServices'

FirebaseAuthInterop.podspec

@@ -27,4 +27,8 @@ Pod::Spec.new do |s|
 
   s.source_files = 'FirebaseAuth/Interop/**/*.[hm]'
   s.public_header_files = 'FirebaseAuth/Interop/Public/FirebaseAuthInterop/*.h'
+
+  s.pod_target_xcconfig = {
+    'PRODUCT_BUNDLE_IDENTIFIER' => 'com.google.firebase.FirebaseAuthInterop'
+  }
 end

FirebaseAuthTestingSupport.podspec

@@ -41,6 +41,10 @@ Pod::Spec.new do |s|
 
   s.dependency 'FirebaseAuth', '> 12.0'
 
+  s.pod_target_xcconfig = {
+    'PRODUCT_BUNDLE_IDENTIFIER' => 'com.google.firebase.FirebaseAuthTestingSupport'
+  }
+
   s.test_spec 'unit' do |unit_tests|
     unit_tests.scheme = { :code_coverage => true }
     unit_tests.platforms = {:ios => ios_deployment_target, :osx => osx_deployment_target, :tvos => tvos_deployment_target}

FirebaseCombineSwift.podspec

@@ -59,6 +59,7 @@ for internal testing only. It should not be published.
 
   s.pod_target_xcconfig = {
     'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"',
+    'PRODUCT_BUNDLE_IDENTIFIER' => 'com.google.firebase.FirebaseCombineSwift'
   }
 
   s.test_spec 'unit' do |unit_tests|

FirebaseCore.podspec

@@ -66,7 +66,8 @@ Firebase Core includes FIRApp and FIROptions which provide central configuration
     'DEFINES_MODULE' => 'YES',
     'GCC_PREPROCESSOR_DEFINITIONS' => 'Firebase_VERSION=' + s.version.to_s,
     'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"',
-    'OTHER_CFLAGS' => '-fno-autolink'
+    'OTHER_CFLAGS' => '-fno-autolink',
+    'PRODUCT_BUNDLE_IDENTIFIER' => 'com.google.firebase.FirebaseCore'
   }
 
   s.test_spec 'unit' do |unit_tests|

FirebaseCore/CHANGELOG.md

@@ -19,6 +19,8 @@
   and framework specific umbrella headers. (#16540)
 - [changed] **Breaking change**: The minimum supported version of
   `GTMSessionFetcher` is now `4.0.0` (support for `3.x` has been dropped).
+- [changed] **Breaking change**: Bundle ID prefixes in the zip distribution are now
+  properly scoped to `com.google.firebase`, instead of `org.cocoapods.`. (#16678)
 
 # Firebase 12.19.1
 - [fixed] Fixed the zip distribution artifact naming on the GitHub release

FirebaseCoreExtension.podspec

@@ -35,7 +35,8 @@ Pod::Spec.new do |s|
     }
 
     s.pod_target_xcconfig = {
-      'DEFINES_MODULE' => 'YES'
+      'DEFINES_MODULE' => 'YES',
+      'PRODUCT_BUNDLE_IDENTIFIER' => 'com.google.firebase.FirebaseCoreExtension'
     }
 
     s.dependency 'FirebaseCore', '~> 13.0.0'

FirebaseCoreInternal.podspec

@@ -40,6 +40,10 @@ Pod::Spec.new do |s|
 
   s.dependency 'GoogleUtilities/NSData+zlib', '>= 8.1.3', '< 9.0'
 
+  s.pod_target_xcconfig = {
+    'PRODUCT_BUNDLE_IDENTIFIER' => 'com.google.firebase.FirebaseCoreInternal'
+  }
+
   s.test_spec 'Unit' do |unit_tests|
     unit_tests.scheme = { :code_coverage => true }
     unit_tests.platforms = {

FirebaseCrashlytics.podspec

@@ -74,6 +74,10 @@ Pod::Spec.new do |s|
   s.osx.frameworks = 'Security', 'SystemConfiguration'
   s.watchos.frameworks = 'Security'
 
+  s.pod_target_xcconfig = {
+    'PRODUCT_BUNDLE_IDENTIFIER' => 'com.google.firebase.FirebaseCrashlytics'
+  }
+
   s.ios.pod_target_xcconfig = {
     'GCC_PREPROCESSOR_DEFINITIONS' =>
       'CLS_SDK_NAME="Crashlytics iOS SDK" ' +

FirebaseDatabase.podspec

@@ -53,7 +53,8 @@ Simplify your iOS development, grow your user base, and monetize more effectivel
   s.dependency 'FirebaseSharedSwift', '~> 13.0.0'
   s.dependency 'GoogleUtilities/UserDefaults', '>= 8.1.3', '< 9.0'
   s.pod_target_xcconfig = {
-    'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"'
+    'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"',
+    'PRODUCT_BUNDLE_IDENTIFIER' => 'com.google.firebase.FirebaseDatabase'
   }
 
   s.test_spec 'unit' do |unit_tests|

FirebaseFirestore.podspec

@@ -40,4 +40,7 @@ Google Cloud Firestore is a NoSQL document database built for automatic scaling,
   s.dependency 'FirebaseFirestoreInternal', '~> 13.0.0'
   s.dependency 'FirebaseSharedSwift', '~> 13.0.0'
 
+  s.pod_target_xcconfig = {
+    'PRODUCT_BUNDLE_IDENTIFIER' => 'com.google.firebase.FirebaseFirestore'
+  }
 end

FirebaseFirestoreInternal.podspec

@@ -129,7 +129,8 @@ Google Cloud Firestore is a NoSQL document database built for automatic scaling,
       '"${PODS_TARGET_SRCROOT}/Firestore/Source/Public" ' +
       '"${PODS_ROOT}/nanopb" ' +
       '"${PODS_TARGET_SRCROOT}/Firestore/Protos/nanopb" ' +
-      '"${PODS_TARGET_SRCROOT}/Firestore/third_party/re2" '
+      '"${PODS_TARGET_SRCROOT}/Firestore/third_party/re2" ',
+    'PRODUCT_BUNDLE_IDENTIFIER' => 'com.google.firebase.FirebaseFirestoreInternal'
   }
 
   s.compiler_flags = '$(inherited) -Wreorder -Werror=reorder -Wno-comma'

FirebaseFirestoreTestingSupport.podspec

@@ -47,7 +47,8 @@ Pod::Spec.new do |s|
   s.pod_target_xcconfig = {
     'OTHER_CFLAGS' => '-fno-autolink',
     'HEADER_SEARCH_PATHS' =>
-      '"${PODS_TARGET_SRCROOT}" '
+      '"${PODS_TARGET_SRCROOT}" ',
+    'PRODUCT_BUNDLE_IDENTIFIER' => 'com.google.firebase.FirebaseFirestoreTestingSupport'
   }
 
   s.test_spec 'unit' do |unit_tests|

FirebaseFunctions.podspec

@@ -43,6 +43,10 @@ Cloud Functions for Firebase.
   s.dependency 'FirebaseSharedSwift', '~> 13.0.0'
   s.dependency 'GTMSessionFetcher/Core', '>= 4.0', '< 6.0'
 
+  s.pod_target_xcconfig = {
+    'PRODUCT_BUNDLE_IDENTIFIER' => 'com.google.firebase.FirebaseFunctions'
+  }
+
   s.test_spec 'objc' do |objc_tests|
     objc_tests.platforms = {
       :ios => ios_deployment_target,

FirebaseInAppMessaging.podspec

@@ -75,7 +75,8 @@ See more product details at https://firebase.google.com/products/in-app-messagin
     'GCC_PREPROCESSOR_DEFINITIONS' =>
       '$(inherited) ' +
       'PB_FIELD_32BIT=1 PB_NO_PACKED_STRUCTS=1 PB_ENABLE_MALLOC=1',
-    'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"'
+    'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"',
+    'PRODUCT_BUNDLE_IDENTIFIER' => 'com.google.firebase.FirebaseInAppMessaging'
   }
 
   s.framework = 'UIKit'

FirebaseInstallations.podspec

@@ -54,7 +54,8 @@ Pod::Spec.new do |s|
   s.pod_target_xcconfig = {
     'DEFINES_MODULE' => 'YES',
     'GCC_PREPROCESSOR_DEFINITIONS' => preprocessor_definitions,
-    'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"'
+    'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"',
+    'PRODUCT_BUNDLE_IDENTIFIER' => 'com.google.firebase.FirebaseInstallations'
   }
 
   s.test_spec 'unit' do |unit_tests|

FirebaseMessaging.podspec

@@ -55,6 +55,7 @@ device, and it is completely free.
       'PB_FIELD_32BIT=1 PB_NO_PACKED_STRUCTS=1 PB_ENABLE_MALLOC=1',
     # Unit tests do library imports using repo-root relative paths.
     'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"',
+    'PRODUCT_BUNDLE_IDENTIFIER' => 'com.google.firebase.FirebaseMessaging'
   }
   s.ios.framework = 'SystemConfiguration'
   s.tvos.framework = 'SystemConfiguration'

FirebaseMessagingInterop.podspec

@@ -27,4 +27,8 @@ Pod::Spec.new do |s|
 
   s.source_files = 'FirebaseMessaging/Interop/*.[hm]'
   s.public_header_files = 'FirebaseMessaging/Interop/*.h'
+
+  s.pod_target_xcconfig = {
+    'PRODUCT_BUNDLE_IDENTIFIER' => 'com.google.firebase.FirebaseMessagingInterop'
+  }
 end

FirebasePerformance.podspec

@@ -53,6 +53,7 @@ Firebase Performance library to measure performance of Mobile and Web Apps.
     'GCC_PREPROCESSOR_DEFINITIONS' => preprocessor_definitions,
     # Unit tests do library imports using repo-root relative paths.
     'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"',
+    'PRODUCT_BUNDLE_IDENTIFIER' => 'com.google.firebase.FirebasePerformance'
   }
 
   s.ios.framework = 'CoreTelephony'

FirebaseRemoteConfig.podspec

@@ -47,7 +47,8 @@ app update.
     "#{s.module_name}_Privacy" => 'FirebaseRemoteConfig/Swift/Resources/PrivacyInfo.xcprivacy'
   }
   s.pod_target_xcconfig = {
-    'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"'
+    'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"',
+    'PRODUCT_BUNDLE_IDENTIFIER' => 'com.google.firebase.FirebaseRemoteConfig'
   }
   s.dependency 'FirebaseABTesting', '~> 13.0.0'
   s.dependency 'FirebaseSharedSwift', '~> 13.0.0'

FirebaseRemoteConfigInterop.podspec

@@ -33,4 +33,8 @@ Pod::Spec.new do |s|
   s.watchos.deployment_target = '8.0'
 
   s.source_files = 'FirebaseRemoteConfig/Interop/*.swift'
+
+  s.pod_target_xcconfig = {
+    'PRODUCT_BUNDLE_IDENTIFIER' => 'com.google.firebase.FirebaseRemoteConfigInterop'
+  }
 end

FirebaseSessions.podspec

@@ -53,6 +53,7 @@ Pod::Spec.new do |s|
     'GCC_PREPROCESSOR_DEFINITIONS' =>
       # For nanopb:
       'PB_FIELD_32BIT=1 PB_NO_PACKED_STRUCTS=1 PB_ENABLE_MALLOC=1',
+    'PRODUCT_BUNDLE_IDENTIFIER' => 'com.google.firebase.FirebaseSessions'
   }
 
   s.test_spec 'unit' do |unit_tests|

FirebaseSharedSwift.podspec

@@ -37,6 +37,10 @@ Firebase products. FirebaseSharedSwift is not supported for non-Firebase usage.
     'FirebaseSharedSwift/Sources/**/*.swift',
   ]
 
+  s.pod_target_xcconfig = {
+    'PRODUCT_BUNDLE_IDENTIFIER' => 'com.google.firebase.FirebaseSharedSwift'
+  }
+
   s.test_spec 'unit' do |unit_tests|
     unit_tests.platforms = {
       :ios => ios_deployment_target,

FirebaseStorage.podspec

@@ -44,6 +44,10 @@ Firebase Storage provides robust, secure file uploads and downloads from Firebas
   s.dependency 'GTMSessionFetcher/Core', '>= 4.0', '< 6.0'
   s.dependency 'GoogleUtilities/Environment', '>= 8.1.3', '< 9.0'
 
+  s.pod_target_xcconfig = {
+    'PRODUCT_BUNDLE_IDENTIFIER' => 'com.google.firebase.FirebaseStorage'
+  }
+
   s.test_spec 'ObjCIntegration' do |objc_tests|
     objc_tests.scheme = { :code_coverage => true }
     objc_tests.platforms = {