Merge remote-tracking branch 'origin/master' into snappy2

Author: dconeybe

.github/workflows/functions.yml

@@ -30,8 +30,7 @@ jobs:
     runs-on: macos-11
     strategy:
       matrix:
-        # TODO: The --skip-tests might be removable with Xcode 13.2+
-        target: [ios, tvos, macos --skip-tests, watchos]
+        target: [ios, tvos, macos, watchos]
     steps:
     - uses: actions/checkout@v2
     - name: Setup Bundler

CoreOnly/Sources/Firebase.h

@@ -51,7 +51,7 @@
   #endif
 
   #if __has_include("FirebaseFunctions-umbrella.h")
-@import FirebaseFunctions;
+    #import <FirebaseFunctions/FirebaseFunctions-Swift.h>
   #endif
 
   #if __has_include(<FirebaseInAppMessaging/FirebaseInAppMessaging.h>)
@@ -75,7 +75,7 @@
   #endif
 
   #if __has_include("FirebaseStorage-umbrella.h")
-@import FirebaseStorage;
+    #import <FirebaseStorage/FirebaseStorage-Swift.h>
   #endif
 
 #endif  // defined(__has_include)

CoreOnly/Tests/FirebasePodTest/FirebasePodTest/AppDelegate.swift

@@ -18,7 +18,6 @@ import Firebase
 import FirebaseAnalyticsSwift
 import FirebaseFirestoreSwift
 import FirebaseInAppMessagingSwift
-import FirebaseStorage
 
 class CoreExists: FirebaseApp {}
 class AnalyticsExists: Analytics {}

FirebaseCore/CHANGELOG.md

@@ -3,6 +3,18 @@
 - [added] The zip and Carthage distibutions now include the Swift extension frameworks. (#7819)
 - [changed] **Breaking change**: Update the minimum supported versions for the zip and Carthage
   distributions to iOS 11.0, tvOS 11.0 and macOS 10.13. (#9633)
+- [changed] **Breaking change**: CocoaPods Podfiles must include `use_frameworks!` or
+  `use_frameworks! :linkage => :static`.
+- [deprecated] Usage of the Firebase pod, the Firebase module (`import Firebase`), and `Firebase.h`
+  is deprecated. Use the specific Firebase product instead like: `pod 'FirebaseMessaging'` and
+  `import FirebaseMessaging`.
+- [changed] For Swift Package Manager installations, `import Firebase` will no longer implicitly
+  import Firebase Storage and Firebase Functions APIs. Use `import FirebaseStorage` and
+  `import FirebaseFunctions`.
+- [changed] C++/Objective C++ clients should use `#import <FirebaseFunctions/FirebaseFunctions-Swift.h>`
+  and `#import <FirebaseStorage/FirebaseStorage-Swift.h>` to access Functions and Storage APIs,
+  respectively. C++/Objective C++ clients using Swift Package Manager should find alternative
+  workarounds at https://forums.swift.org/t/importing-swift-libraries-from-objective-c/56730.
 
 # Firebase 8.10.0
 - [fixed] Fixed platform availability checks in Swift Package Manager that may prevent code

FirebaseFunctions.podspec

@@ -45,6 +45,17 @@ Cloud Functions for Firebase.
   s.dependency 'FirebaseSharedSwift', '~> 9.0'
   s.dependency 'GTMSessionFetcher/Core', '~> 1.5'
 
+  s.test_spec 'objc' do |objc_tests|
+    objc_tests.platforms = {
+      :ios => ios_deployment_target,
+      :osx => '10.15',
+      :tvos => tvos_deployment_target
+    }
+    objc_tests.source_files = [
+      'FirebaseFunctions/Tests/ObjCIntegration/ObjC*'
+    ]
+  end
+
   s.test_spec 'integration' do |int_tests|
     int_tests.platforms = {
       :ios => ios_deployment_target,

FirebaseFunctions/Tests/ObjCIntegration/ObjCAPITests.m

@@ -35,7 +35,7 @@ - (void)apis {
 
   FIRHTTPSCallable *callable = [func HTTPSCallableWithName:@"name"];
 
-  [func useEmulatorWithHost:@"host" port:@"port"];
+  [func useEmulatorWithHost:@"host" port:123];
 
 #pragma mark - HTTPSCallable and HTTPSCallableResult
   [callable
@@ -73,5 +73,6 @@ - (FIRFunctionsErrorCode)errorCodes:(NSError *)error {
     case FIRFunctionsErrorCodeUnauthenticated:
       return error.code;
   }
+  return error.code;
 }
 @end

FirebaseFunctions/Tests/ObjCIntegration/ObjCPPAPITests.mm

@@ -0,0 +1,78 @@
+// Copyright 2022 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 <XCTest/XCTest.h>
+
+#import <FirebaseFunctions/FirebaseFunctions-Swift.h>
+#import "FirebaseCore/FirebaseCore.h"
+
+@interface ObjCPPAPICoverage : XCTestCase
+@end
+
+@implementation ObjCPPAPICoverage
+
+- (void)apis {
+#pragma mark - Functions
+
+  FIRApp *app = [FIRApp defaultApp];
+  FIRFunctions *func = [FIRFunctions functions];
+  func = [FIRFunctions functionsForApp:app];
+  func = [FIRFunctions functionsForRegion:@"my-region"];
+  func = [FIRFunctions functionsForCustomDomain:@"my-domain"];
+  func = [FIRFunctions functionsForApp:app region:@"my-region"];
+  func = [FIRFunctions functionsForApp:app customDomain:@"my-domain"];
+
+  FIRHTTPSCallable *callable = [func HTTPSCallableWithName:@"name"];
+
+  [func useEmulatorWithHost:@"host" port:123];
+
+#pragma mark - HTTPSCallable and HTTPSCallableResult
+  [callable
+      callWithCompletion:^(FIRHTTPSCallableResult *_Nullable result, NSError *_Nullable error) {
+        __unused id data = result.data;
+      }];
+  [callable callWithObject:nil
+                completion:^(FIRHTTPSCallableResult *_Nullable result, NSError *_Nullable error) {
+                  [result data];
+                }];
+  callable.timeoutInterval = 60;
+  [callable timeoutInterval];
+}
+
+#pragma mark - FunctionsError
+
+- (FIRFunctionsErrorCode)errorCodes:(NSError *)error {
+  switch (error.code) {
+    case FIRFunctionsErrorCodeOK:
+    case FIRFunctionsErrorCodeCancelled:
+    case FIRFunctionsErrorCodeUnknown:
+    case FIRFunctionsErrorCodeInvalidArgument:
+    case FIRFunctionsErrorCodeDeadlineExceeded:
+    case FIRFunctionsErrorCodeNotFound:
+    case FIRFunctionsErrorCodeAlreadyExists:
+    case FIRFunctionsErrorCodePermissionDenied:
+    case FIRFunctionsErrorCodeResourceExhausted:
+    case FIRFunctionsErrorCodeFailedPrecondition:
+    case FIRFunctionsErrorCodeAborted:
+    case FIRFunctionsErrorCodeOutOfRange:
+    case FIRFunctionsErrorCodeUnimplemented:
+    case FIRFunctionsErrorCodeInternal:
+    case FIRFunctionsErrorCodeUnavailable:
+    case FIRFunctionsErrorCodeDataLoss:
+    case FIRFunctionsErrorCodeUnauthenticated:
+      return (FIRFunctionsErrorCode)error.code;
+  }
+  return (FIRFunctionsErrorCode)error.code;
+}
+@end

FirebaseStorage.podspec

@@ -54,7 +54,7 @@ Firebase Storage provides robust, secure file uploads and downloads from Firebas
     }
     objc_tests.source_files = [
       'FirebaseStorageInternal/Tests/Integration/*.[mh]',
-      'FirebaseStorage/Tests/ObjCIntegration/*.m',
+      'FirebaseStorage/Tests/ObjCIntegration/*.{m,mm}',
     ]
     objc_tests.requires_app_host = true
     objc_tests.resources = 'FirebaseStorageInternal/Tests/Integration/Resources/1mb.dat',

FirebaseStorage/Sources/StorageMetadata.swift

@@ -91,6 +91,18 @@ import FirebaseStorageInternal
     }
   }
 
+  /**
+   * Custom-Time of the object data.
+   */
+  @objc public var customTime: Date? {
+    get {
+      return impl.customTime
+    }
+    set(newValue) {
+      impl.customTime = newValue
+    }
+  }
+
   /**
    * MD5 hash of the data; encoded using base64.
    */

FirebaseStorage/Tests/Integration/StorageAsyncAwait.swift

@@ -276,12 +276,14 @@ import XCTest
 
     private func assertMetadata(actualMetadata: StorageMetadata,
                                 expectedContentType: String,
+                                expectedCustomTime: Date,
                                 expectedCustomMetadata: [String: String]) {
       XCTAssertEqual(actualMetadata.cacheControl, "cache-control")
       XCTAssertEqual(actualMetadata.contentDisposition, "content-disposition")
       XCTAssertEqual(actualMetadata.contentEncoding, "gzip")
       XCTAssertEqual(actualMetadata.contentLanguage, "de")
       XCTAssertEqual(actualMetadata.contentType, expectedContentType)
+      XCTAssertEqual(actualMetadata.customTime, expectedCustomTime)
       XCTAssertEqual(actualMetadata.md5Hash?.count, 24)
       for (key, value) in expectedCustomMetadata {
         XCTAssertEqual(actualMetadata.customMetadata![key], value)
@@ -294,6 +296,7 @@ import XCTest
       XCTAssertEqual(actualMetadata.contentEncoding, "identity")
       XCTAssertNil(actualMetadata.contentLanguage)
       XCTAssertNil(actualMetadata.contentType)
+      XCTAssertNil(actualMetadata.customTime)
       XCTAssertEqual(actualMetadata.md5Hash?.count, 24)
       XCTAssertNil(actualMetadata.customMetadata)
     }
@@ -307,26 +310,31 @@ import XCTest
       metadata.contentEncoding = "gzip"
       metadata.contentLanguage = "de"
       metadata.contentType = "content-type-a"
+      metadata.customTime = Date(timeIntervalSince1970: 0)
       metadata.customMetadata = ["a": "b"]
 
       let updatedMetadata = try await ref.updateMetadata(metadata)
       assertMetadata(actualMetadata: updatedMetadata,
                      expectedContentType: "content-type-a",
+                     expectedCustomTime: Date(timeIntervalSince1970: 0),
                      expectedCustomMetadata: ["a": "b"])
 
       let metadata2 = updatedMetadata
       metadata2.contentType = "content-type-b"
+      metadata.customTime = Date(timeIntervalSince1970: 100)
       metadata2.customMetadata = ["a": "b", "c": "d"]
 
       let metadata3 = try await ref.updateMetadata(metadata2)
       assertMetadata(actualMetadata: metadata3,
                      expectedContentType: "content-type-b",
+                     expectedCustomTime: Date(timeIntervalSince1970: 100),
                      expectedCustomMetadata: ["a": "b", "c": "d"])
       metadata.cacheControl = nil
       metadata.contentDisposition = nil
       metadata.contentEncoding = nil
       metadata.contentLanguage = nil
       metadata.contentType = nil
+      metadata.customTime = nil
       metadata.customMetadata = nil
       let metadata4 = try await ref.updateMetadata(metadata)
       XCTAssertNotNil(metadata4)

FirebaseStorage/Tests/Integration/StorageIntegration.swift

@@ -417,12 +417,14 @@ class StorageResultTests: StorageIntegrationCommon {
 
   private func assertMetadata(actualMetadata: StorageMetadata,
                               expectedContentType: String,
+                              expectedCustomTime: Date,
                               expectedCustomMetadata: [String: String]) {
     XCTAssertEqual(actualMetadata.cacheControl, "cache-control")
     XCTAssertEqual(actualMetadata.contentDisposition, "content-disposition")
     XCTAssertEqual(actualMetadata.contentEncoding, "gzip")
     XCTAssertEqual(actualMetadata.contentLanguage, "de")
     XCTAssertEqual(actualMetadata.contentType, expectedContentType)
+    XCTAssertEqual(actualMetadata.customTime, expectedCustomTime)
     XCTAssertEqual(actualMetadata.md5Hash?.count, 24)
     for (key, value) in expectedCustomMetadata {
       XCTAssertEqual(actualMetadata.customMetadata![key], value)
@@ -435,6 +437,7 @@ class StorageResultTests: StorageIntegrationCommon {
     XCTAssertEqual(actualMetadata.contentEncoding, "identity")
     XCTAssertNil(actualMetadata.contentLanguage)
     XCTAssertNil(actualMetadata.contentType)
+    XCTAssertNil(actualMetadata.customTime)
     XCTAssertEqual(actualMetadata.md5Hash?.count, 24)
     XCTAssertNil(actualMetadata.customMetadata)
   }
@@ -449,6 +452,7 @@ class StorageResultTests: StorageIntegrationCommon {
     metadata.contentEncoding = "gzip"
     metadata.contentLanguage = "de"
     metadata.contentType = "content-type-a"
+    metadata.customTime = Date(timeIntervalSince1970: 0)
     metadata.customMetadata = ["a": "b"]
 
     ref.updateMetadata(metadata) { updatedMetadata, error in
@@ -460,23 +464,27 @@ class StorageResultTests: StorageIntegrationCommon {
       }
       self.assertMetadata(actualMetadata: updatedMetadata,
                           expectedContentType: "content-type-a",
+                          expectedCustomTime: Date(timeIntervalSince1970: 0),
                           expectedCustomMetadata: ["a": "b"])
 
       let metadata = updatedMetadata
       metadata.contentType = "content-type-b"
+      metadata.customTime = Date(timeIntervalSince1970: 100)
       metadata.customMetadata = ["a": "b", "c": "d"]
 
       ref.updateMetadata(metadata) { result in
         switch result {
         case let .success(updatedMetadata):
           self.assertMetadata(actualMetadata: updatedMetadata,
                               expectedContentType: "content-type-b",
+                              expectedCustomTime: Date(timeIntervalSince1970: 100),
                               expectedCustomMetadata: ["a": "b", "c": "d"])
           metadata.cacheControl = nil
           metadata.contentDisposition = nil
           metadata.contentEncoding = nil
           metadata.contentLanguage = nil
           metadata.contentType = nil
+          metadata.customTime = nil
           metadata.customMetadata = nil
           ref.updateMetadata(metadata) { result in
             self.assertResultSuccess(result)

FirebaseStorage/Tests/ObjCIntegration/ObjCAPITests.m

@@ -115,12 +115,6 @@ - (void)FIRStorageConstantsTypedefs {
 }
 #endif
 
-#ifdef Firebase9Breaking
-- (NSString *)FIRStorageConstantsGlobal {
-  return FIRStorageErrorDomain;
-}
-#endif
-
 - (void)FIRStorageListResultApis:(FIRStorageListResult *)result {
   NSArray<FIRStorageReference *> __unused *prefixes = [result prefixes];
   NSArray<FIRStorageReference *> __unused *items = [result items];