merge master into firestore-api-changes

.travis.yml

@@ -1,64 +1,92 @@
+os: osx
 osx_image: xcode9.2
 language: objective-c
 cache:
   - bundler
   - cocoapods
 
 rvm: 2.3.1
-before_install:
-# Add next line back with updated DeviceUDID for xcode9.1 if stability issues with simulator
-#  - open -a "simulator" --args -CurrentDeviceUDID ABBD7191-486B-462F-80B4-AE08C5820DA1
-  - bundle install
-  - gem install xcpretty
-  - bundle exec pod install --project-directory=Example --repo-update
-  - bundle exec pod install --project-directory=Firestore/Example --no-repo-update
-  - brew install clang-format
-  - brew install swiftformat
-  - brew install cmake
-  - brew install go # Somehow the build for Abseil requires this.
-  - echo "$TRAVIS_COMMIT_RANGE"
-  - echo "$TRAVIS_PULL_REQUEST"
-  - |
-    if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
-      SKIP_FIREBASE=0
-      SKIP_FIRESTORE=0
-    else
-      git diff --name-only $TRAVIS_COMMIT_RANGE | grep -Eq '^(Firebase|Example)'
-      SKIP_FIREBASE="$?"
-      git diff --name-only $TRAVIS_COMMIT_RANGE | grep -q Firestore
-      SKIP_FIRESTORE="$?"
-    fi
 
-script:
-  # Fail on trailing whitespace in non-binary, non-generated-nanopb files
-  - "! git grep -I ' $' ':(exclude)Firestore/Protos/nanopb'"
-  - "! git grep -EL --name-only 'Copyright [0-9]{4}.*Google' | grep -v third_party | egrep '\\.(m|h|cc|mm|c)$'"
-  - ./scripts/style.sh test-only # Validate clang-format compliance
-  - |
-    if [ $SKIP_FIREBASE != 1 ]; then
-      ./test.sh
-    fi
-  - |
-    if [ $SKIP_FIRESTORE != 1 ]; then
-      ./scripts/lint.sh # Google C++ style compliance
-    fi
-  - |
-    if [ $SKIP_FIRESTORE != 1 ]; then
-      ./Firestore/test.sh
-    fi
+jobs:
+  include:
+    - stage: checks
+      # This only needs to be run once, so restrict it to an arbitrary combination
+      before_install:
+        - brew install clang-format
+        - brew install swiftformat
+      script:
+        - ./scripts/check_whitespace.sh
+        - ./scripts/check_copyright.sh
+        - ./scripts/check_no_module_imports.sh
+        - ./scripts/style.sh test-only $TRAVIS_COMMIT_RANGE
+        # Google C++ style compliance
+        - ./scripts/lint.sh $TRAVIS_COMMIT_RANGE
 
-# TODO fix os_log deprecation warning in FIRLogger to remove --allow-warnings
-  - |
-    if [ $SKIP_FIREBASE != 1 ]; then
-      bundle exec pod lib lint FirebaseCore.podspec --allow-warnings
-    fi
+    - stage: test
+      env:
+        - PROJECT=Firebase PLATFORM=iOS
+      before_install:
+        # Add next line back with updated DeviceUDID for xcode9.1 if stability issues with simulator
+        # - open -a "simulator" --args -CurrentDeviceUDID ABBD7191-486B-462F-80B4-AE08C5820DA1
+        - bundle install
+        - gem install xcpretty
+        - ./scripts/if_changed.sh bundle exec pod install --project-directory=Example --repo-update
+        - ./scripts/if_changed.sh bundle exec pod install --project-directory=Functions/Example
+      script:
+        - ./scripts/if_changed.sh ./scripts/build.sh $PROJECT $PLATFORM
 
-# TODO - Uncomment subsequent lines once FirebaseCore source repo is in public Specs repo
-#  - bundle exec pod lib lint FirebaseAuth.podspec
-#  - bundle exec pod lib lint FirebaseDatabase.podspec
-#  - bundle exec pod lib lint FirebaseMessaging.podspec --allow-warnings #pending #390 fix
-#  - bundle exec pod lib lint FirebaseStorage.podspec
-#  - bundle exec pod lib lint Firestore/Firestore.podspec
+        # TODO fix os_log deprecation warning in FIRLogger to remove --allow-warnings
+        - ./scripts/if_changed.sh bundle exec pod lib lint FirebaseCore.podspec --allow-warnings
+
+        # TODO - Uncomment subsequent lines once FirebaseCore source repo is in public Specs repo
+        #  - bundle exec pod lib lint FirebaseAuth.podspec
+        #  - bundle exec pod lib lint FirebaseDatabase.podspec
+        #  - bundle exec pod lib lint FirebaseMessaging.podspec
+        #  - bundle exec pod lib lint FirebaseStorage.podspec
+        #  - bundle exec pod lib lint FirebaseFirestore.podspec
+
+    - stage: test
+      env:
+        - PROJECT=Firestore PLATFORM=iOS METHOD=xcodebuild
+      before_install:
+        - bundle install
+        - gem install xcpretty
+        - ./scripts/if_changed.sh bundle exec pod install --project-directory=Firestore/Example --repo-update
+      script:
+        - ./scripts/if_changed.sh ./scripts/build.sh $PROJECT $PLATFORM $METHOD
+
+    - stage: test
+      env:
+        - PROJECT=Firestore PLATFORM=macOS METHOD=cmake
+      before_install:
+        - bundle install
+        - gem install xcpretty
+        - brew install cmake
+        - brew install go # Somehow the build for Abseil requires this.
+        - ./scripts/if_changed.sh bundle exec pod install --project-directory=Example --repo-update
+        - ./scripts/if_changed.sh bundle exec pod install --project-directory=Firestore/Example --no-repo-update
+      script:
+        - ./scripts/if_changed.sh ./scripts/build.sh $PROJECT $PLATFORM $METHOD
+
+    - stage: test
+      env:
+        - PROJECT=Firebase PLATFORM=macOS
+      before_install:
+        - bundle install
+        - gem install xcpretty
+        - ./scripts/if_changed.sh bundle exec pod install --project-directory=Example --repo-update
+      script:
+        - ./scripts/if_changed.sh ./scripts/build.sh $PROJECT $PLATFORM
+
+    - stage: test
+      env:
+        - PROJECT=Firebase PLATFORM=tvOS
+      before_install:
+        - bundle install
+        - gem install xcpretty
+        - ./scripts/if_changed.sh bundle exec pod install --project-directory=Example --repo-update
+      script:
+        - ./scripts/if_changed.sh ./scripts/build.sh $PROJECT $PLATFORM
 
 branches:
   only:

CODE_OF_CONDUCT.md

@@ -0,0 +1,93 @@
+# Firebase Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of
+experience, education, socio-economic status, nationality, personal appearance,
+race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+*   Using welcoming and inclusive language
+*   Being respectful of differing viewpoints and experiences
+*   Gracefully accepting constructive criticism
+*   Focusing on what is best for the community
+*   Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+*   The use of sexualized language or imagery and unwelcome sexual attention or
+    advances
+*   Trolling, insulting/derogatory comments, and personal or political attacks
+*   Public or private harassment
+*   Publishing others' private information, such as a physical or electronic
+    address, without explicit permission
+*   Other conduct which could reasonably be considered inappropriate in a
+    professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, or to ban temporarily or permanently any
+contributor for other behaviors that they deem inappropriate, threatening,
+offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+This Code of Conduct also applies outside the project spaces when the Project
+Steward has a reasonable belief that an individual's behavior may have a
+negative impact on the project or its community.
+
+## Conflict Resolution
+
+We do not believe that all conflict is bad; healthy debate and disagreement
+often yield positive results. However, it is never okay to be disrespectful or
+to engage in behavior that violates the project’s code of conduct.
+
+If you see someone violating the code of conduct, you are encouraged to address
+the behavior directly with those involved. Many issues can be resolved quickly
+and easily, and this gives people more control over the outcome of their
+dispute. If you are unable to resolve the matter for any reason, or if the
+behavior is threatening or harassing, report it. We are dedicated to providing
+an environment where participants feel welcome and safe.
+
+Reports should be directed to Paul Beusterien([email protected]), the
+Project Steward for the Firebase iOS SDK. It is the Project Steward’s duty to
+receive and address reported violations of the code of conduct. They will then
+work with a committee consisting of representatives from the Open Source
+Programs Office and the Google Open Source Strategy team. If for any reason you
+are uncomfortable reaching out the Project Steward, please email
+[email protected].
+
+We will investigate every complaint, but you may not receive a direct response.
+We will use our discretion in determining when and how to follow up on reported
+incidents, which may range from not taking action to permanent expulsion from
+the project and project-sponsored spaces. We will notify the accused of the
+report and provide them an opportunity to discuss it before any action is taken.
+The identity of the reporter will be omitted from the details of the report
+supplied to the accused. In potentially harmful situations, such as ongoing
+harassment or threats to anyone's safety, we may take action without notice.
+
+## Attribution
+
+This Code of Conduct is adapted from the Contributor Covenant, version 1.4,
+available at
+https://www.contributor-covenant.org/version/1/4/code-of-conduct.html

Carthage.md

@@ -7,7 +7,6 @@ This page introduces and provides instructions for an **experimental** Firebase
 feedback and usage, the Firebase team may decide to make the Carthage
 distribution official.
 
-FirebaseFirestore and FirebaseInvites are not yet supported from Carthage.
 Please [let us know](https://github.com/firebase/firebase-ios-sdk/issues) if you
 have suggestions about how best to distribute Carthage binaries that include
 resource bundles.
@@ -27,8 +26,9 @@ more details and additional installation methods.
 
 ## Carthage Usage
 
-- Create a Cartfile with a **subset** of the following components. Note that
-    **FirebaseAnalytics** must always be included.
+- Create a Cartfile with a **subset** of the following components - choosing the
+Firebase components that you want to include in your app. Note that
+**FirebaseAnalytics** must always be included.
 ```
 binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseABTestingBinary.json"
 binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAdMobBinary.json"
@@ -37,6 +37,9 @@ binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAuthBinary.json"
 binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseCrashBinary.json"
 binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseDatabaseBinary.json"
 binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseDynamicLinksBinary.json"
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseFirestoreBinary.json"
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseFunctionsBinary.json"
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseInvitesBinary.json"
 binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseMessagingBinary.json"
 binary "https://dl.google.com/dl/firebase/ios/carthage/FirebasePerformanceBinary.json"
 binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseRemoteConfigBinary.json"
@@ -48,6 +51,16 @@ binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseStorageBinary.jso
     they're added to the right build target(s).
 - Add the -ObjC flag to "Other Linker Flags".
 - Make sure that the build target(s) includes your project's `GoogleService-Info.plist`.
+- [Delete Firebase.framework from the Link Binary With Libraries Build Phase](https://github.com/firebase/firebase-ios-sdk/issues/911#issuecomment-372455235).
+- If you're including a Firebase component that has resources, copy its bundles
+    into the Xcode project and make sure they're added to the
+    `Copy Bundle Resources` Build Phase :
+    - For Firestore:
+        - ./Carthage/Build/iOS/gRPC.framework/gRPCCertificates.bundle
+    - For Invites:
+        - ./Carthage/Build/iOS/FirebaseInvites.framework/GoogleSignIn.bundle
+        - ./Carthage/Build/iOS/FirebaseInvites.framework/GPPACLPickerResources.bundle
+        - ./Carthage/Build/iOS/FirebaseInvites.framework/GINInviteResources.bundle
 
 ## Versioning