Merge branch 'dev' into feature/aks-prebuilt-integration-tests

Author: anonymous-akorn

firestore/CMakeLists.txt

@@ -93,6 +93,7 @@ set(android_SRCS
     src/android/metadata_changes_android.cc
     src/android/metadata_changes_android.h
     src/android/promise_android.h
+    src/android/promise_factory_android.h
     src/android/query_android.cc
     src/android/query_android.h
     src/android/query_snapshot_android.cc
@@ -112,23 +113,52 @@ set(android_SRCS
     src/android/timestamp_portable.cc
     src/android/transaction_android.cc
     src/android/transaction_android.h
+    src/android/util_android.cc
     src/android/util_android.h
     src/android/wrapper.cc
     src/android/wrapper.h
     src/android/write_batch_android.cc
     src/android/write_batch_android.h
+    src/jni/array.h
+    src/jni/array_list.cc
+    src/jni/array_list.h
+    src/jni/boolean.cc
+    src/jni/boolean.h
     src/jni/call_traits.h
+    src/jni/class.cc
     src/jni/class.h
+    src/jni/collection.cc
+    src/jni/collection.h
+    src/jni/declaration.h
+    src/jni/double.cc
+    src/jni/double.h
     src/jni/env.cc
     src/jni/env.h
+    src/jni/hash_map.cc
+    src/jni/hash_map.h
+    src/jni/integer.cc
+    src/jni/integer.h
+    src/jni/iterator.cc
+    src/jni/iterator.h
     src/jni/jni.cc
     src/jni/jni.h
     src/jni/jni_fwd.h
+    src/jni/list.cc
+    src/jni/list.h
+    src/jni/loader.cc
+    src/jni/loader.h
+    src/jni/long.cc
+    src/jni/long.h
+    src/jni/map.cc
+    src/jni/map.h
     src/jni/object.cc
     src/jni/object.h
     src/jni/ownership.h
+    src/jni/set.h
     src/jni/string.cc
     src/jni/string.h
+    src/jni/throwable.cc
+    src/jni/throwable.h
     src/jni/traits.h)
 
 set(ios_SRCS

scripts/gha/build_testapps.py

@@ -451,6 +451,18 @@ def _build_ios(
     dir_util.copy_tree(framework_src_path, framework_dest_path)
     framework_paths.append(framework_dest_path)
 
+  podfile_tool_path = os.path.join(
+      root_dir, "scripts", "gha", "integration_testing", "update_podfile.py")
+  sdk_podfile_path = os.path.join(
+      root_dir, "ios_pod", "Podfile")
+  app_podfile_path = os.path.join(
+      project_dir, "Podfile")
+  podfile_patcher_args = [
+      "python", podfile_tool_path,
+      "--sdk_podfile", sdk_podfile_path,
+      "--app_podfile", app_podfile_path
+  ]
+  _run(podfile_patcher_args)
   _run(["pod", "install"])
 
   entitlements_path = os.path.join(

scripts/gha/integration_testing/update_podfile.py

@@ -0,0 +1,73 @@
+# Copyright 2020 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.
+
+r""" Update integration testapps' Podfiles to match the SDK's Podfile.
+Usage:
+  python update_podfile.py --sdk_podfile ios_pod/Podfile \ 
+    --app_podfile admob/integration_test/Podfile
+"""
+
+from absl import app
+from absl import flags
+import re
+import fileinput
+
+FLAGS = flags.FLAGS
+
+flags.DEFINE_string(
+    "sdk_podfile", None, "Path to CPP SDK's iOS podfile.",
+    short_name="s")
+flags.DEFINE_string(
+    "app_podfile", None, "Path to integration testapp's iOS podfile.",
+    short_name="a")
+
+
+def main(argv):
+  if len(argv) > 1:
+    raise app.UsageError("Too many command-line arguments.")
+
+  sdk_podfile = FLAGS.sdk_podfile
+  app_podfile = FLAGS.app_podfile
+
+  # split lines in Podfile by ' ' and ','
+  split_pattern = ' |,'
+
+  # dict to store podName & podVersion from sdk's podfile
+  pod_dict = {}
+  with open(sdk_podfile) as f:
+    for line in f:
+      tokens = re.split(split_pattern, line)
+      tokens = list(filter(None, tokens))
+      if tokens[0] == 'pod':
+        pod_dict[tokens[1]] = tokens[2]
+
+  # update podVersion in app's podfile
+  new_lines = []
+  with open(app_podfile) as f:
+    for line in f:
+      tokens = re.split(split_pattern, line)
+      tokens = list(filter(None, tokens))
+      if tokens[0] == 'pod' and tokens[1] in pod_dict:
+        new_lines.append(line.replace(tokens[2], pod_dict[tokens[1]]))
+      else:
+        new_lines.append(line)
+  
+  with open(app_podfile, "w") as out_file:
+        out_file.writelines(new_lines)
+
+
+if __name__ == "__main__":
+  flags.mark_flag_as_required("sdk_podfile")
+  flags.mark_flag_as_required("app_podfile")
+  app.run(main)