diff --git a/FirebaseAppCheck.podspec b/FirebaseAppCheck.podspec index 1b6e35df709..16e88889ea2 100644 --- a/FirebaseAppCheck.podspec +++ b/FirebaseAppCheck.podspec @@ -44,7 +44,7 @@ Pod::Spec.new do |s| s.osx.weak_framework = 'DeviceCheck' s.tvos.weak_framework = 'DeviceCheck' - s.dependency 'FirebaseAppCheckInterop', '~> 10.16' + s.dependency 'FirebaseAppCheckInterop', '~> 10.17' s.dependency 'FirebaseCore', '~> 10.0' s.dependency 'PromisesObjC', '~> 2.1' s.dependency 'GoogleUtilities/Environment', '~> 7.8' diff --git a/FirebaseAppCheck/CHANGELOG.md b/FirebaseAppCheck/CHANGELOG.md index 45d760533d6..72cb7e51d76 100644 --- a/FirebaseAppCheck/CHANGELOG.md +++ b/FirebaseAppCheck/CHANGELOG.md @@ -1,3 +1,7 @@ +# 10.17.0 +- [fixed] Replaced semantic imports (`@import FirebaseAppCheckInterop`) with umbrella header imports + (`#import `) for ObjC++ compatibility (#11916). + # 10.9.0 - [feature] Added `limitedUseToken(completion:)` for obtaining limited-use tokens for protecting non-Firebase backends. (#11086) diff --git a/FirebaseAppCheck/Interop/CMakeLists.txt b/FirebaseAppCheck/Interop/CMakeLists.txt index abebc9f840d..59241d61fba 100644 --- a/FirebaseAppCheck/Interop/CMakeLists.txt +++ b/FirebaseAppCheck/Interop/CMakeLists.txt @@ -16,7 +16,7 @@ if(NOT APPLE) return() endif() -file(GLOB headers *.h) +file(GLOB headers Public/FirebaseAppCheckInterop/*.h) firebase_ios_generate_dummy_source(FirebaseAppCheckInterop sources) firebase_ios_add_framework( diff --git a/FirebaseAppCheck/Interop/FIRAppCheckInterop.h b/FirebaseAppCheck/Interop/Public/FirebaseAppCheckInterop/FIRAppCheckInterop.h similarity index 100% rename from FirebaseAppCheck/Interop/FIRAppCheckInterop.h rename to FirebaseAppCheck/Interop/Public/FirebaseAppCheckInterop/FIRAppCheckInterop.h diff --git a/FirebaseAppCheck/Interop/FIRAppCheckProtocol.h b/FirebaseAppCheck/Interop/Public/FirebaseAppCheckInterop/FIRAppCheckProtocol.h similarity index 100% rename from FirebaseAppCheck/Interop/FIRAppCheckProtocol.h rename to FirebaseAppCheck/Interop/Public/FirebaseAppCheckInterop/FIRAppCheckProtocol.h diff --git a/FirebaseAppCheck/Interop/FIRAppCheckTokenResultInterop.h b/FirebaseAppCheck/Interop/Public/FirebaseAppCheckInterop/FIRAppCheckTokenResultInterop.h similarity index 100% rename from FirebaseAppCheck/Interop/FIRAppCheckTokenResultInterop.h rename to FirebaseAppCheck/Interop/Public/FirebaseAppCheckInterop/FIRAppCheckTokenResultInterop.h diff --git a/FirebaseAppCheck/Interop/Public/FirebaseAppCheckInterop/FirebaseAppCheckInterop.h b/FirebaseAppCheck/Interop/Public/FirebaseAppCheckInterop/FirebaseAppCheckInterop.h new file mode 100644 index 00000000000..afe5f651d9c --- /dev/null +++ b/FirebaseAppCheck/Interop/Public/FirebaseAppCheckInterop/FirebaseAppCheckInterop.h @@ -0,0 +1,19 @@ +/* + * Copyright 2023 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#import "FIRAppCheckInterop.h" +#import "FIRAppCheckProtocol.h" +#import "FIRAppCheckTokenResultInterop.h" diff --git a/FirebaseAppCheck/Sources/Core/FIRAppCheck.m b/FirebaseAppCheck/Sources/Core/FIRAppCheck.m index 0db878977dd..7c1b4f5cbe7 100644 --- a/FirebaseAppCheck/Sources/Core/FIRAppCheck.m +++ b/FirebaseAppCheck/Sources/Core/FIRAppCheck.m @@ -16,7 +16,7 @@ #import "FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheck.h" -@import FirebaseAppCheckInterop; +#import #if __has_include() #import diff --git a/FirebaseAppCheck/Sources/Core/FIRAppCheckComponent.m b/FirebaseAppCheck/Sources/Core/FIRAppCheckComponent.m index 9b1ee703bbd..b6c2c768649 100644 --- a/FirebaseAppCheck/Sources/Core/FIRAppCheckComponent.m +++ b/FirebaseAppCheck/Sources/Core/FIRAppCheckComponent.m @@ -16,7 +16,7 @@ #import -@import FirebaseAppCheckInterop; +#import #import "FirebaseAppCheck/Sources/Core/FIRAppCheck+Internal.h" #import "FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheck.h" diff --git a/FirebaseAppCheck/Sources/Core/FIRAppCheckTokenResult.h b/FirebaseAppCheck/Sources/Core/FIRAppCheckTokenResult.h index 061516e2be4..37b57b2adef 100644 --- a/FirebaseAppCheck/Sources/Core/FIRAppCheckTokenResult.h +++ b/FirebaseAppCheck/Sources/Core/FIRAppCheckTokenResult.h @@ -16,7 +16,7 @@ #import -@import FirebaseAppCheckInterop; +#import NS_ASSUME_NONNULL_BEGIN diff --git a/FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheck.h b/FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheck.h index 9cdc31344da..4005ee35b57 100644 --- a/FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheck.h +++ b/FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheck.h @@ -16,7 +16,7 @@ #import -@import FirebaseAppCheckInterop; +#import @class FIRApp; @class FIRAppCheckToken; diff --git a/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckIntegrationTests.m b/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckIntegrationTests.m index 2f43cb6f07c..6cb3f4accc9 100644 --- a/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckIntegrationTests.m +++ b/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckIntegrationTests.m @@ -18,7 +18,7 @@ #import -@import FirebaseAppCheckInterop; +#import #import "FirebaseAppCheck/Sources/Core/TokenRefresh/FIRAppCheckTokenRefresher.h" #import "FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheck.h" diff --git a/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckTests.m b/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckTests.m index 163a1222616..8ad5428d5c8 100644 --- a/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckTests.m +++ b/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckTests.m @@ -20,7 +20,7 @@ #import "FBLPromise+Testing.h" -@import FirebaseAppCheckInterop; +#import #import "FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheck.h" #import "FirebaseAppCheck/Sources/Public/FirebaseAppCheck/FIRAppCheckErrors.h" diff --git a/FirebaseAppCheckInterop.podspec b/FirebaseAppCheckInterop.podspec index 092bc995a94..4263cd6dacc 100644 --- a/FirebaseAppCheckInterop.podspec +++ b/FirebaseAppCheckInterop.podspec @@ -25,6 +25,6 @@ Pod::Spec.new do |s| s.tvos.deployment_target = '12.0' s.watchos.deployment_target = '6.0' - s.source_files = 'FirebaseAppCheck/Interop/*.[hm]' - s.public_header_files = 'FirebaseAppCheck/Interop/*.h' + s.source_files = 'FirebaseAppCheck/Interop/**/*.[hm]' + s.public_header_files = 'FirebaseAppCheck/Interop/Public/FirebaseAppCheck/*.h' end diff --git a/FirebaseAuth.podspec b/FirebaseAuth.podspec index 498c12eaa95..3d892168806 100644 --- a/FirebaseAuth.podspec +++ b/FirebaseAuth.podspec @@ -39,7 +39,6 @@ supports email and password accounts, as well as several 3rd party authenticatio source + '**/*.[mh]', 'FirebaseCore/Extension/*.h', 'FirebaseAuth/Interop/*.h', - 'FirebaseAppCheck/Interop/*.h', ] s.public_header_files = source + 'Public/FirebaseAuth/*.h' s.preserve_paths = [ @@ -52,7 +51,7 @@ supports email and password accounts, as well as several 3rd party authenticatio } s.framework = 'Security' s.ios.framework = 'SafariServices' - s.dependency 'FirebaseAppCheckInterop', '~> 10.0' + s.dependency 'FirebaseAppCheckInterop', '~> 10.17' s.dependency 'FirebaseCore', '~> 10.0' s.dependency 'GoogleUtilities/AppDelegateSwizzler', '~> 7.8' s.dependency 'GoogleUtilities/Environment', '~> 7.8' diff --git a/FirebaseAuth/Sources/Auth/FIRAuth.m b/FirebaseAuth/Sources/Auth/FIRAuth.m index 092d357b04e..03c56b780de 100644 --- a/FirebaseAuth/Sources/Auth/FIRAuth.m +++ b/FirebaseAuth/Sources/Auth/FIRAuth.m @@ -22,13 +22,11 @@ #import #endif +#import + #import #import #import -#import "FirebaseAuth/Sources/Public/FirebaseAuth/FirebaseAuth.h" -#import "FirebaseCore/Extension/FirebaseCoreInternal.h" - -#import "FirebaseAppCheck/Interop/FIRAppCheckInterop.h" #import "FirebaseAuth/Sources/Auth/FIRAuthDataResult_Internal.h" #import "FirebaseAuth/Sources/Auth/FIRAuthDispatcher.h" #import "FirebaseAuth/Sources/Auth/FIRAuthGlobalWorkQueue.h" @@ -65,6 +63,7 @@ #import "FirebaseAuth/Sources/Backend/RPC/FIRVerifyPasswordResponse.h" #import "FirebaseAuth/Sources/Backend/RPC/FIRVerifyPhoneNumberRequest.h" #import "FirebaseAuth/Sources/Backend/RPC/FIRVerifyPhoneNumberResponse.h" +#import "FirebaseAuth/Sources/Public/FirebaseAuth/FirebaseAuth.h" #import "FirebaseAuth/Sources/Storage/FIRAuthKeychainServices.h" #import "FirebaseAuth/Sources/SystemService/FIRAuthStoredUserManager.h" #import "FirebaseAuth/Sources/User/FIRAdditionalUserInfo_Internal.h" @@ -72,6 +71,7 @@ #import "FirebaseAuth/Sources/Utilities/FIRAuthErrorUtils.h" #import "FirebaseAuth/Sources/Utilities/FIRAuthExceptionUtils.h" #import "FirebaseAuth/Sources/Utilities/FIRAuthWebUtils.h" +#import "FirebaseCore/Extension/FirebaseCoreInternal.h" #if TARGET_OS_IOS #import "FirebaseAuth/Sources/AuthProvider/Phone/FIRPhoneAuthCredential_Internal.h" diff --git a/FirebaseAuth/Sources/AuthProvider/OAuth/FIROAuthProvider.m b/FirebaseAuth/Sources/AuthProvider/OAuth/FIROAuthProvider.m index cca6953da45..9cc364d33c0 100644 --- a/FirebaseAuth/Sources/AuthProvider/OAuth/FIROAuthProvider.m +++ b/FirebaseAuth/Sources/AuthProvider/OAuth/FIROAuthProvider.m @@ -15,12 +15,14 @@ */ #import "FirebaseAuth/Sources/Public/FirebaseAuth/FIROAuthProvider.h" + +#import + #include #import "FirebaseAuth/Sources/Public/FirebaseAuth/FIRFacebookAuthProvider.h" #import "FirebaseAuth/Sources/Public/FirebaseAuth/FIROAuthCredential.h" #import "FirebaseCore/Extension/FirebaseCoreInternal.h" -#import "FirebaseAppCheck/Interop/FIRAppCheckTokenResultInterop.h" #import "FirebaseAuth/Sources/Auth/FIRAuthGlobalWorkQueue.h" #import "FirebaseAuth/Sources/Auth/FIRAuth_Internal.h" #import "FirebaseAuth/Sources/AuthProvider/OAuth/FIROAuthCredential_Internal.h" diff --git a/FirebaseAuth/Sources/AuthProvider/Phone/FIRPhoneAuthProvider.m b/FirebaseAuth/Sources/AuthProvider/Phone/FIRPhoneAuthProvider.m index b09ecbf6559..d1faf91ffa8 100644 --- a/FirebaseAuth/Sources/AuthProvider/Phone/FIRPhoneAuthProvider.m +++ b/FirebaseAuth/Sources/AuthProvider/Phone/FIRPhoneAuthProvider.m @@ -17,12 +17,13 @@ #import #if TARGET_OS_IOS && (!defined(TARGET_OS_VISION) || !TARGET_OS_VISION) +#import + #import "FirebaseAuth/Sources/Public/FirebaseAuth/FIRAuthSettings.h" #import "FirebaseAuth/Sources/Public/FirebaseAuth/FIRMultiFactorResolver.h" #import "FirebaseAuth/Sources/Public/FirebaseAuth/FIRPhoneAuthProvider.h" #import "FirebaseCore/Extension/FirebaseCoreInternal.h" -#import "FirebaseAppCheck/Interop/FIRAppCheckTokenResultInterop.h" #import "FirebaseAuth/Sources/Auth/FIRAuthGlobalWorkQueue.h" #import "FirebaseAuth/Sources/Auth/FIRAuth_Internal.h" #import "FirebaseAuth/Sources/Backend/FIRAuthBackend+MultiFactor.h" diff --git a/FirebaseAuth/Sources/Backend/FIRAuthBackend.m b/FirebaseAuth/Sources/Backend/FIRAuthBackend.m index 6588611cc1a..ccf2c990f38 100644 --- a/FirebaseAuth/Sources/Backend/FIRAuthBackend.m +++ b/FirebaseAuth/Sources/Backend/FIRAuthBackend.m @@ -23,10 +23,10 @@ #import #endif +#import + #import "FirebaseAuth/Sources/Public/FirebaseAuth/FirebaseAuth.h" -#import "FirebaseAppCheck/Interop/FIRAppCheckInterop.h" -#import "FirebaseAppCheck/Interop/FIRAppCheckTokenResultInterop.h" #import "FirebaseAuth/Sources/Auth/FIRAuthGlobalWorkQueue.h" #import "FirebaseAuth/Sources/Auth/FIRAuth_Internal.h" #import "FirebaseAuth/Sources/AuthProvider/OAuth/FIROAuthCredential_Internal.h" diff --git a/FirebaseAuth/Sources/Backend/FIRAuthRequestConfiguration.h b/FirebaseAuth/Sources/Backend/FIRAuthRequestConfiguration.h index 1801f1a9680..3a5e4b84275 100644 --- a/FirebaseAuth/Sources/Backend/FIRAuthRequestConfiguration.h +++ b/FirebaseAuth/Sources/Backend/FIRAuthRequestConfiguration.h @@ -16,7 +16,8 @@ #import -#import "FirebaseAppCheck/Interop/FIRAppCheckInterop.h" +#import + #import "FirebaseAuth/Sources/Backend/FIRAuthRPCRequest.h" #import "FirebaseAuth/Sources/Public/FirebaseAuth/FIRAuth.h" diff --git a/FirebaseAuth/Tests/Sample/Podfile b/FirebaseAuth/Tests/Sample/Podfile index cd27240cee5..86e81c13d49 100644 --- a/FirebaseAuth/Tests/Sample/Podfile +++ b/FirebaseAuth/Tests/Sample/Podfile @@ -10,6 +10,7 @@ use_frameworks! target 'AuthSample' do platform :ios, '11.0' + pod 'FirebaseAppCheckInterop', :path => '../../../' pod 'FirebaseCore', :path => '../../../' pod 'FirebaseCoreInternal', :path => '../../../' pod 'FirebaseAuth', :path => '../../../', :testspecs => ['unit'] diff --git a/FirebaseAuth/Tests/Unit/FIRFakeAppCheck.h b/FirebaseAuth/Tests/Unit/FIRFakeAppCheck.h index 6957bcbb3fe..317c6ba4216 100644 --- a/FirebaseAuth/Tests/Unit/FIRFakeAppCheck.h +++ b/FirebaseAuth/Tests/Unit/FIRFakeAppCheck.h @@ -14,8 +14,8 @@ * limitations under the License. */ #import -#import "FirebaseAppCheck/Interop/FIRAppCheckInterop.h" -#import "FirebaseAppCheck/Interop/FIRAppCheckTokenResultInterop.h" + +#import NS_ASSUME_NONNULL_BEGIN diff --git a/FirebaseAuth/Tests/Unit/FIRFakeAppCheck.m b/FirebaseAuth/Tests/Unit/FIRFakeAppCheck.m index c103800ca50..8633000475f 100644 --- a/FirebaseAuth/Tests/Unit/FIRFakeAppCheck.m +++ b/FirebaseAuth/Tests/Unit/FIRFakeAppCheck.m @@ -14,8 +14,10 @@ * limitations under the License. */ #import "FirebaseAuth/Tests/Unit/FIRFakeAppCheck.h" + #import -#import "FirebaseAppCheck/Interop/FIRAppCheckTokenResultInterop.h" + +#import #pragma mark - FIRFakeAppCheckResult diff --git a/FirebaseDatabase.podspec b/FirebaseDatabase.podspec index 17be9230b04..32b0bc64b99 100644 --- a/FirebaseDatabase.podspec +++ b/FirebaseDatabase.podspec @@ -48,7 +48,7 @@ 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.16' + s.dependency 'FirebaseAppCheckInterop', '~> 10.17' s.pod_target_xcconfig = { 'GCC_C_LANGUAGE_STANDARD' => 'c99', 'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"' diff --git a/FirebaseDatabase/Sources/Api/FIRDatabaseComponent.m b/FirebaseDatabase/Sources/Api/FIRDatabaseComponent.m index 4ea5a9249c4..6a65b8e91f3 100644 --- a/FirebaseDatabase/Sources/Api/FIRDatabaseComponent.m +++ b/FirebaseDatabase/Sources/Api/FIRDatabaseComponent.m @@ -23,7 +23,7 @@ #import "FirebaseAuth/Interop/FIRAuthInterop.h" #import "FirebaseCore/Extension/FirebaseCoreInternal.h" -@import FirebaseAppCheckInterop; +#import NS_ASSUME_NONNULL_BEGIN diff --git a/FirebaseDatabase/Sources/Login/FIRDatabaseConnectionContextProvider.m b/FirebaseDatabase/Sources/Login/FIRDatabaseConnectionContextProvider.m index 09977746f4d..358a26d1e70 100644 --- a/FirebaseDatabase/Sources/Login/FIRDatabaseConnectionContextProvider.m +++ b/FirebaseDatabase/Sources/Login/FIRDatabaseConnectionContextProvider.m @@ -23,7 +23,7 @@ #import "FirebaseDatabase/Sources/Api/Private/FIRDatabaseQuery_Private.h" #import "FirebaseDatabase/Sources/Utilities/FUtilities.h" -@import FirebaseAppCheckInterop; +#import NS_ASSUME_NONNULL_BEGIN diff --git a/FirebaseFirestore.podspec b/FirebaseFirestore.podspec index 958c1bc0d21..d846ca519bb 100644 --- a/FirebaseFirestore.podspec +++ b/FirebaseFirestore.podspec @@ -44,7 +44,6 @@ Google Cloud Firestore is a NoSQL document database built for automatic scaling, # version wins in the global header map. The benefit of keeping them here is # that "quick open" by filename in Xcode will continue to work. s.source_files = [ - 'FirebaseAppCheck/Interop/*.h', 'FirebaseCore/Extension/*.h', 'Firestore/Source/Public/FirebaseFirestore/*.h', 'Firestore/Source/**/*.{m,mm}', @@ -88,6 +87,7 @@ Google Cloud Firestore is a NoSQL document database built for automatic scaling, 'Firestore/core/src/util/secure_random_openssl.cc' ] + s.dependency 'FirebaseAppCheckInterop', '~> 10.17' s.dependency 'FirebaseCore', '~> 10.0' abseil_version = '~> 1.20220623.0' diff --git a/Firestore/Example/Podfile b/Firestore/Example/Podfile index b45aded35eb..b21e5c0befe 100644 --- a/Firestore/Example/Podfile +++ b/Firestore/Example/Podfile @@ -61,6 +61,7 @@ def configure_local_pods() # FirebaseCore must always be a local pod so that CI builds that make changes # to its podspec can still function. See Firestore-*-xcodebuild in # scripts/install_prereqs.sh for more details. + pod 'FirebaseAppCheckInterop', :path => '../..' pod 'FirebaseCore', :path => '../..' pod 'FirebaseCoreInternal', :path => '../..' pod 'FirebaseCoreExtension',:path => '../..' diff --git a/Firestore/Source/API/FSTFirestoreComponent.mm b/Firestore/Source/API/FSTFirestoreComponent.mm index 91cc303cd30..286576610b0 100644 --- a/Firestore/Source/API/FSTFirestoreComponent.mm +++ b/Firestore/Source/API/FSTFirestoreComponent.mm @@ -16,11 +16,12 @@ #import "Firestore/Source/API/FSTFirestoreComponent.h" +#import + #include #include #include -#import "FirebaseAppCheck/Interop/FIRAppCheckInterop.h" #import "FirebaseAuth/Interop/FIRAuthInterop.h" #import "FirebaseCore/Extension/FIRAppInternal.h" #import "FirebaseCore/Extension/FIRComponent.h" diff --git a/Firestore/Source/CMakeLists.txt b/Firestore/Source/CMakeLists.txt index 6a3e06cd715..4ecb4ee3e38 100644 --- a/Firestore/Source/CMakeLists.txt +++ b/Firestore/Source/CMakeLists.txt @@ -28,6 +28,7 @@ firebase_ios_framework_public_headers(FirebaseFirestore ${headers}) target_link_libraries( FirebaseFirestore PUBLIC + FirebaseAppCheckInterop FirebaseAuthInterop FirebaseCore absl_strings diff --git a/Firestore/core/CMakeLists.txt b/Firestore/core/CMakeLists.txt index 4663119d440..09f7da76308 100644 --- a/Firestore/core/CMakeLists.txt +++ b/Firestore/core/CMakeLists.txt @@ -267,6 +267,7 @@ if(APPLE) firestore_core PUBLIC "-framework Foundation" "-framework SystemConfiguration" + FirebaseAppCheckInterop FirebaseAuthInterop FirebaseCore ) diff --git a/Firestore/core/src/credentials/firebase_app_check_credentials_provider_apple.mm b/Firestore/core/src/credentials/firebase_app_check_credentials_provider_apple.mm index a45f1401ce1..9afb38e0eae 100644 --- a/Firestore/core/src/credentials/firebase_app_check_credentials_provider_apple.mm +++ b/Firestore/core/src/credentials/firebase_app_check_credentials_provider_apple.mm @@ -16,8 +16,8 @@ #include "Firestore/core/src/credentials/firebase_app_check_credentials_provider_apple.h" -#import "FirebaseAppCheck/Interop/FIRAppCheckInterop.h" -#import "FirebaseAppCheck/Interop/FIRAppCheckTokenResultInterop.h" +#import + #import "FirebaseCore/Extension/FIRAppInternal.h" #include "Firestore/core/src/util/error_apple.h" diff --git a/Firestore/core/test/unit/credentials/firebase_app_check_credentials_provider_test.mm b/Firestore/core/test/unit/credentials/firebase_app_check_credentials_provider_test.mm index e3ebd47d2a1..af5a0f35ec3 100644 --- a/Firestore/core/test/unit/credentials/firebase_app_check_credentials_provider_test.mm +++ b/Firestore/core/test/unit/credentials/firebase_app_check_credentials_provider_test.mm @@ -16,11 +16,11 @@ #include "Firestore/core/src/credentials/firebase_app_check_credentials_provider_apple.h" +#import + #include // NOLINT(build/c++11) #include // NOLINT(build/c++11) -#import "FirebaseAppCheck/Interop/FIRAppCheckInterop.h" -#import "FirebaseAppCheck/Interop/FIRAppCheckTokenResultInterop.h" #import "FirebaseCore/Extension/FIRAppInternal.h" #include "Firestore/core/test/unit/testutil/app_testing.h" diff --git a/Package.swift b/Package.swift index d15256bcf62..7d641c55d28 100644 --- a/Package.swift +++ b/Package.swift @@ -422,6 +422,7 @@ let package = Package( .target( name: "FirebaseAuth", dependencies: [ + "FirebaseAppCheckInterop", "FirebaseCore", .product(name: "GULAppDelegateSwizzler", package: "GoogleUtilities"), .product(name: "GULEnvironment", package: "GoogleUtilities"), @@ -1241,7 +1242,7 @@ let package = Package( exclude: [ "CMakeLists.txt", ], - publicHeadersPath: ".", + publicHeadersPath: "Public", cSettings: [ .headerSearchPath("../../"), ] @@ -1387,6 +1388,7 @@ func firestoreTarget() -> Target { return .target( name: "FirebaseFirestore", dependencies: [ + "FirebaseAppCheckInterop", "FirebaseCore", "leveldb", .product(name: "nanopb", package: "nanopb"), diff --git a/SharedTestUtilities/AppCheckFake/FIRAppCheckFake.h b/SharedTestUtilities/AppCheckFake/FIRAppCheckFake.h index a2e0437e1f2..100d9305818 100644 --- a/SharedTestUtilities/AppCheckFake/FIRAppCheckFake.h +++ b/SharedTestUtilities/AppCheckFake/FIRAppCheckFake.h @@ -16,7 +16,7 @@ #import -@import FirebaseAppCheckInterop; +#import NS_ASSUME_NONNULL_BEGIN diff --git a/SharedTestUtilities/AppCheckFake/FIRAppCheckTokenResultFake.h b/SharedTestUtilities/AppCheckFake/FIRAppCheckTokenResultFake.h index eed4169dac9..0fa4ea4c578 100644 --- a/SharedTestUtilities/AppCheckFake/FIRAppCheckTokenResultFake.h +++ b/SharedTestUtilities/AppCheckFake/FIRAppCheckTokenResultFake.h @@ -16,7 +16,7 @@ #import -@import FirebaseAppCheckInterop; +#import NS_ASSUME_NONNULL_BEGIN diff --git a/scripts/check_imports.swift b/scripts/check_imports.swift index 6bb093e02cf..a7519c98e18 100755 --- a/scripts/check_imports.swift +++ b/scripts/check_imports.swift @@ -161,7 +161,10 @@ private func checkFile(_ file: String, logger: ErrorLogger, inRepo repoURL: URL, } } else if importFile.first == "<", !isPrivate, !isTestFile, !isBridgingHeader, !isPublic { // Verify that double quotes are always used for intra-module imports. - if importFileRaw.starts(with: "Firebase") { + if importFileRaw.starts(with: "Firebase"), + // Allow intra-module imports of FirebaseAppCheckInterop. + // TODO: Remove the FirebaseAppCheckInterop exception when it's moved to a separate repo. + importFile.range(of: "FirebaseAppCheckInterop/FirebaseAppCheckInterop.h") == nil { logger .importLog("Imports internal to the repo should use double quotes not \"<\"", file, lineNum)