Merge branch 'master' into crashlytics-smoke-tests

Author: mrichards

alternative-root-project.gradle

@@ -33,15 +33,17 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:3.4.3'
         classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.14'
-        classpath 'net.ltgt.gradle:gradle-errorprone-plugin:1.2.1'
-        classpath 'gradle.plugin.com.github.sherter.google-java-format:google-java-format-gradle-plugin:0.8'
-        classpath 'com.google.gms:google-services:4.3.0'
-        classpath 'digital.wup:android-maven-publish:3.6.2'
+        classpath 'net.ltgt.gradle:gradle-errorprone-plugin:1.3.0'
+        classpath 'gradle.plugin.com.github.sherter.google-java-format:google-java-format-gradle-plugin:0.9'
+        classpath 'com.google.gms:google-services:4.3.3'
+        classpath 'digital.wup:android-maven-publish:3.6.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
-        classpath 'org.jlleitschuh.gradle:ktlint-gradle:7.1.0'
+        classpath 'org.jlleitschuh.gradle:ktlint-gradle:9.2.1'
     }
 }
 
+apply from: 'sdkProperties.gradle'
+
 ext {
     playServicesVersion = '16.0.1'
     supportAnnotationsVersion = '28.0.0'
@@ -55,12 +57,4 @@ ext {
 
 apply from: 'build.gradle'
 
-configure(subprojects) {
-    afterEvaluate {
-        tasks.verifyGoogleJavaFormat {
-            exclude '**/build/classes/**'
-        }
-    }
-}
-
 apply plugin: MultiProjectReleasePlugin

ci/fireci/fireci/gradle.py

@@ -15,8 +15,6 @@
 import logging
 import os
 import subprocess
-import sys
-
 
 _logger = logging.getLogger('fireci.gradle')
 
@@ -39,9 +37,19 @@ def run(*args, gradle_opts='', workdir=None, check=True):
   command = ['./gradlew'] + list(args)
   _logger.info('Executing gradle command: "%s" in directory: "%s"',
                " ".join(command), workdir if workdir else '.')
-  return subprocess.run(
+
+  with subprocess.Popen(
       command,
       cwd=workdir,
       env=new_env,
-      check=check,
-  )
+      stdout=subprocess.PIPE,
+      stderr=subprocess.STDOUT,
+  ) as p:
+    for line in p.stdout:
+      _logger.info(line.decode().rstrip())
+
+    p.communicate()
+
+    if check and p.returncode:
+      raise subprocess.CalledProcessError(p.returncode, p.args, p.stdout, p.stderr)
+  return subprocess.CompletedProcess(p.args, p.returncode, p.stdout, p.stderr)

ci/fireci/fireci/main.py

@@ -19,7 +19,8 @@
 from .internal import main
 
 logging.basicConfig(
-    format='%(name)s: [%(levelname)s] %(message)s',
+    datefmt='%Y-%m-%d %H:%M:%S %z %Z',
+    format='[%(levelname).1s] %(asctime)s %(name)s: %(message)s',
     level=logging.INFO,
 )
 logging.getLogger('fireci').setLevel(logging.DEBUG)

ci/fireci/tests/gradle_test.py

@@ -28,13 +28,13 @@
 class GradleTest(unittest.TestCase):
 
   @in_tempdir
-  def test_when_gradle_suceeds_should_not_throw(self):
+  def test_when_gradle_succeeds_should_not_throw(self):
     create_artifacts(
         Artifact('gradlew', content=scripts.with_exit(0), mode=0o744))
     self.assertEqual(gradle.run('tasks').returncode, 0)
 
   @in_tempdir
-  def test_when_gradle_suceeds_should_not_throw(self):
+  def test_when_gradle_fails_should_throw(self):
     create_artifacts(
         Artifact('gradlew', content=scripts.with_exit(1), mode=0o744))
     self.assertRaises(subprocess.CalledProcessError,

ci/fireci/tests/integ_tests.py

@@ -12,9 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import os
 import pathlib
-import subprocess
 import unittest
 
 from click.testing import CliRunner
@@ -41,7 +39,7 @@ def test_gradle_invocation(self):
                 ['./gradlew'] + args,
                 {'GRADLE_OPTS': 'opts'},
                 ('sdk1/build/output/file1', 'content1'),
-                ('sdk1/build/outputss/file2', 'content2'),
+                ('sdk1/build/outputs/file2', 'content2'),
             ),
             mode=0o744))
     result = self.runner.invoke(cli, [
@@ -53,7 +51,7 @@ def test_gradle_invocation(self):
     artifacts = pathlib.Path('_artifacts')
     self.assertTrue(artifacts.exists())
 
-    output_file = artifacts / 'sdk1_build_outputss' / 'file2'
+    output_file = artifacts / 'sdk1_build_outputs' / 'file2'
     self.assertFalse(output_file.exists())
 
     output_file = artifacts / 'sdk1_build_output' / 'file1'

encoders/README.md

@@ -0,0 +1,123 @@
+# Firebase Encoders
+
+This project provides libraries and code generation infrastructure that allows
+encoding java classes into various target serialization formats(currently
+supported: **json** and **proto**).
+
+The project consists of multiple parts:
+
+*   `firebase_encoders` - Core API and Annotations library.
+*   `processor` - Java plugin that automatically generates encoders for
+    `@Encodable` annotated POJOs.
+*   `firebase_encoders_json` - JSON serialization support.
+*   `firebase_encoders_proto` - Protobuf serialization support.
+*   `protoc_gen` - Protobuf compiler plugin that generates encoder-compliant
+    classes. Can be used with `firebase_encoders_proto` and
+    `firebase_encoders_json`.
+*   `reflective` - Can be used to encode any given class via Java
+    reflection(**not recommented**).
+
+### Protobuf gettings started
+
+##### Step1. Place proto files into **src/main/proto/**
+
+*src/main/proto/my.proto*
+```proto
+syntax = "proto3";
+
+package com.example.my;
+
+import "google/protobuf/timestamp.proto";
+
+message SimpleProto {
+  int32 value = 1;
+  .google.protobuf.Timestamp time = 2;
+}
+```
+
+
+##### Step2. Add the following configurations into gradle module build file.
+
+*example.gradle*
+```gradle
+plugins {
+    id "java-library"
+    id 'com.google.protobuf'
+}
+
+// add a dependency on the protoc plugin's fat jar to make it available to protobuf below.
+configurations.create("protobuild")
+dependencies {
+    protobuild project(path: ":encoders:protoc-gen-firebase-encoders", configuration: "shadow")
+}
+
+protobuf {
+    protoc {
+        artifact = "com.google.protobuf:protoc:$protocVersion"
+    }
+    plugins {
+        firebaseEncoders {
+            path = configurations.protobuild.asPath
+        }
+    }
+    generateProtoTasks {
+        all().each { task ->
+            task.dependsOn configurations.protobuild
+            task.inputs.file 'code-gen-cfg.textproto'
+            task.plugins {
+                firebaseEncoders {
+                    option file('code-gen-cfg.textproto').path
+                }
+            }
+            // In most cases you don't need the full Java output
+            task.builtins {
+                remove java
+            }
+        }
+    }
+}
+
+dependencies {
+    implementation project(":encoders:firebase-encoders")
+    implementation project(":encoders:firebase-encoders-proto")
+    annotationProcessor project(":encoders:firebase-encoders-processor")
+}
+```
+
+##### Step3. Create a code-gen-cfg.textproto file at the module root folder(same location as the gradle module build file).
+
+*code-gen-cfg.textproto* 
+
+Note:
+- The filename must be the same as the filename determined in the gradle build file.
+- Only need to specify the "root" proto object, anything it references will automatically be included.
+```textproto
+# code_gen_cfg.textproto
+# proto-file: src/main/proto/my.proto
+# proto-message: SimpleProto
+
+# all types will be vendored in this package
+vendor_package: "com.google"
+
+# marks a type as a "root" message
+include: "com.example.my.SimpleProto"
+```
+
+With the above configuration here's a list of classes that will be generated:
+
+```
+com.google.com.example.my.SimpleProto
+com.google.com.example.my.SimpleProto$Builder
+com.google.google.protobuf.Timestamp
+com.google.google.protobuf.Timestamp$Builder
+```
+
+Only `root` classes are "encodable" meaning that they have the following
+methods:
+
+```java
+public class SimpleProto {
+  public void writeTo(OutputStream output) throws IOException;
+  public byte[] toByteArray();
+}
+```

firebase-app-distribution/firebase-app-distribution.gradle

@@ -0,0 +1,63 @@
+// Copyright 2021 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.
+
+plugins {
+    id 'firebase-library'
+}
+
+android {
+    compileSdkVersion project.targetSdkVersion
+
+    defaultConfig {
+        minSdkVersion 16
+        targetSdkVersion project.targetSdkVersion
+        multiDexEnabled true
+        versionName version
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    testOptions {
+        unitTests {
+            includeAndroidResources = true
+        }
+    }
+}
+
+dependencies {
+    implementation 'org.jetbrains:annotations:15.0'
+    implementation project(path: ':firebase-components')
+    implementation project(path: ':firebase-installations-interop')
+    implementation project(path: ':firebase-common')
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation project(path: ':firebase-installations')
+
+    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.12'
+    testImplementation "org.robolectric:robolectric:$robolectricVersion"
+    testImplementation "com.google.truth:truth:$googleTruthVersion"
+    testImplementation 'org.mockito:mockito-core:2.25.0'
+    androidTestImplementation "org.mockito:mockito-android:2.25.0"
+    testImplementation 'androidx.test:core:1.2.0'
+
+    implementation 'com.google.android.gms:play-services-tasks:17.0.0'
+
+    compileOnly 'com.google.auto.value:auto-value-annotations:1.6.5'
+    annotationProcessor 'com.google.auto.value:auto-value:1.6.5'
+
+    implementation 'com.android.support:customtabs:28.0.0'
+    implementation "androidx.browser:browser:1.3.0"
+}

firebase-app-distribution/gradle.properties

@@ -0,0 +1,17 @@
+# Copyright 2021 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.
+
+version=0.0.1
+android.useAndroidX=true
+android.enableJetifier=true

firebase-app-distribution/src/main/AndroidManifest.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2021 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. -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.google.firebase.appdistribution">
+
+    <application>
+        <service
+            android:name="com.google.firebase.components.ComponentDiscoveryService"
+            android:exported="false">
+            <meta-data
+                android:name="com.google.firebase.components:com.google.firebase.appdistribution.FirebaseAppDistributionRegistrar"
+                android:value="com.google.firebase.components.ComponentRegistrar" />
+        </service>
+
+        <activity android:name=".SignInResultActivity" android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE"/>
+
+                <data android:scheme="appdistribution-${applicationId}" android:host="authredirect" />
+
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>