From 0aa39357bfe2ba954cacedea84bb73ae8863f789 Mon Sep 17 00:00:00 2001
From: Vinay Guthal <vguthal@google.com>
Date: Fri, 14 Jun 2019 13:08:54 -0400
Subject: [PATCH 1/3] fix functions

---
 firebase-functions/firebase-functions.gradle    | 4 ++--
 firebase-functions/gradle.properties            | 2 +-
 firebase-functions/src/main/AndroidManifest.xml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/firebase-functions/firebase-functions.gradle b/firebase-functions/firebase-functions.gradle
index 64d888dd000..76b05eb9013 100644
--- a/firebase-functions/firebase-functions.gradle
+++ b/firebase-functions/firebase-functions.gradle
@@ -29,7 +29,7 @@ android {
     compileSdkVersion project.targetSdkVersion
     defaultConfig {
         targetSdkVersion project.targetSdkVersion
-        minSdkVersion project.minSdkVersion
+        minSdkVersion 16
         versionName version
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -53,7 +53,7 @@ dependencies {
     implementation 'com.google.android.gms:play-services-basement:16.2.0'
     implementation 'com.google.android.gms:play-services-base:16.1.0'
     implementation 'com.google.android.gms:play-services-tasks:16.0.1'
-    implementation ('com.google.firebase:firebase-iid:17.0.3') {
+    implementation ('com.google.firebase:firebase-iid:18.0.0') {
         exclude group: 'com.google.firebase', module: 'firebase-common'
     }
     implementation ('com.google.firebase:firebase-auth-interop:17.0.0') {
diff --git a/firebase-functions/gradle.properties b/firebase-functions/gradle.properties
index 4c7da9c1258..95298508ab1 100644
--- a/firebase-functions/gradle.properties
+++ b/firebase-functions/gradle.properties
@@ -1,3 +1,3 @@
-version=16.3.1
+version=17.0.0
 latestReleasedVersion=16.3.0
 android.enableUnitTestBinaryResources=true
diff --git a/firebase-functions/src/main/AndroidManifest.xml b/firebase-functions/src/main/AndroidManifest.xml
index 5839314f924..0fd428d93d2 100644
--- a/firebase-functions/src/main/AndroidManifest.xml
+++ b/firebase-functions/src/main/AndroidManifest.xml
@@ -3,7 +3,7 @@
         xmlns:tools="http://schemas.android.com/tools"
         package="com.google.firebase.functions">
     <!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
-    <!--<uses-sdk android:minSdkVersion="14" />-->
+    <!--<uses-sdk android:minSdkVersion="16" />-->
     <uses-permission android:name="android.permission.INTERNET" />
     <application>
         <service android:name="com.google.firebase.components.ComponentDiscoveryService" android:exported="false">

From c4d4cafecc1eb64d405fc1f69f96f82b26309752 Mon Sep 17 00:00:00 2001
From: Vinay Guthal <vguthal@google.com>
Date: Fri, 14 Jun 2019 14:17:07 -0400
Subject: [PATCH 2/3] update minsdk version

---
 .idea/copyright/Apache_2___Google.xml         |  6 ---
 .idea/copyright/profiles_settings.xml         | 10 ----
 .../Firestore_Integration_Tests.xml           | 50 -------------------
 .../Firestore_Unit_Tests.xml                  | 24 ---------
 firebase-functions/ktx/ktx.gradle             |  2 +-
 .../ktx/src/androidTest/AndroidManifest.xml   |  2 +-
 .../ktx/src/main/AndroidManifest.xml          |  2 +-
 7 files changed, 3 insertions(+), 93 deletions(-)
 delete mode 100644 .idea/copyright/Apache_2___Google.xml
 delete mode 100644 .idea/copyright/profiles_settings.xml
 delete mode 100644 .idea/runConfigurations/Firestore_Integration_Tests.xml
 delete mode 100644 .idea/runConfigurations/Firestore_Unit_Tests.xml

diff --git a/.idea/copyright/Apache_2___Google.xml b/.idea/copyright/Apache_2___Google.xml
deleted file mode 100644
index a0bb219243a..00000000000
--- a/.idea/copyright/Apache_2___Google.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<component name="CopyrightManager">
-  <copyright>
-    <option name="myName" value="Apache 2 - Google" />
-    <option name="notice" value="Copyright 2019 Google LLC&#10;&#10;Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);&#10;you may not use this file except in compliance with the License.&#10;You may obtain a copy of the License at&#10;&#10;     http://www.apache.org/licenses/LICENSE-2.0&#10;&#10;Unless required by applicable law or agreed to in writing, software&#10;distributed under the License is distributed on an &quot;AS IS&quot; BASIS,&#10;WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.&#10;See the License for the specific language governing permissions and&#10;limitations under the License." />
-  </copyright>
-</component>
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index 0d00e324732..00000000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="CopyrightManager">
-  <settings>
-    <module2copyright>
-      <element module="All" copyright="Apache 2 - Google" />
-    </module2copyright>
-    <LanguageOptions name="__TEMPLATE__">
-      <option name="block" value="false" />
-    </LanguageOptions>
-  </settings>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Firestore_Integration_Tests.xml b/.idea/runConfigurations/Firestore_Integration_Tests.xml
deleted file mode 100644
index f9c2ad5a024..00000000000
--- a/.idea/runConfigurations/Firestore_Integration_Tests.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Firestore Integration Tests" type="AndroidTestRunConfigurationType" factoryName="Android Instrumented Tests">
-    <module name="firebase-firestore" />
-    <option name="TESTING_TYPE" value="1" />
-    <option name="INSTRUMENTATION_RUNNER_CLASS" value="" />
-    <option name="METHOD_NAME" value="" />
-    <option name="CLASS_NAME" value="" />
-    <option name="PACKAGE_NAME" value="com.google.firebase.firestore" />
-    <option name="EXTRA_OPTIONS" value="" />
-    <option name="CLEAR_LOGCAT" value="false" />
-    <option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
-    <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
-    <option name="FORCE_STOP_RUNNING_APP" value="true" />
-    <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
-    <option name="USE_LAST_SELECTED_DEVICE" value="false" />
-    <option name="PREFERRED_AVD" value="" />
-    <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
-    <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
-    <option name="DEBUGGER_TYPE" value="Auto" />
-    <Auto>
-      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
-      <option name="SHOW_STATIC_VARS" value="true" />
-      <option name="WORKING_DIR" value="" />
-      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
-      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
-    </Auto>
-    <Hybrid>
-      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
-      <option name="SHOW_STATIC_VARS" value="true" />
-      <option name="WORKING_DIR" value="" />
-      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
-      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
-    </Hybrid>
-    <Java />
-    <Native>
-      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
-      <option name="SHOW_STATIC_VARS" value="true" />
-      <option name="WORKING_DIR" value="" />
-      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
-      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
-    </Native>
-    <Profilers>
-      <option name="ADVANCED_PROFILING_ENABLED" value="false" />
-    </Profilers>
-    <method>
-      <option name="Android.Gradle.BeforeRunTask" enabled="true" />
-      <option name="com.android.instantApps.provision.BeforeRunTask" enabled="true" clearCache="false" clearProvisionedDevices="false" myTimestamp="1535475311190" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Firestore_Unit_Tests.xml b/.idea/runConfigurations/Firestore_Unit_Tests.xml
deleted file mode 100644
index 5bfd8accf8a..00000000000
--- a/.idea/runConfigurations/Firestore_Unit_Tests.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Firestore Unit Tests" type="AndroidJUnit" factoryName="Android JUnit">
-    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-    <module name="firebase-firestore" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-    <option name="ALTERNATIVE_JRE_PATH" />
-    <option name="PACKAGE_NAME" />
-    <option name="MAIN_CLASS_NAME" value="" />
-    <option name="METHOD_NAME" value="" />
-    <option name="TEST_OBJECT" value="directory" />
-    <option name="VM_PARAMETERS" value="-ea" />
-    <option name="PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/firebase-firestore" />
-    <option name="ENV_VARIABLES" />
-    <option name="PASS_PARENT_ENVS" value="true" />
-    <option name="TEST_SEARCH_SCOPE">
-      <value defaultName="singleModule" />
-    </option>
-    <envs />
-    <dir value="$PROJECT_DIR$/firebase-firestore/src/test/java/com/google/firebase" />
-    <patterns />
-    <method />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/firebase-functions/ktx/ktx.gradle b/firebase-functions/ktx/ktx.gradle
index 48a014c76ae..ad6ed5216b0 100644
--- a/firebase-functions/ktx/ktx.gradle
+++ b/firebase-functions/ktx/ktx.gradle
@@ -27,7 +27,7 @@ firebaseLibrary {
 android {
     compileSdkVersion project.targetSdkVersion
     defaultConfig {
-        minSdkVersion project.minSdkVersion
+        minSdkVersion 16
         multiDexEnabled true
         targetSdkVersion project.targetSdkVersion
         versionName version
diff --git a/firebase-functions/ktx/src/androidTest/AndroidManifest.xml b/firebase-functions/ktx/src/androidTest/AndroidManifest.xml
index 53cd9caa09e..e00dc0c7ec9 100644
--- a/firebase-functions/ktx/src/androidTest/AndroidManifest.xml
+++ b/firebase-functions/ktx/src/androidTest/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="com.google.firebase.functions.ktx">
   <!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
-  <!--<uses-sdk android:minSdkVersion="15" android:targetSdkVersion="23" />-->
+  <!--<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />-->
   <uses-permission android:name="android.permission.INTERNET"/>
   <application
       android:usesCleartextTraffic="true">
diff --git a/firebase-functions/ktx/src/main/AndroidManifest.xml b/firebase-functions/ktx/src/main/AndroidManifest.xml
index 8eda8b99bae..bcdb806609a 100644
--- a/firebase-functions/ktx/src/main/AndroidManifest.xml
+++ b/firebase-functions/ktx/src/main/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.google.firebase.functions.ktx">
     <!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
-    <!--<uses-sdk android:minSdkVersion="14"/>-->
+    <!--<uses-sdk android:minSdkVersion="16"/>-->
     <application>
         <service android:name="com.google.firebase.components.ComponentDiscoveryService" android:exported="false">
             <meta-data android:name="com.google.firebase.components:com.google.firebase.functions.ktx.FirebaseFunctionsKtxRegistrar"

From f2ba3715e7e3a211e09961e44b848b98f4340a28 Mon Sep 17 00:00:00 2001
From: Vinay Guthal <vguthal@google.com>
Date: Fri, 14 Jun 2019 14:17:48 -0400
Subject: [PATCH 3/3] remove idea

---
 .idea/copyright/Apache_2___Google.xml         |  6 +++
 .idea/copyright/profiles_settings.xml         | 10 ++++
 .../Firestore_Integration_Tests.xml           | 50 +++++++++++++++++++
 .../Firestore_Unit_Tests.xml                  | 24 +++++++++
 4 files changed, 90 insertions(+)
 create mode 100644 .idea/copyright/Apache_2___Google.xml
 create mode 100644 .idea/copyright/profiles_settings.xml
 create mode 100644 .idea/runConfigurations/Firestore_Integration_Tests.xml
 create mode 100644 .idea/runConfigurations/Firestore_Unit_Tests.xml

diff --git a/.idea/copyright/Apache_2___Google.xml b/.idea/copyright/Apache_2___Google.xml
new file mode 100644
index 00000000000..a0bb219243a
--- /dev/null
+++ b/.idea/copyright/Apache_2___Google.xml
@@ -0,0 +1,6 @@
+<component name="CopyrightManager">
+  <copyright>
+    <option name="myName" value="Apache 2 - Google" />
+    <option name="notice" value="Copyright 2019 Google LLC&#10;&#10;Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);&#10;you may not use this file except in compliance with the License.&#10;You may obtain a copy of the License at&#10;&#10;     http://www.apache.org/licenses/LICENSE-2.0&#10;&#10;Unless required by applicable law or agreed to in writing, software&#10;distributed under the License is distributed on an &quot;AS IS&quot; BASIS,&#10;WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.&#10;See the License for the specific language governing permissions and&#10;limitations under the License." />
+  </copyright>
+</component>
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
new file mode 100644
index 00000000000..0d00e324732
--- /dev/null
+++ b/.idea/copyright/profiles_settings.xml
@@ -0,0 +1,10 @@
+<component name="CopyrightManager">
+  <settings>
+    <module2copyright>
+      <element module="All" copyright="Apache 2 - Google" />
+    </module2copyright>
+    <LanguageOptions name="__TEMPLATE__">
+      <option name="block" value="false" />
+    </LanguageOptions>
+  </settings>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Firestore_Integration_Tests.xml b/.idea/runConfigurations/Firestore_Integration_Tests.xml
new file mode 100644
index 00000000000..f9c2ad5a024
--- /dev/null
+++ b/.idea/runConfigurations/Firestore_Integration_Tests.xml
@@ -0,0 +1,50 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Firestore Integration Tests" type="AndroidTestRunConfigurationType" factoryName="Android Instrumented Tests">
+    <module name="firebase-firestore" />
+    <option name="TESTING_TYPE" value="1" />
+    <option name="INSTRUMENTATION_RUNNER_CLASS" value="" />
+    <option name="METHOD_NAME" value="" />
+    <option name="CLASS_NAME" value="" />
+    <option name="PACKAGE_NAME" value="com.google.firebase.firestore" />
+    <option name="EXTRA_OPTIONS" value="" />
+    <option name="CLEAR_LOGCAT" value="false" />
+    <option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
+    <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
+    <option name="FORCE_STOP_RUNNING_APP" value="true" />
+    <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
+    <option name="USE_LAST_SELECTED_DEVICE" value="false" />
+    <option name="PREFERRED_AVD" value="" />
+    <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
+    <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
+    <option name="DEBUGGER_TYPE" value="Auto" />
+    <Auto>
+      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
+      <option name="SHOW_STATIC_VARS" value="true" />
+      <option name="WORKING_DIR" value="" />
+      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
+      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
+    </Auto>
+    <Hybrid>
+      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
+      <option name="SHOW_STATIC_VARS" value="true" />
+      <option name="WORKING_DIR" value="" />
+      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
+      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
+    </Hybrid>
+    <Java />
+    <Native>
+      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
+      <option name="SHOW_STATIC_VARS" value="true" />
+      <option name="WORKING_DIR" value="" />
+      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
+      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
+    </Native>
+    <Profilers>
+      <option name="ADVANCED_PROFILING_ENABLED" value="false" />
+    </Profilers>
+    <method>
+      <option name="Android.Gradle.BeforeRunTask" enabled="true" />
+      <option name="com.android.instantApps.provision.BeforeRunTask" enabled="true" clearCache="false" clearProvisionedDevices="false" myTimestamp="1535475311190" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Firestore_Unit_Tests.xml b/.idea/runConfigurations/Firestore_Unit_Tests.xml
new file mode 100644
index 00000000000..5bfd8accf8a
--- /dev/null
+++ b/.idea/runConfigurations/Firestore_Unit_Tests.xml
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Firestore Unit Tests" type="AndroidJUnit" factoryName="Android JUnit">
+    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+    <module name="firebase-firestore" />
+    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+    <option name="ALTERNATIVE_JRE_PATH" />
+    <option name="PACKAGE_NAME" />
+    <option name="MAIN_CLASS_NAME" value="" />
+    <option name="METHOD_NAME" value="" />
+    <option name="TEST_OBJECT" value="directory" />
+    <option name="VM_PARAMETERS" value="-ea" />
+    <option name="PARAMETERS" value="" />
+    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/firebase-firestore" />
+    <option name="ENV_VARIABLES" />
+    <option name="PASS_PARENT_ENVS" value="true" />
+    <option name="TEST_SEARCH_SCOPE">
+      <value defaultName="singleModule" />
+    </option>
+    <envs />
+    <dir value="$PROJECT_DIR$/firebase-firestore/src/test/java/com/google/firebase" />
+    <patterns />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file