Merge remote-tracking branch 'remotes/origin/mila/BloomFilter' into BloomFilterComplexIntegrationTest

Author: dconeybe

.github/workflows/build-release-artifacts.yml

@@ -8,7 +8,8 @@ on:
 
 jobs:
   build-artifacts:
-    runs-on: ubuntu-latest
+    # TODO(b/271315039) - Revert back to ubuntu when fixed
+    runs-on: macos-latest
     env:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:

encoders/firebase-encoders-json/firebase-encoders-json.gradle

@@ -14,6 +14,7 @@
 
 plugins {
     id 'firebase-library'
+    id 'kotlin-android'
 }
 
 firebaseLibrary {
@@ -24,16 +25,19 @@ firebaseLibrary {
 android {
     compileSdkVersion project.targetSdkVersion
     defaultConfig {
-      minSdkVersion project.minSdkVersion
-      targetSdkVersion project.targetSdkVersion
-      versionName version
-      testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        minSdkVersion project.minSdkVersion
+        targetSdkVersion project.targetSdkVersion
+        versionName version
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
     testOptions {
         unitTests {
             includeAndroidResources = true

encoders/firebase-encoders-json/src/main/java/com/google/firebase/encoders/json/JsonValueObjectEncoderContext.java

@@ -317,7 +317,11 @@ JsonValueObjectEncoderContext add(@Nullable Object o, boolean inline) throws IOE
 
     // Process enum last if it does not have a custom encoder registered.
     if (o instanceof Enum) {
-      add(((Enum) o).name());
+      if (o instanceof NumberedEnum) {
+        add(((NumberedEnum) o).getNumber());
+      } else {
+        add(((Enum<?>) o).name());
+      }
       return this;
     }
 

encoders/firebase-encoders-json/src/main/java/com/google/firebase/encoders/json/NumberedEnum.kt

@@ -0,0 +1,22 @@
+/*
+ * Copyright 2023 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.
+ */
+
+package com.google.firebase.encoders.json
+
+/** Represents an explicitly numbered enum for json serialization. */
+interface NumberedEnum {
+  val number: Int
+}

encoders/firebase-encoders-json/src/test/java/com/google/firebase/encoders/json/DummyEnum.kt

@@ -0,0 +1,22 @@
+/*
+ * Copyright 2023 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.
+ */
+
+package com.google.firebase.encoders.json
+
+internal enum class DummyEnum(override val number: Int) : NumberedEnum {
+  VALUE_1(1),
+  VALUE_2(2),
+}

encoders/firebase-encoders-json/src/test/java/com/google/firebase/encoders/json/JsonValueObjectEncoderContextTest.java

@@ -219,6 +219,18 @@ public void testEncodingEnum_withCustomEncoder() {
     assertThat(result).isEqualTo("[\"value_1\",\"value_2\"]");
   }
 
+  @Test
+  public void testEncodingNumberedEnum() {
+    String result =
+        new JsonDataEncoderBuilder()
+            .build()
+            .encode(
+                new DummyEnum[] {
+                  DummyEnum.VALUE_1, DummyEnum.VALUE_2, DummyEnum.VALUE_1, DummyEnum.VALUE_1
+                });
+    assertThat(result).isEqualTo("[1,2,1,1]");
+  }
+
   @Test
   public void testEncodingCollection() throws IOException {
     ObjectEncoder<InnerDummyClass> anotherObjectEncoder =

firebase-appdistribution/firebase-appdistribution.gradle

@@ -52,7 +52,7 @@ dependencies {
     implementation 'com.google.firebase:firebase-common:20.3.1'
     testImplementation project(path: ':firebase-appdistribution')
     testImplementation project(':integ-testing')
-    runtimeOnly project(':firebase-installations')
+    runtimeOnly 'com.google.firebase:firebase-installations:17.1.2'
 
     implementation libs.javax.inject
     vendor (libs.dagger.dagger) {

firebase-appdistribution/test-app/test-app.gradle

@@ -76,7 +76,7 @@ dependencies {
 
     // In this test project we also need to explicitly declare these dependencies
     implementation project(':firebase-appdistribution-api')
-    implementation project(':firebase-common:ktx')
+    implementation 'com.google.firebase:firebase-common-ktx:20.3.1'
     implementation "com.google.android.gms:play-services-tasks:18.0.2"
 
     // Beta flavor uses the full implementation

firebase-config/CHANGELOG.md

@@ -1,4 +1,5 @@
 # Unreleased
+* [feature] Added support for real-time config updates. To learn more, see [Get started with Firebase Remote Config](https://firebase.google.com/docs/remote-config/get-started?platform=android).
 
 # 21.2.1
 * [changed] Migrated [remote_config] to use standard Firebase executors.

firebase-config/api.txt

@@ -1,8 +1,24 @@
 // Signature format: 2.0
 package com.google.firebase.remoteconfig {
 
+  @com.google.auto.value.AutoValue public abstract class ConfigUpdate {
+    ctor public ConfigUpdate();
+    method @NonNull public static com.google.firebase.remoteconfig.ConfigUpdate create(@NonNull java.util.Set<java.lang.String>);
+    method @NonNull public abstract java.util.Set<java.lang.String> getUpdatedKeys();
+  }
+
+  public interface ConfigUpdateListener {
+    method public void onError(@NonNull com.google.firebase.remoteconfig.FirebaseRemoteConfigException);
+    method public void onUpdate(@NonNull com.google.firebase.remoteconfig.ConfigUpdate);
+  }
+
+  public interface ConfigUpdateListenerRegistration {
+    method public void remove();
+  }
+
   public class FirebaseRemoteConfig {
     method @NonNull public com.google.android.gms.tasks.Task<java.lang.Boolean> activate();
+    method @NonNull public com.google.firebase.remoteconfig.ConfigUpdateListenerRegistration addOnConfigUpdateListener(@NonNull com.google.firebase.remoteconfig.ConfigUpdateListener);
     method @NonNull public com.google.android.gms.tasks.Task<com.google.firebase.remoteconfig.FirebaseRemoteConfigInfo> ensureInitialized();
     method @NonNull public com.google.android.gms.tasks.Task<java.lang.Void> fetch();
     method @NonNull public com.google.android.gms.tasks.Task<java.lang.Void> fetch(long);
@@ -38,11 +54,25 @@ package com.google.firebase.remoteconfig {
   public class FirebaseRemoteConfigClientException extends com.google.firebase.remoteconfig.FirebaseRemoteConfigException {
     ctor public FirebaseRemoteConfigClientException(@NonNull String);
     ctor public FirebaseRemoteConfigClientException(@NonNull String, @Nullable Throwable);
+    ctor public FirebaseRemoteConfigClientException(@NonNull String, @NonNull com.google.firebase.remoteconfig.FirebaseRemoteConfigException.Code);
+    ctor public FirebaseRemoteConfigClientException(@NonNull String, @Nullable Throwable, @NonNull com.google.firebase.remoteconfig.FirebaseRemoteConfigException.Code);
   }
 
   public class FirebaseRemoteConfigException extends com.google.firebase.FirebaseException {
     ctor public FirebaseRemoteConfigException(@NonNull String);
     ctor public FirebaseRemoteConfigException(@NonNull String, @Nullable Throwable);
+    ctor public FirebaseRemoteConfigException(@NonNull String, @NonNull com.google.firebase.remoteconfig.FirebaseRemoteConfigException.Code);
+    ctor public FirebaseRemoteConfigException(@NonNull String, @Nullable Throwable, @NonNull com.google.firebase.remoteconfig.FirebaseRemoteConfigException.Code);
+    method @NonNull public com.google.firebase.remoteconfig.FirebaseRemoteConfigException.Code getCode();
+  }
+
+  public enum FirebaseRemoteConfigException.Code {
+    method public int value();
+    enum_constant public static final com.google.firebase.remoteconfig.FirebaseRemoteConfigException.Code CONFIG_UPDATE_MESSAGE_INVALID;
+    enum_constant public static final com.google.firebase.remoteconfig.FirebaseRemoteConfigException.Code CONFIG_UPDATE_NOT_FETCHED;
+    enum_constant public static final com.google.firebase.remoteconfig.FirebaseRemoteConfigException.Code CONFIG_UPDATE_STREAM_ERROR;
+    enum_constant public static final com.google.firebase.remoteconfig.FirebaseRemoteConfigException.Code CONFIG_UPDATE_UNAVAILABLE;
+    enum_constant public static final com.google.firebase.remoteconfig.FirebaseRemoteConfigException.Code UNKNOWN;
   }
 
   public class FirebaseRemoteConfigFetchThrottledException extends com.google.firebase.remoteconfig.FirebaseRemoteConfigException {
@@ -59,6 +89,10 @@ package com.google.firebase.remoteconfig {
   public class FirebaseRemoteConfigServerException extends com.google.firebase.remoteconfig.FirebaseRemoteConfigException {
     ctor public FirebaseRemoteConfigServerException(int, @NonNull String);
     ctor public FirebaseRemoteConfigServerException(int, @NonNull String, @Nullable Throwable);
+    ctor public FirebaseRemoteConfigServerException(@NonNull String, @NonNull com.google.firebase.remoteconfig.FirebaseRemoteConfigException.Code);
+    ctor public FirebaseRemoteConfigServerException(int, @NonNull String, @NonNull com.google.firebase.remoteconfig.FirebaseRemoteConfigException.Code);
+    ctor public FirebaseRemoteConfigServerException(@NonNull String, @Nullable Throwable, @NonNull com.google.firebase.remoteconfig.FirebaseRemoteConfigException.Code);
+    ctor public FirebaseRemoteConfigServerException(int, @NonNull String, @Nullable Throwable, @NonNull com.google.firebase.remoteconfig.FirebaseRemoteConfigException.Code);
     method public int getHttpStatusCode();
   }