Merge branch 'firebase:master' into master

Author: mkj-gram

README.md

@@ -5,6 +5,7 @@ currently includes the following Firebase libraries, and some of their
 dependencies:
 
   * `firebase-abt`
+  * `firebase-appdistribution`
   * `firebase-common`
   * `firebase-common-ktx`
   * `firebase-crashlytics`
@@ -22,6 +23,8 @@ dependencies:
   * `firebase-inappmessaging-ktx`
   * `firebase-inappmessaging-display`
   * `firebase-inappmessaging-display-ktx`
+  * `firebase-messaging`
+  * `firebase-messaging-directboot`
   * `firebase-perf`
   * `firebase-perf-ktx`
   * `firebase-remote-config`

build.gradle

@@ -18,14 +18,14 @@ buildscript {
     ext.kotlinVersion = '1.3.72'
     repositories {
         google()
-        jcenter()
         mavenCentral()
         maven {
             url "https://plugins.gradle.org/m2/"
         }
         maven {
             url 'https://storage.googleapis.com/android-ci/mvn/'
         }
+        jcenter()
     }
 
     dependencies {
@@ -70,11 +70,11 @@ if(JavaVersion.current() != JavaVersion.VERSION_11){
 configure(subprojects) {
     repositories {
         google()
-        jcenter()
         mavenLocal()
         maven {
             url 'https://storage.googleapis.com/android-ci/mvn/'
         }
+        jcenter()
     }
 
     apply plugin: "org.jlleitschuh.gradle.ktlint"

ci/fireci/fireciplugins/fireperf.py

@@ -42,7 +42,7 @@ def fireperf_e2e_test(target_environment, plugin_repo_dir):
 
   _logger.info('Building fireperf plugin ...')
   with chdir(plugin_repo_dir):
-    build_plugin_task = ':firebase-performance:performance-gradle:publishToMavenLocal'
+    build_plugin_task = ':firebase-performance:perf-plugin:publishToMavenLocal'
     gradle.run(build_plugin_task, gradle.P('publishMode', 'SNAPSHOT'))
 
   version = _find_fireperf_plugin_version()

ci/fireci/fireciplugins/macrobenchmark.py

@@ -184,7 +184,7 @@ async def _execute_benchmark_tests(self):
     args += ['--type', 'instrumentation']
     args += ['--app', app_apk_path]
     args += ['--test', test_apk_path]
-    args += ['--device', 'model=flame,version=30,locale=en,orientation=portrait']
+    args += ['--device', 'model=redfin,version=30,locale=en,orientation=portrait']
     args += ['--directories-to-pull', '/sdcard/Download']
     args += ['--results-bucket', f'gs://{self.test_results_bucket}']
     args += ['--results-dir', self.test_results_dir]

encoders/firebase-encoders-proto/firebase-encoders-proto.gradle

@@ -42,7 +42,7 @@ dependencies {
 
     testAnnotationProcessor project(':encoders:firebase-encoders-processor')
 
-    testImplementation 'com.google.guava:guava:30.0-jre'
+    testImplementation 'com.google.guava:guava:31.0-jre'
     testImplementation 'junit:junit:4.13.1'
     testImplementation 'com.google.protobuf:protobuf-java-util:3.11.0'
     testImplementation 'com.google.truth.extensions:truth-proto-extension:1.0'

encoders/firebase-encoders-proto/src/test/java/com/google/firebase/encoders/proto/WithCollectionsTests.java

@@ -51,7 +51,7 @@ public void test2() throws InvalidProtocolBufferException {
                     .put("noValue", new Fixed())
                     .put("value", new Fixed(1, 2, 3, 4))
                     .put("", new Fixed())
-                    .build(),
+                    .buildOrThrow(),
                 ImmutableList.of(
                     new OtherTypes("hello", new byte[0], false, true),
                     new OtherTypes("", new byte[] {42}, true, false),

firebase-app-distribution/api.txt

@@ -0,0 +1,75 @@
+// Signature format: 2.0
+package com.google.firebase.appdistribution {
+
+  public abstract class AppDistributionRelease {
+    ctor public AppDistributionRelease();
+    method @NonNull public abstract com.google.firebase.appdistribution.BinaryType getBinaryType();
+    method @NonNull public abstract String getDisplayVersion();
+    method @Nullable public abstract String getReleaseNotes();
+    method @NonNull public abstract long getVersionCode();
+  }
+
+  public enum BinaryType {
+    enum_constant public static final com.google.firebase.appdistribution.BinaryType AAB;
+    enum_constant public static final com.google.firebase.appdistribution.BinaryType APK;
+  }
+
+  public class FirebaseAppDistribution {
+    method @NonNull public com.google.android.gms.tasks.Task<com.google.firebase.appdistribution.AppDistributionRelease> checkForNewRelease();
+    method @NonNull public static com.google.firebase.appdistribution.FirebaseAppDistribution getInstance();
+    method public boolean isTesterSignedIn();
+    method @NonNull public com.google.android.gms.tasks.Task<java.lang.Void> signInTester();
+    method public void signOutTester();
+    method @NonNull public com.google.firebase.appdistribution.UpdateTask updateApp();
+    method @NonNull public com.google.firebase.appdistribution.UpdateTask updateIfNewReleaseAvailable();
+  }
+
+  public class FirebaseAppDistributionException extends com.google.firebase.FirebaseException {
+    method @NonNull public com.google.firebase.appdistribution.FirebaseAppDistributionException.Status getErrorCode();
+    method @Nullable public com.google.firebase.appdistribution.AppDistributionRelease getRelease();
+  }
+
+  public enum FirebaseAppDistributionException.Status {
+    enum_constant public static final com.google.firebase.appdistribution.FirebaseAppDistributionException.Status APP_RUNNING_IN_PRODUCTION;
+    enum_constant public static final com.google.firebase.appdistribution.FirebaseAppDistributionException.Status AUTHENTICATION_CANCELED;
+    enum_constant public static final com.google.firebase.appdistribution.FirebaseAppDistributionException.Status AUTHENTICATION_FAILURE;
+    enum_constant public static final com.google.firebase.appdistribution.FirebaseAppDistributionException.Status DOWNLOAD_FAILURE;
+    enum_constant public static final com.google.firebase.appdistribution.FirebaseAppDistributionException.Status INSTALLATION_CANCELED;
+    enum_constant public static final com.google.firebase.appdistribution.FirebaseAppDistributionException.Status INSTALLATION_FAILURE;
+    enum_constant public static final com.google.firebase.appdistribution.FirebaseAppDistributionException.Status NETWORK_FAILURE;
+    enum_constant public static final com.google.firebase.appdistribution.FirebaseAppDistributionException.Status UNKNOWN;
+    enum_constant public static final com.google.firebase.appdistribution.FirebaseAppDistributionException.Status UPDATE_NOT_AVAILABLE;
+  }
+
+  public interface OnProgressListener {
+    method public void onProgressUpdate(@NonNull com.google.firebase.appdistribution.UpdateProgress);
+  }
+
+  public abstract class UpdateProgress {
+    ctor public UpdateProgress();
+    method @NonNull public abstract long getApkBytesDownloaded();
+    method @NonNull public abstract long getApkFileTotalBytes();
+    method @NonNull public abstract com.google.firebase.appdistribution.UpdateStatus getUpdateStatus();
+  }
+
+  public enum UpdateStatus {
+    enum_constant public static final com.google.firebase.appdistribution.UpdateStatus DOWNLOADED;
+    enum_constant public static final com.google.firebase.appdistribution.UpdateStatus DOWNLOADING;
+    enum_constant public static final com.google.firebase.appdistribution.UpdateStatus DOWNLOAD_FAILED;
+    enum_constant public static final com.google.firebase.appdistribution.UpdateStatus INSTALL_CANCELED;
+    enum_constant public static final com.google.firebase.appdistribution.UpdateStatus INSTALL_FAILED;
+    enum_constant public static final com.google.firebase.appdistribution.UpdateStatus NEW_RELEASE_CHECK_FAILED;
+    enum_constant public static final com.google.firebase.appdistribution.UpdateStatus NEW_RELEASE_NOT_AVAILABLE;
+    enum_constant public static final com.google.firebase.appdistribution.UpdateStatus PENDING;
+    enum_constant public static final com.google.firebase.appdistribution.UpdateStatus REDIRECTED_TO_PLAY;
+    enum_constant public static final com.google.firebase.appdistribution.UpdateStatus UPDATE_CANCELED;
+  }
+
+  public abstract class UpdateTask extends com.google.android.gms.tasks.Task<java.lang.Void> {
+    ctor public UpdateTask();
+    method @NonNull public abstract com.google.firebase.appdistribution.UpdateTask addOnProgressListener(@NonNull com.google.firebase.appdistribution.OnProgressListener);
+    method @NonNull public abstract com.google.firebase.appdistribution.UpdateTask addOnProgressListener(@Nullable java.util.concurrent.Executor, @NonNull com.google.firebase.appdistribution.OnProgressListener);
+  }
+
+}
+

firebase-app-distribution/ktx/api.txt

@@ -0,0 +1,50 @@
+// 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 'com.google.android.gms:play-services-tasks:17.0.0'
+
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation "com.google.truth:truth:$googleTruthVersion"
+    testImplementation "org.robolectric:robolectric:$robolectricVersion"
+
+    compileOnly 'com.google.auto.value:auto-value-annotations:1.6.5'
+    annotationProcessor 'com.google.auto.value:auto-value:1.6.5'
+}

firebase-appdistribution-stub/api.txt

@@ -0,0 +1,16 @@
+# 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
+latestReleasedVersion=0.0.1

firebase-appdistribution-stub/firebase-appdistribution-stub.gradle

@@ -0,0 +1,10 @@
+// Signature format: 2.0
+package com.google.firebase.appdistribution.ktx {
+
+  public final class FirebaseAppDistributionKt {
+    ctor public FirebaseAppDistributionKt();
+    method @NonNull public static com.google.firebase.appdistribution.FirebaseAppDistribution getAppDistribution(@NonNull com.google.firebase.ktx.Firebase);
+  }
+
+}
+

firebase-appdistribution-stub/gradle.properties

@@ -0,0 +1,64 @@
+// 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'
+    id 'kotlin-android'
+}
+
+firebaseLibrary {
+    releaseWith project(':firebase-appdistribution-stub')
+    testLab.enabled = true
+    publishJavadoc = true
+    publishSources = true
+}
+
+android {
+    compileSdkVersion project.targetSdkVersion
+    defaultConfig {
+        minSdkVersion 16
+        multiDexEnabled true
+        targetSdkVersion project.targetSdkVersion
+        versionName version
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+    }
+    sourceSets {
+        main.java.srcDirs += 'src/main/kotlin'
+        test.java {
+            srcDir 'src/test/kotlin'
+        }
+        androidTest.java.srcDirs += 'src/androidTest/kotlin'
+    }
+    testOptions.unitTests.includeAndroidResources = true
+}
+
+dependencies {
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
+
+    implementation project(':firebase-common')
+    implementation project(':firebase-components')
+    implementation project(':firebase-common:ktx')
+    implementation 'androidx.annotation:annotation:1.1.0'
+    implementation project(':firebase-appdistribution-stub')
+
+    testImplementation "org.robolectric:robolectric:$robolectricVersion"
+    testImplementation 'junit:junit:4.12'
+    testImplementation "com.google.truth:truth:$googleTruthVersion"
+    testImplementation 'org.mockito:mockito-core:2.25.0'
+
+    androidTestImplementation 'junit:junit:4.12'
+    androidTestImplementation "com.google.truth:truth:$googleTruthVersion"
+    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation 'androidx.test:core:1.2.0'
+}