Bladeren bron

Update podspec and SPM dependencies

Andrew Heard 1 jaar geleden
bovenliggende
commit
ca5deb8d65

+ 0 - 1
CoreOnly/Tests/FirebasePodTest/Podfile

@@ -30,7 +30,6 @@ target 'FirebasePodTest' do
   pod 'FirebaseStorage', :path => '../../../'
 
   # Get dependent pods from the repo also
-  pod 'FirebaseAppCheckInterop', :path => '../../../'
   pod 'FirebaseAuthInterop', :path => '../../../'
   pod 'FirebaseMessagingInterop', :path => '../../../'
   pod 'FirebaseRemoteConfigInterop', :path => '../../../'

+ 0 - 1
Example/watchOSSample/Podfile

@@ -17,7 +17,6 @@ target 'SampleWatchAppWatchKitExtension' do
   pod 'FirebaseRemoteConfig', :path => '../../'
   pod 'FirebaseABTesting', :path => '../../'
   pod 'FirebaseDatabase', :path => '../../'
-  pod 'FirebaseAppCheckInterop', :path => '../../'
   pod 'FirebaseAuthInterop', :path => '../../'
   pod 'FirebaseRemoteConfigInterop', :path => '../../'
 

+ 1 - 1
FirebaseAppCheck.podspec

@@ -45,11 +45,11 @@ Pod::Spec.new do |s|
   s.tvos.weak_framework = 'DeviceCheck'
 
   s.dependency 'AppCheckCore', '~> 10.19'
-  s.dependency 'FirebaseAppCheckInterop', '~> 10.28'
   s.dependency 'FirebaseCore', '~> 10.18'
   s.dependency 'PromisesObjC', '~> 2.1'
   s.dependency 'GoogleUtilities/Environment', '~> 7.13'
   s.dependency 'GoogleUtilities/UserDefaults', '~> 7.13'
+  s.dependency 'InteropForFirebaseAppCheck', '~> 100.1.0'
 
   s.pod_target_xcconfig = {
     'GCC_C_LANGUAGE_STANDARD' => 'c99',

+ 1 - 1
FirebaseAuth.podspec

@@ -54,11 +54,11 @@ supports email and password accounts, as well as several 3rd party authenticatio
   }
   s.framework = 'Security'
   s.ios.framework = 'SafariServices'
-  s.dependency 'FirebaseAppCheckInterop', '~> 10.17'
   s.dependency 'FirebaseCore', '~> 10.0'
   s.dependency 'GoogleUtilities/AppDelegateSwizzler', '~> 7.8'
   s.dependency 'GoogleUtilities/Environment', '~> 7.8'
   s.dependency 'GTMSessionFetcher/Core', '>= 2.1', '< 4.0'
+  s.dependency 'InteropForFirebaseAppCheck', '~> 100.1.0'
   s.ios.dependency 'RecaptchaInterop', '~> 100.0'
   s.test_spec 'unit' do |unit_tests|
     unit_tests.scheme = { :code_coverage => true }

+ 1 - 1
FirebaseAuth/Tests/Sample/Podfile

@@ -10,7 +10,6 @@ use_frameworks!
 
 target 'AuthSample' do
   platform :ios, '11.0'
-  pod 'FirebaseAppCheckInterop', :path => '../../../'
   pod 'FirebaseCore', :path => '../../../'
   pod 'FirebaseCoreInternal', :path => '../../../'
   pod 'FirebaseAuth', :path => '../../../', :testspecs => ['unit']
@@ -18,6 +17,7 @@ target 'AuthSample' do
   pod 'FBSDKLoginKit', '< 13'
   pod 'GoogleSignIn', '~> 6'
   pod 'GTMSessionFetcher/Core'
+  pod 'InteropForFirebaseAppCheck', '~> 100.1.0'
   pod 'RecaptchaEnterprise', '~> 18.3'
 
   target 'Auth_ApiTests' do

+ 2 - 2
FirebaseDatabase.podspec

@@ -49,9 +49,9 @@ Simplify your iOS development, grow your user base, and monetize more effectivel
   s.watchos.frameworks = 'CFNetwork', 'Security', 'WatchKit'
   s.dependency 'leveldb-library', '~> 1.22'
   s.dependency 'FirebaseCore', '~> 10.0'
-  s.dependency 'FirebaseAppCheckInterop', '~> 10.17'
   s.dependency 'FirebaseSharedSwift', '~> 10.0'
   s.dependency 'GoogleUtilities/UserDefaults', '~> 7.13'
+  s.dependency 'InteropForFirebaseAppCheck', '~> 100.1.0'
   s.pod_target_xcconfig = {
     'GCC_C_LANGUAGE_STANDARD' => 'c99',
     'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"'
@@ -73,7 +73,7 @@ Simplify your iOS development, grow your user base, and monetize more effectivel
       'SharedTestUtilities/FIRComponentTestUtilities.[mh]',
       'SharedTestUtilities/FIROptionsMock.[mh]',
     ]
-    unit_tests.dependency 'FirebaseAppCheckInterop', '~> 10.16'
+    unit_tests.dependency 'InteropForFirebaseAppCheck', '~> 100.1.0'
     unit_tests.dependency 'OCMock'
     unit_tests.resources = 'FirebaseDatabase/Tests/Resources/syncPointSpec.json',
                            'FirebaseDatabase/Tests/Resources/GoogleService-Info.plist'

+ 1 - 1
FirebaseFirestoreInternal.podspec

@@ -91,8 +91,8 @@ Google Cloud Firestore is a NoSQL document database built for automatic scaling,
     "#{s.module_name}_Privacy" => 'Firestore/Source/Resources/PrivacyInfo.xcprivacy'
   }
 
-  s.dependency 'FirebaseAppCheckInterop', '~> 10.17'
   s.dependency 'FirebaseCore', '~> 10.0'
+  s.dependency 'InteropForFirebaseAppCheck', '~> 100.1.0'
 
   abseil_version = '~> 1.20240116.1'
   s.dependency 'abseil/algorithm', abseil_version

+ 1 - 1
FirebaseFunctions.podspec

@@ -39,11 +39,11 @@ Cloud Functions for Firebase.
 
   s.dependency 'FirebaseCore', '~> 10.0'
   s.dependency 'FirebaseCoreExtension', '~> 10.0'
-  s.dependency 'FirebaseAppCheckInterop', '~> 10.10'
   s.dependency 'FirebaseAuthInterop', '~> 10.25'
   s.dependency 'FirebaseMessagingInterop', '~> 10.0'
   s.dependency 'FirebaseSharedSwift', '~> 10.0'
   s.dependency 'GTMSessionFetcher/Core', '>= 2.1', '< 4.0'
+  s.dependency 'InteropForFirebaseAppCheck', '~> 100.1.0'
 
   s.test_spec 'objc' do |objc_tests|
     objc_tests.platforms = {

+ 1 - 1
FirebaseStorage.podspec

@@ -37,12 +37,12 @@ Firebase Storage provides robust, secure file uploads and downloads from Firebas
     'FirebaseStorage/Typedefs/*.h',
   ]
 
-  s.dependency 'FirebaseAppCheckInterop', '~> 10.0'
   s.dependency 'FirebaseAuthInterop', '~> 10.25'
   s.dependency 'FirebaseCore', '~> 10.0'
   s.dependency 'FirebaseCoreExtension', '~> 10.0'
   s.dependency 'GTMSessionFetcher/Core', '>= 2.1', '< 4.0'
   s.dependency 'GoogleUtilities/Environment', '~> 7.12'
+  s.dependency 'InteropForFirebaseAppCheck', '~> 100.1.0'
 
   s.test_spec 'ObjCIntegration' do |objc_tests|
     objc_tests.scheme = { :code_coverage => true }

+ 1 - 1
FirebaseVertexAI-Docs.not_podspec

@@ -40,8 +40,8 @@ Pod::Spec.new do |s|
   s.ios.framework = 'UIKit'
   s.osx.framework = 'AppKit'
 
-  s.dependency 'FirebaseAppCheckInterop', '~> 10.17'
   s.dependency 'FirebaseAuthInterop', '~> 10.25'
   s.dependency 'FirebaseCore', '~> 10.5'
   s.dependency 'FirebaseCoreExtension', '~> 10.0'
+  s.dependency 'InteropForFirebaseAppCheck', '~> 100.1.0'
 end

+ 0 - 1
Firestore/Example/Podfile

@@ -62,7 +62,6 @@ def configure_local_pods()
   # to its podspec can still function. See Firestore-*-xcodebuild in
   # scripts/install_prereqs.sh for more details.
   pod 'FirebaseFirestoreInternal', :path => '../..'
-  pod 'FirebaseAppCheckInterop', :path => '../..'
   pod 'FirebaseCore', :path => '../..'
   pod 'FirebaseCoreInternal', :path => '../..'
   pod 'FirebaseCoreExtension',:path => '../..'

+ 0 - 1
IntegrationTesting/CocoapodsIntegrationTest/TestEnvironments/Cocoapods_multiprojects_frameworks/Podfile

@@ -10,7 +10,6 @@ target 'CocoapodsIntegrationTest' do
   use_frameworks!
   pod 'FirebaseABTesting', :path => '../../'
   pod 'FirebaseAppDistribution', :path => '../../'
-  pod 'FirebaseAppCheckInterop', :path => '../../'
   pod 'FirebaseCore', :path => '../../'
   pod 'FirebaseCoreExtension', :path => '../../'
   pod 'FirebaseCoreInternal', :path => '../../'

+ 10 - 10
Package.swift

@@ -437,10 +437,10 @@ let package = Package(
       name: "FirebaseAuth",
       dependencies: [
         "FirebaseCore",
-        .product(name: "FirebaseAppCheckInterop", package: "interop-ios-for-google-sdks"),
         .product(name: "GULAppDelegateSwizzler", package: "GoogleUtilities"),
         .product(name: "GULEnvironment", package: "GoogleUtilities"),
         .product(name: "GTMSessionFetcherCore", package: "gtm-session-fetcher"),
+        .product(name: "InteropForFirebaseAppCheck", package: "interop-ios-for-google-sdks"),
         .product(name: "RecaptchaInterop", package: "interop-ios-for-google-sdks"),
       ],
       path: "FirebaseAuth/Sources",
@@ -598,8 +598,8 @@ let package = Package(
       dependencies: [
         "FirebaseCore",
         "leveldb",
-        .product(name: "FirebaseAppCheckInterop", package: "interop-ios-for-google-sdks"),
         .product(name: "GULUserDefaults", package: "GoogleUtilities"),
+        .product(name: "InteropForFirebaseAppCheck", package: "interop-ios-for-google-sdks"),
       ],
       path: "FirebaseDatabase/Sources",
       exclude: [
@@ -722,8 +722,8 @@ let package = Package(
         "FirebaseCoreExtension",
         "FirebaseMessagingInterop",
         "FirebaseSharedSwift",
-        .product(name: "FirebaseAppCheckInterop", package: "interop-ios-for-google-sdks"),
         .product(name: "GTMSessionFetcherCore", package: "gtm-session-fetcher"),
+        .product(name: "InteropForFirebaseAppCheck", package: "interop-ios-for-google-sdks"),
       ],
       path: "FirebaseFunctions/Sources"
     ),
@@ -734,7 +734,7 @@ let package = Package(
         "FirebaseAuthInterop",
         "FirebaseMessagingInterop",
         "SharedTestUtilities",
-        .product(name: "FirebaseAppCheckInterop", package: "interop-ios-for-google-sdks"),
+        .product(name: "InteropForFirebaseAppCheck", package: "interop-ios-for-google-sdks"),
       ],
       path: "FirebaseFunctions/Tests/Unit",
       cSettings: [
@@ -984,7 +984,7 @@ let package = Package(
         "FirebaseAuthInterop",
         "FirebaseMessagingInterop",
         "GoogleDataTransport",
-        .product(name: "FirebaseAppCheckInterop", package: "interop-ios-for-google-sdks"),
+        .product(name: "InteropForFirebaseAppCheck", package: "interop-ios-for-google-sdks"),
         .product(name: "OCMock", package: "ocmock"),
       ],
       path: "SharedTestUtilities",
@@ -1175,9 +1175,9 @@ let package = Package(
         "FirebaseAuthInterop",
         "FirebaseCore",
         "FirebaseCoreExtension",
-        .product(name: "FirebaseAppCheckInterop", package: "interop-ios-for-google-sdks"),
         .product(name: "GTMSessionFetcherCore", package: "gtm-session-fetcher"),
         .product(name: "GULEnvironment", package: "GoogleUtilities"),
+        .product(name: "InteropForFirebaseAppCheck", package: "interop-ios-for-google-sdks"),
       ],
       path: "FirebaseStorage/Sources"
     ),
@@ -1294,9 +1294,9 @@ let package = Package(
               "FirebaseCore",
               .product(name: "AppCheckCore", package: "app-check"),
               .product(name: "FBLPromises", package: "Promises"),
-              .product(name: "FirebaseAppCheckInterop", package: "interop-ios-for-google-sdks"),
               .product(name: "GULEnvironment", package: "GoogleUtilities"),
               .product(name: "GULUserDefaults", package: "GoogleUtilities"),
+              .product(name: "InteropForFirebaseAppCheck", package: "interop-ios-for-google-sdks"),
             ],
             path: "FirebaseAppCheck/Sources",
             publicHeadersPath: "Public",
@@ -1361,7 +1361,7 @@ let package = Package(
         "FirebaseAuthInterop",
         "FirebaseCore",
         "FirebaseCoreExtension",
-        .product(name: "FirebaseAppCheckInterop", package: "interop-ios-for-google-sdks"),
+        .product(name: "InteropForFirebaseAppCheck", package: "interop-ios-for-google-sdks"),
       ],
       path: "FirebaseVertexAI/Sources"
     ),
@@ -1469,7 +1469,7 @@ func firestoreTargets() -> [Target] {
           .product(name: "nanopb", package: "nanopb"),
           .product(name: "abseil", package: "abseil-cpp-SwiftPM"),
           .product(name: "gRPC-cpp", package: "grpc-ios"),
-          .product(name: "FirebaseAppCheckInterop", package: "interop-ios-for-google-sdks"),
+          .product(name: "InteropForFirebaseAppCheck", package: "interop-ios-for-google-sdks"),
         ],
         path: "Firestore",
         exclude: [
@@ -1596,7 +1596,7 @@ func firestoreTargets() -> [Target] {
           condition: .when(platforms: [.iOS, .macCatalyst, .tvOS, .macOS])
         ),
         .product(name: "nanopb", package: "nanopb"),
-        .product(name: "FirebaseAppCheckInterop", package: "interop-ios-for-google-sdks"),
+        .product(name: "InteropForFirebaseAppCheck", package: "interop-ios-for-google-sdks"),
         "FirebaseCore",
         "FirebaseCoreExtension",
         "leveldb",