Merge branch 'master' into enable_lru

Author: Greg Soltis

ci/fireci/fireci/commands.py

@@ -37,16 +37,26 @@ def gradle_command(task, gradle_opts):
     help=
     'App build variant to use while running the smoke Tests. One of release|debug'
 )
+@click.option(
+    '--test-apps-dir',
+    '-d',
+    multiple=True,
+    type=click.Path(exists=True, file_okay=False, resolve_path=True),
+    default=['test-apps'],
+    help=
+    'Directory that contains gradle build with apps to test against. Multiple values are allowed.'
+)
 @ci_command()
-def smoke_tests(app_build_variant):
+def smoke_tests(app_build_variant, test_apps_dir):
   """Builds all SDKs in release mode and then tests test-apps against them."""
   gradle.run('publishAllToBuildDir')
 
   cwd = os.getcwd()
-  gradle.run(
-      'connectedCheck',
-      '-PtestBuildType=%s' % (app_build_variant),
-      gradle_opts='-Dmaven.repo.local={}'.format(
-          os.path.join(cwd, 'build', 'm2repository')),
-      workdir=os.path.join(cwd, 'test-apps'),
-  )
+  for location in test_apps_dir:
+    gradle.run(
+        'connectedCheck',
+        '-PtestBuildType=%s' % (app_build_variant),
+        gradle_opts='-Dmaven.repo.local={}'.format(
+            os.path.join(cwd, 'build', 'm2repository')),
+        workdir=location,
+    )

ci/fireci/fireci/emulator.py

@@ -74,7 +74,7 @@ def __enter__(self):
         stdout=self._stdout,
         stderr=self._stderr)
     try:
-      self._wait_for_boot(datetime.timedelta(minutes=5))
+      self._wait_for_boot(datetime.timedelta(minutes=10))
     except:
       self._kill(self._process)
       self._close_files()

ci/fireci/fireciplugins/copyright.py

@@ -0,0 +1,107 @@
+# Copyright 2018 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 fnmatch
+import click
+import contextlib
+import os
+import re
+
+from fireci import ci_command
+
+
+@click.option(
+    '--ignore-path',
+    '-i',
+    default=(),
+    multiple=True,
+    type=str,
+    help='Unix path pattern to ignore when searching for matching files. '
+    'Multiple values allowed.',
+)
+@click.option(
+    '--include-extension',
+    '-e',
+    default=(),
+    multiple=True,
+    type=str,
+    help='File extensions to scan for copyright violation. '
+    'Multiple values allowed.',
+    required=True,
+)
+@click.option(
+    '--expected-regex',
+    '-r',
+    default='.*Copyright [0-9]{4} Google LLC',
+    type=str,
+    help='Regex expected to be present in the file.',
+)
+@click.argument(
+    'dir_to_scan',
+    type=click.Path(exists=True, file_okay=False),
+    default='.',
+    nargs=1,
+)
+@ci_command()
+def copyright_check(dir_to_scan, ignore_path, include_extension,
+                    expected_regex):
+  """Checks matching files' content for copyright information."""
+  expression = re.compile(expected_regex)
+  failed_files = []
+  with chdir(dir_to_scan):
+    for x in walk('.', ignore_path, include_extension):
+      with open(x) as f:
+        if not match_any(f, lambda line: expression.match(line)):
+          failed_files.append(x)
+
+  if failed_files:
+    raise click.ClickException(
+        "The following files do not have valid copyright information:\n{}"
+        .format('\n'.join(failed_files)))
+
+
+@contextlib.contextmanager
+def chdir(directory):
+  original_dir = os.getcwd()
+  os.chdir(directory)
+  try:
+    yield
+  finally:
+    os.chdir(original_dir)
+
+
+def match_any(iterable, predicate):
+  """Returns True if at least one item in the iterable matches the predicate."""
+  for x in iterable:
+    if predicate(x):
+      return True
+  return False
+
+
+def walk(dir_to_scan, ignore_paths, extensions_to_include):
+  """Recursively walk the provided directory and yield matching paths."""
+  for root, dirs, filenames in os.walk(dir_to_scan):
+    dirs[:] = (
+        x for x in dirs if not matches(os.path.join(root, x), ignore_paths))
+
+    for f in filenames:
+      filename = os.path.join(root, f)
+      if os.path.splitext(f)[1][1:] in extensions_to_include and not matches(
+          filename, ignore_paths):
+        yield os.path.normpath(filename)
+
+
+def matches(path, paths):
+  path = os.path.normpath(path)
+  return match_any(paths, lambda p: fnmatch.fnmatch(path, p))

ci/fireci/setup.py

@@ -25,7 +25,7 @@
     name='fireci',
     version='0.1',
     install_requires=[
-        'click==6.7',
+        'click==7.0',
     ],
     packages=find_packages(exclude=['tests']),
     entry_points={

ci/fireci/tests/copyright_test.py

@@ -0,0 +1,70 @@
+# Copyright 2018 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 unittest
+
+from fireciplugins.copyright import (
+    match_any,
+    matches,
+    walk,
+)
+from .fileutil import (
+    Artifact,
+    create_artifacts,
+    in_tempdir,
+)
+
+
+class CopyrightCheckTest(unittest.TestCase):
+
+  def test_match_any(self):
+    test_data = (
+        ((1, 2, 3), lambda x: x == 2, True),
+        ((1, 2, 3), lambda x: x == 5, False),
+        ((), lambda x: x == 1, False),
+    )
+    for iterable, predicate, expected_result in test_data:
+      with self.subTest():
+        self.assertEqual(match_any(iterable, predicate), expected_result)
+
+  def test_matches(self):
+    test_data = (
+        ('file.py', '*.py', True),
+        ('file.xml', '*.py', False),
+        ('hello/file.py', '*.py', True),
+        ('hello/file.xml', 'hello/**', True),
+        ('some/file.xml', 'hello/**', False),
+    )
+
+    for path, path_to_match, expected_result in test_data:
+      pass
+      with self.subTest("'{}' matches '{}' must be {}".format(
+          path, path_to_match, expected_result)):
+        self.assertEqual(matches(path, [path_to_match]), expected_result)
+
+  @in_tempdir
+  def test_walk_in_empty_dir(self):
+    paths = walk('.', [], ['py', 'xml'])
+    self.assertTrue(len(list(paths)) == 0)
+
+  @in_tempdir
+  def test_walk_should_filter_out_non_matching_files(self):
+    create_artifacts(
+        Artifact('hello/world/foo.py'), Artifact('dir1/subdir2/file.py'),
+        Artifact('hello/world.py'), Artifact('dir1/subdir2/file.py'),
+        Artifact('dir1/subdir2/file.gradle'), Artifact('dir1/subdir2/file.xml'))
+    paths = walk('.', ['hello/**'], ['py', 'xml'])
+
+    self.assertEqual(
+        set(paths), {'dir1/subdir2/file.py', 'dir1/subdir2/file.xml'})

ci/fireci/tests/fileutil.py

@@ -38,7 +38,7 @@ def create_artifacts(*artifacts):
     else:
       dirname = os.path.dirname(artifact.path)
       if dirname:
-        os.makedirs(os.path.dirname(artifact.path))
+        os.makedirs(os.path.dirname(artifact.path), exist_ok=True)
       with open(artifact.path, 'w') as opened_file:
         opened_file.write(artifact.content)
     os.chmod(artifact.path, artifact.mode)

ci/fireci/tests/integ_tests.py

@@ -132,3 +132,65 @@ def test_smoke_test_with_buildType_should_invoke_gradle_with_release_build_type(
     result = self.runner.invoke(cli,
                                 ['smoke_tests', '--app-build-variant', 'debug'])
     self.assertEqual(result.exit_code, 0)
+
+  @in_tempdir
+  def test_copyright_check_when_no_violating_files_should_succeed(self):
+    create_artifacts(
+        Artifact('dir/file.py', content='# Copyright 2018 Google LLC'))
+
+    result = self.runner.invoke(cli, ['copyright_check', '-e', 'py'])
+    self.assertEqual(result.exit_code, 0)
+
+  @in_tempdir
+  def test_copyright_check_when_violating_files_exist_should_fail(self):
+    create_artifacts(
+        Artifact('dir/file.py', content='# Copyright 2018 Google LLC'),
+        Artifact('dir/file2.py', content='# hello'),
+        Artifact('dir2/file3.xml', content='# hello'),
+    )
+
+    result = self.runner.invoke(cli,
+                                ['copyright_check', '-e', 'py', '-e'
+                                 'xml'])
+    self.assertEqual(result.exit_code, 1)
+    self.assertFalse('dir/file.py' in result.output)
+    self.assertTrue('dir/file2.py' in result.output)
+    self.assertTrue('dir2/file3.xml' in result.output)
+
+  @in_tempdir
+  def test_copyright_check_when_violating_files_exist_should_fail2(self):
+    create_artifacts(
+        Artifact('dir/file.py', content='# Copyright 2018 Google LLC'),
+        Artifact('dir/file2.py', content='# hello'),
+        Artifact('dir2/file3.xml', content='# hello'),
+        Artifact('dir2/subdir/file4.xml', content='# hello'),
+    )
+
+    result = self.runner.invoke(
+        cli, ['copyright_check', '-e', 'py', '-e'
+              'xml', '-i', 'dir2/**'])
+
+    self.assertEqual(result.exit_code, 1)
+    self.assertFalse('dir/file.py' in result.output)
+    self.assertTrue('dir/file2.py' in result.output)
+    self.assertFalse('dir2/file3.xml' in result.output)
+    self.assertFalse('dir2/subdir/file4.xml' in result.output)
+
+  @in_tempdir
+  def test_copyright_check_when_violating_files_exist_should_fail3(self):
+    create_artifacts(
+        Artifact('dir/subdir/file.py', content='# Copyright 2018 Google LLC'),
+        Artifact('dir/subdir/file2.py', content='# hello'),
+        Artifact('dir/subdir2/file3.xml', content='# hello'),
+        Artifact('dir/subdir4/file4.xml', content='# hello'),
+    )
+
+    result = self.runner.invoke(
+        cli,
+        ['copyright_check', '-e', 'py', '-e'
+         'xml', '-i', 'subdir2/**', 'dir'])
+
+    self.assertEqual(result.exit_code, 1)
+    self.assertFalse('subdir/file.py' in result.output)
+    self.assertTrue('subdir/file2.py' in result.output)
+    self.assertTrue('subdir4/file4.xml' in result.output)

firebase-common/firebase-common.gradle

@@ -59,7 +59,7 @@ dependencies {
     compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
 
     testImplementation 'com.android.support.test:runner:1.0.2'
-    testImplementation 'org.robolectric:robolectric:4.0-alpha-3'
+    testImplementation "org.robolectric:robolectric:$robolectricVersion"
     testImplementation 'junit:junit:4.12'
     testImplementation "com.google.truth:truth:$googleTruthVersion"
     testImplementation 'org.mockito:mockito-core:2.21.0'

firebase-common/src/main/AndroidManifest.xml

@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.google.firebase">
-    <application>
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.google.firebase">
+  <!--Although the *SdkVersion is captured in gradle build files, this is required for non gradle builds-->
+  <uses-sdk android:minSdkVersion="14"/>
+  <application>
 
-        <provider
-            android:authorities="${applicationId}.firebaseinitprovider"
-            android:name="com.google.firebase.provider.FirebaseInitProvider"
-            android:exported="false"
-            android:initOrder="100" />
-    </application>
+    <provider
+        android:name="com.google.firebase.provider.FirebaseInitProvider"
+        android:authorities="${applicationId}.firebaseinitprovider"
+        android:exported="false"
+        android:initOrder="100"/>
+  </application>
 </manifest>

firebase-common/src/main/java/com/google/firebase/FirebaseApp.java

@@ -104,7 +104,7 @@ public class FirebaseApp {
 
   public static final String DEFAULT_APP_NAME = "[DEFAULT]";
 
-  @VisibleForTesting static final String FIREBASE_APP_PREFS = "com.google.firebase.common.prefs";
+  private static final String FIREBASE_APP_PREFS = "com.google.firebase.common.prefs:";
 
   @VisibleForTesting
   static final String DATA_COLLECTION_DEFAULT_ENABLED = "firebase_data_collection_default_enabled";
@@ -525,7 +525,7 @@ protected FirebaseApp(Context applicationContext, String name, FirebaseOptions o
     idTokenListenersCountChangedListener = new DefaultIdTokenListenersCountChangedListener();
 
     sharedPreferences =
-        applicationContext.getSharedPreferences(FIREBASE_APP_PREFS, Context.MODE_PRIVATE);
+        applicationContext.getSharedPreferences(getSharedPrefsName(name), Context.MODE_PRIVATE);
     dataCollectionDefaultEnabled = new AtomicBoolean(readAutoDataCollectionEnabled());
 
     List<ComponentRegistrar> registrars =
@@ -540,6 +540,10 @@ protected FirebaseApp(Context applicationContext, String name, FirebaseOptions o
     publisher = componentRuntime.get(Publisher.class);
   }
 
+  private static String getSharedPrefsName(String appName) {
+    return FIREBASE_APP_PREFS + appName;
+  }
+
   private boolean readAutoDataCollectionEnabled() {
     if (sharedPreferences.contains(DATA_COLLECTION_DEFAULT_ENABLED)) {
       return sharedPreferences.getBoolean(DATA_COLLECTION_DEFAULT_ENABLED, true);