firebase · 1amageek · Jan 28, 2019 · Jan 29, 2019 · Jan 29, 2019 · Jan 29, 2019
diff --git a/.gitignore b/.gitignore
@@ -1,17 +1,16 @@
-Example/Auth/Sample/Sample.entitlements
-Example/Auth/Sample/GoogleService-Info_multi.plist
+Example/Auth/Sample/Application.plist
 Example/Auth/Sample/AuthCredentials.h
+Example/Auth/Sample/GoogleService-Info_multi.plist
 Example/Auth/Sample/GoogleService-Info.plist
-Example/Auth/Sample/Application.plist
-Example/Auth/SwiftSample/GoogleService-Info.plist
-Example/Auth/SwiftSample/Info.plist
-Example/Auth/SwiftSample/AuthCredentials.swift
+Example/Auth/Sample/Sample.entitlements
 Example/Auth/ApiTests/AuthCredentials.h
 
 Example/Database/App/GoogleService-Info.plist
 
 Example/Storage/App/GoogleService-Info.plist
 
+Secrets.tar
+
 # OS X
 .DS_Store
 
@@ -33,6 +32,13 @@ DerivedData
 *.hmap
 *.ipa
 
+# Swift Package Manager
+*/.build
+ZipBuilder/Packages
+ZipBuilder/*.xcodeproj
+ZipBuilder/Package.resolved
+
+
 # IntelliJ
 .idea
 
@@ -75,3 +81,6 @@ Ninja
 
 # Visual Studio
 /.vs
+
+# CocoaPods generate
+gen/
diff --git a/.travis.yml b/.travis.yml
@@ -13,13 +13,7 @@ jobs:
         - brew install clang-format
         - brew install swiftformat
       script:
-        - ./scripts/check_whitespace.sh
-        - ./scripts/check_copyright.sh
-        - ./scripts/check_no_module_imports.sh
-        - ./scripts/check_test_inclusion.py
-        - ./scripts/style.sh test-only $TRAVIS_COMMIT_RANGE
-        # Google C++ style compliance
-        - ./scripts/lint.sh $TRAVIS_COMMIT_RANGE
+        - ./scripts/check.sh --test-only $TRAVIS_COMMIT_RANGE
 
     # The order of builds matters (even though they are run in parallel):
     # Travis will schedule them in the same order they are listed here.
@@ -37,7 +31,17 @@ jobs:
 
     - stage: test
       env:
-        - PROJECT=InAppMessagingDisplay PLATFORM=iOS METHOD=xcodebuild
+        - PROJECT=Functions PLATFORM=iOS METHOD=pod-lib-lint
+      before_install:
+        - ./scripts/if_changed.sh ./scripts/install_prereqs.sh
+      script:
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.sh FirebaseFunctions.podspec
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.sh FirebaseFunctions.podspec --use-libraries
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.sh FirebaseFunctions.podspec --use-modular-headers
+
+    - stage: test
+      env:
+        - PROJECT=InAppMessaging PLATFORM=iOS METHOD=xcodebuild
       before_install:
         - ./scripts/if_changed.sh ./scripts/install_prereqs.sh
       script:
@@ -65,9 +69,10 @@ jobs:
         - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.sh FirebaseAuthInterop.podspec
         - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.sh FirebaseDatabase.podspec
         - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.sh FirebaseDynamicLinks.podspec
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.sh FirebaseInstanceID.podspec
         - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.sh FirebaseMessaging.podspec
         - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.sh FirebaseStorage.podspec
-        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.sh FirebaseFunctions.podspec
+        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.sh FirebaseInAppMessaging.podspec
         - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.sh FirebaseInAppMessagingDisplay.podspec
 
     - stage: test
@@ -78,7 +83,7 @@ jobs:
       script:
         # Eliminate the one warning from BoringSSL when CocoaPods 1.6.0 is available.
         # The travis_wait is necessary because the command takes more than 10 minutes.
-        - travis_wait 45 ./scripts/if_changed.sh ./scripts/pod_lib_lint.sh FirebaseFirestore.podspec --allow-warnings --no-subspecs
+        - travis_wait 30 ./scripts/if_changed.sh ./scripts/pod_lib_lint.sh FirebaseFirestore.podspec --platforms=ios --allow-warnings --no-subspecs
 
     # pod lib lint to check build and warnings for static library build - only on cron jobs
     - stage: test
@@ -94,10 +99,11 @@ jobs:
         - travis_retry ./scripts/if_cron.sh ./scripts/pod_lib_lint.sh FirebaseAuthInterop.podspec --use-libraries
         - travis_retry ./scripts/if_cron.sh ./scripts/pod_lib_lint.sh FirebaseDatabase.podspec --use-libraries
         - travis_retry ./scripts/if_cron.sh ./scripts/pod_lib_lint.sh FirebaseDynamicLinks.podspec --use-libraries
+        - travis_retry ./scripts/if_cron.sh ./scripts/pod_lib_lint.sh FirebaseInstanceID.podspec --use-libraries
         # The Protobuf dependency of FirebaseMessaging has warnings with --use-libraries
         - travis_retry ./scripts/if_cron.sh ./scripts/pod_lib_lint.sh FirebaseMessaging.podspec --use-libraries --allow-warnings
         - travis_retry ./scripts/if_cron.sh ./scripts/pod_lib_lint.sh FirebaseStorage.podspec --use-libraries
-        - travis_retry ./scripts/if_cron.sh ./scripts/pod_lib_lint.sh FirebaseFunctions.podspec --use-libraries
+        - travis_retry ./scripts/if_cron.sh ./scripts/pod_lib_lint.sh FirebaseInAppMessaging.podspec --use-libraries
         - travis_retry ./scripts/if_cron.sh ./scripts/pod_lib_lint.sh FirebaseInAppMessagingDisplay.podspec --use-libraries
 
     - stage: test
@@ -121,44 +127,7 @@ jobs:
 
     # Alternative platforms
 
-    # Xcode 9
-    - stage: test
-      osx_image: xcode9.4
-      env:
-        - PROJECT=Firebase PLATFORM=iOS METHOD=xcodebuild
-      before_install:
-        - npm install ios-sim -g
-        - ios-sim start --devicetypeid "com.apple.CoreSimulator.SimDeviceType.iPhone-8-Plus, 11.3"
-        - ./scripts/if_changed.sh ./scripts/install_prereqs.sh
-      script:
-        - travis_retry ./scripts/if_changed.sh ./scripts/build.sh $PROJECT $PLATFORM
-
-    - stage: test
-      osx_image: xcode9.4
-      env:
-        - PROJECT=InAppMessagingDisplay PLATFORM=iOS METHOD=xcodebuild
-      before_install:
-        - ./scripts/if_changed.sh ./scripts/install_prereqs.sh
-      script:
-        - travis_retry ./scripts/if_changed.sh ./scripts/build.sh $PROJECT $PLATFORM
-
-    - stage: test
-      osx_image: xcode9.4
-      env:
-        - PROJECT=Firestore PLATFORM=iOS METHOD=xcodebuild
-      before_install:
-        - ./scripts/if_changed.sh ./scripts/install_prereqs.sh
-      script:
-        - travis_retry ./scripts/if_changed.sh ./scripts/build.sh $PROJECT $PLATFORM $METHOD
-
-    - stage: test
-      env:
-        - PROJECT=Firestore PLATFORM=macOS METHOD=cmake
-      before_install:
-        - ./scripts/if_changed.sh ./scripts/install_prereqs.sh
-      script:
-        - travis_retry ./scripts/if_changed.sh ./scripts/build.sh $PROJECT $PLATFORM $METHOD
-
+    # Test Firestore on Xcode 8 to use old llvm to ensure C++ portability.
     - stage: test
       osx_image: xcode8.3
       env:
@@ -168,37 +137,6 @@ jobs:
       script:
         - travis_retry ./scripts/if_changed.sh ./scripts/build.sh $PROJECT $PLATFORM $METHOD
 
-    # Xcode 9 may find lint errors that don't show up in Xcode 10 (#2081)
-    - stage: test
-      osx_image: xcode9.4
-      env:
-        - PROJECT=Firebase PLATFORM=iOS METHOD=pod-lib-lint
-      before_install:
-        - ./scripts/if_changed.sh ./scripts/install_prereqs.sh
-      script:
-        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.sh GoogleUtilities.podspec
-        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.sh FirebaseCore.podspec
-        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.sh FirebaseAnalyticsInterop.podspec
-        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.sh FirebaseAuth.podspec
-        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.sh FirebaseAuthInterop.podspec
-        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.sh FirebaseDatabase.podspec
-        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.sh FirebaseDynamicLinks.podspec
-        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.sh FirebaseMessaging.podspec
-        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.sh FirebaseStorage.podspec
-        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.sh FirebaseFunctions.podspec
-        - travis_retry ./scripts/if_changed.sh ./scripts/pod_lib_lint.sh FirebaseInAppMessagingDisplay.podspec
-
-    - stage: test
-      osx_image: xcode9.4
-      env:
-        - PROJECT=Firestore PLATFORM=iOS METHOD=pod-lib-lint
-      before_install:
-        - ./scripts/if_changed.sh ./scripts/install_prereqs.sh
-      script:
-        # Eliminate the one warning from BoringSSL when CocoaPods 1.6.0 is available.
-        # The travis_wait is necessary because the command takes more than 10 minutes.
-        - travis_wait 45 ./scripts/if_changed.sh ./scripts/pod_lib_lint.sh FirebaseFirestore.podspec --allow-warnings --no-subspecs
-
     # Community-supported platforms
 
     - stage: test
@@ -278,6 +216,8 @@ jobs:
       - PROJECT=Firestore PLATFORM=iOS METHOD=xcodebuild SANITIZERS=asan
     - env:
       - PROJECT=Firestore PLATFORM=iOS METHOD=xcodebuild SANITIZERS=tsan
+    - env:
+      - PROJECT=InAppMessaging PLATFORM=iOS METHOD=xcodebuild
 
   # TODO(varconst): enable if it's possible to make this flag work on build
   # stages. It's supposed to avoid waiting for jobs that are allowed to fail

diff --git a/Carthage.md b/Carthage.md
@@ -44,6 +44,7 @@ binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseInvitesBinary.jso
 binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseMessagingBinary.json"
 binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseMLModelInterpreterBinary.json"
 binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseMLNLLanguageIDBinary.json"
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseMLNLSmartReplyBinary.json"
 binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseMLNaturalLanguageBinary.json"
 binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseMLVisionBarcodeModelBinary.json"
 binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseMLVisionBinary.json"
@@ -65,7 +66,7 @@ binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseStorageBinary.jso
     into the Xcode project and make sure they're added to the
     `Copy Bundle Resources` Build Phase :
     - For Firestore:
-        - ./Carthage/Build/iOS/FirebaseFirestore.framework/gRPCCertificates-Firestore.bundle
+        - ./Carthage/Build/iOS/FirebaseFirestore.framework/gRPCCertificates.bundle
     - For Invites:
         - ./Carthage/Build/iOS/FirebaseInvites.framework/GoogleSignIn.bundle
         - ./Carthage/Build/iOS/FirebaseInvites.framework/GPPACLPickerResources.bundle

diff --git a/DocumentReference+Codable.swift b/DocumentReference+Codable.swift
@@ -0,0 +1,36 @@
+//
+//  DocumentReference+Codable.swift
+//  BoringSSL-GRPC-iOS
+//
+//  Created by 1amageek on 2019/03/26.
+//
+
+import Foundation
+import FirebaseFirestore
+
+/**
+ * A protocol describing the encodable properties of a Timestamp.
+ *
+ * Note: this protocol exists as a workaround for the Swift compiler: if the Timestamp class
+ * was extended directly to conform to Codable, the methods implementing the protocol would be need
+ * to be marked required but that can't be done in an extension. Declaring the extension on the
+ * protocol sidesteps this issue.
+ */
+private protocol CodableDocumentReference: Codable {
+
+}
+
+
+extension CodableDocumentReference {
+    public init(from decoder: Decoder) throws {
+        let container = try decoder.singleValueContainer()
+        _ = try container.decode(DocumentReference.self)
+        throw FirestoreDecodingError.decodingIsNotSupported
+    }
+
+    public func encode(to encoder: Encoder) throws {
+//        var container = encoder.singleValueContainer()
+    }
+}
+
+extension DocumentReference: CodableDocumentReference { }
diff --git a/Example/Auth/ApiTests/AccountInfoTests.m b/Example/Auth/ApiTests/AccountInfoTests.m
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2019 Google
+ *
+ * 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 "FIRAuthApiTestsBase.h"
+
+/** The testing email address for testCreateAccountWithEmailAndPassword. */
+static NSString *const kOldUserEmail = @"[email protected]";
+
+/** The testing email address for testUpdatingUsersEmail. */
+static NSString *const kNewUserEmail = @"[email protected]";
+
+@interface AccountInfoTests : FIRAuthApiTestsBase
+
+@end
+
+@implementation AccountInfoTests
+
+- (void)testUpdatingUsersEmail {
+  SKIP_IF_ON_MOBILE_HARNESS
+  FIRAuth *auth = [FIRAuth auth];
+  if (!auth) {
+    XCTFail(@"Could not obtain auth object.");
+  }
+
+  __block NSError *apiError;
+  XCTestExpectation *expectation =
+      [self expectationWithDescription:@"Created account with email and password."];
+  [auth createUserWithEmail:kOldUserEmail
+                   password:@"password"
+                 completion:^(FIRAuthDataResult *user, NSError *error) {
+                   apiError = error;
+                   [expectation fulfill];
+                 }];
+  [self waitForExpectationsWithTimeout:kExpectationsTimeout handler:nil];
+  expectation = [self expectationWithDescription:@"Created account with email and password."];
+  XCTAssertEqualObjects(auth.currentUser.email, kOldUserEmail);
+  XCTAssertNil(apiError);
+
+  [auth.currentUser updateEmail:kNewUserEmail
+                     completion:^(NSError *_Nullable error) {
+                       apiError = error;
+                       [expectation fulfill];
+                     }];
+  [self waitForExpectationsWithTimeout:kExpectationsTimeout handler:nil];
+  XCTAssertNil(apiError);
+  XCTAssertEqualObjects(auth.currentUser.email, kNewUserEmail);
+
+  // Clean up the created Firebase user for future runs.
+  [self deleteCurrentUser];
+}
+
+@end
diff --git a/Example/Auth/ApiTests/AnonymousAuthTests.m b/Example/Auth/ApiTests/AnonymousAuthTests.m
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2019 Google
+ *
+ * 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 "FIRAuthApiTestsBase.h"
+
+@interface AnonymousAuthTests : FIRAuthApiTestsBase
+
+@end
+
+@implementation AnonymousAuthTests
+
+- (void)testSignInAnonymously {
+  [self signInAnonymously];
+  XCTAssertTrue([FIRAuth auth].currentUser.anonymous);
+
+  [self deleteCurrentUser];
+}
+
+@end
diff --git a/Example/Auth/ApiTests/Auth_ApiTests-Bridging-Header.h b/Example/Auth/ApiTests/Auth_ApiTests-Bridging-Header.h
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2019 Google
+ *
+ * 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 "FIRAuthApiTestsBase.h"