Skip to content

Commit 3e03785

Browse files
tejasdtejasd
committed
Merge branch 'td/fireperf-gauge-metadata' into td/fireperf-aqs
2 parents 5093a85 + 148b068 commit 3e03785

File tree

92 files changed

+4568
-3082
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+4568
-3082
lines changed

‎.github/workflows/dataconnect.yml‎

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,16 @@ jobs:
174174
cd firebase-dataconnect/emulator
175175
${{ env.FDC_FIREBASE_COMMAND }} emulators:start --only=auth >firebase.emulator.auth.log 2>&1 &
176176
177+
- name: Capture Logcat Logs
178+
run: adb logcat >logcat.log &
179+
177180
- name: Gradle connectedCheck
181+
id: connectedCheck
178182
uses: reactivecircus/android-emulator-runner@v2
183+
# Allow this GitHub Actions "job" to continue even if the tests fail so that logs from a
184+
# failed test run get uploaded as "artifacts" and are available to investigate failed runs.
185+
# A later step in this "job" will fail the job if this step fails
186+
continue-on-error: true
179187
with:
180188
api-level: ${{ env.FDC_ANDROID_EMULATOR_API_LEVEL }}
181189
arch: x86_64
@@ -185,21 +193,28 @@ jobs:
185193
script: |
186194
set -eux && ./gradlew ${{ (inputs.gradleInfoLog && '--info') || '' }} :firebase-dataconnect:connectedCheck :firebase-dataconnect:connectors:connectedCheck
187195
188-
- uses: actions/upload-artifact@v4
189-
if: true
196+
- name: Upload log file artifacts
197+
uses: actions/upload-artifact@v4
190198
with:
191-
name: logs
199+
name: integration_test_logs
192200
path: "**/*.log"
193201
if-no-files-found: warn
194202
compression-level: 9
195203

196-
- uses: actions/upload-artifact@v4
204+
- name: Upload Gradle build report artifacts
205+
uses: actions/upload-artifact@v4
197206
with:
198-
name: gradle_build_reports
207+
name: integration_test_gradle_build_reports
199208
path: firebase-dataconnect/**/build/reports/
200209
if-no-files-found: warn
201210
compression-level: 9
202211

212+
- name: Check test result
213+
if: steps.connectedCheck.outcome != 'success'
214+
run: |
215+
echo "Failing the job since the connectedCheck step failed"
216+
exit 1
217+
203218
# Check this yml file with "actionlint": https://github.com/rhysd/actionlint
204219
# To run actionlint yourself, run `brew install actionlint` followed by
205220
# `actionlint .github/workflows/dataconnect.yml`

‎appcheck/firebase-appcheck-debug-testing/api.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
// Signature format: 2.0
1+
// Signature format: 3.0
22
package com.google.firebase.appcheck.debug.testing {
33

44
public final class DebugAppCheckTestHelper {
5-
method @NonNull public static com.google.firebase.appcheck.debug.testing.DebugAppCheckTestHelper fromInstrumentationArgs();
6-
method public <E extends java.lang.Throwable> void withDebugProvider(@NonNull com.google.firebase.appcheck.debug.testing.DebugAppCheckTestHelper.MaybeThrowingRunnable<E>) throws E;
7-
method public <E extends java.lang.Throwable> void withDebugProvider(@NonNull com.google.firebase.FirebaseApp, @NonNull com.google.firebase.appcheck.debug.testing.DebugAppCheckTestHelper.MaybeThrowingRunnable<E>) throws E;
5+
method public static com.google.firebase.appcheck.debug.testing.DebugAppCheckTestHelper fromInstrumentationArgs();
6+
method public <E extends java.lang.Throwable> void withDebugProvider(com.google.firebase.appcheck.debug.testing.DebugAppCheckTestHelper.MaybeThrowingRunnable<E!>) throws E;
7+
method public <E extends java.lang.Throwable> void withDebugProvider(com.google.firebase.FirebaseApp, com.google.firebase.appcheck.debug.testing.DebugAppCheckTestHelper.MaybeThrowingRunnable<E!>) throws E;
88
}
99

1010
public static interface DebugAppCheckTestHelper.MaybeThrowingRunnable<E extends java.lang.Throwable> {

‎appcheck/firebase-appcheck-debug/api.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
// Signature format: 2.0
1+
// Signature format: 3.0
22
package com.google.firebase.appcheck.debug {
33

44
public class DebugAppCheckProviderFactory implements com.google.firebase.appcheck.AppCheckProviderFactory {
5-
method @NonNull public com.google.firebase.appcheck.AppCheckProvider create(@NonNull com.google.firebase.FirebaseApp);
6-
method @NonNull public static com.google.firebase.appcheck.debug.DebugAppCheckProviderFactory getInstance();
5+
method public com.google.firebase.appcheck.AppCheckProvider create(com.google.firebase.FirebaseApp);
6+
method public static com.google.firebase.appcheck.debug.DebugAppCheckProviderFactory getInstance();
77
}
88

99
}

‎appcheck/firebase-appcheck-interop/api.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
// Signature format: 2.0
1+
// Signature format: 3.0
22
package com.google.firebase.appcheck {
33

44
public abstract class AppCheckTokenResult {
55
ctor public AppCheckTokenResult();
6-
method @Nullable public abstract Exception getError();
7-
method @NonNull public abstract String getToken();
6+
method public abstract Exception? getError();
7+
method public abstract String getToken();
88
}
99

1010
}
1111

1212
package com.google.firebase.appcheck.interop {
1313

1414
public interface AppCheckTokenListener {
15-
method public void onAppCheckTokenChanged(@NonNull com.google.firebase.appcheck.AppCheckTokenResult);
15+
method public void onAppCheckTokenChanged(com.google.firebase.appcheck.AppCheckTokenResult);
1616
}
1717

1818
}

‎appcheck/firebase-appcheck-playintegrity/api.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
// Signature format: 2.0
1+
// Signature format: 3.0
22
package com.google.firebase.appcheck.playintegrity {
33

44
public class PlayIntegrityAppCheckProviderFactory implements com.google.firebase.appcheck.AppCheckProviderFactory {
55
ctor public PlayIntegrityAppCheckProviderFactory();
6-
method @NonNull public com.google.firebase.appcheck.AppCheckProvider create(@NonNull com.google.firebase.FirebaseApp);
7-
method @NonNull public static com.google.firebase.appcheck.playintegrity.PlayIntegrityAppCheckProviderFactory getInstance();
6+
method public com.google.firebase.appcheck.AppCheckProvider create(com.google.firebase.FirebaseApp);
7+
method public static com.google.firebase.appcheck.playintegrity.PlayIntegrityAppCheckProviderFactory getInstance();
88
}
99

1010
}

‎appcheck/firebase-appcheck/api.txt‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,53 @@
1-
// Signature format: 2.0
1+
// Signature format: 3.0
22
package com.google.firebase.appcheck {
33

44
public interface AppCheckProvider {
5-
method @NonNull public com.google.android.gms.tasks.Task<com.google.firebase.appcheck.AppCheckToken> getToken();
5+
method public com.google.android.gms.tasks.Task<com.google.firebase.appcheck.AppCheckToken!> getToken();
66
}
77

88
public interface AppCheckProviderFactory {
9-
method @NonNull public com.google.firebase.appcheck.AppCheckProvider create(@NonNull com.google.firebase.FirebaseApp);
9+
method public com.google.firebase.appcheck.AppCheckProvider create(com.google.firebase.FirebaseApp);
1010
}
1111

1212
public abstract class AppCheckToken {
1313
ctor public AppCheckToken();
1414
method public abstract long getExpireTimeMillis();
15-
method @NonNull public abstract String getToken();
15+
method public abstract String getToken();
1616
}
1717

1818
public abstract class FirebaseAppCheck implements com.google.firebase.appcheck.interop.InteropAppCheckTokenProvider {
1919
ctor public FirebaseAppCheck();
20-
method public abstract void addAppCheckListener(@NonNull com.google.firebase.appcheck.FirebaseAppCheck.AppCheckListener);
21-
method @NonNull public abstract com.google.android.gms.tasks.Task<com.google.firebase.appcheck.AppCheckToken> getAppCheckToken(boolean);
22-
method @NonNull public static com.google.firebase.appcheck.FirebaseAppCheck getInstance();
23-
method @NonNull public static com.google.firebase.appcheck.FirebaseAppCheck getInstance(@NonNull com.google.firebase.FirebaseApp);
24-
method @NonNull public abstract com.google.android.gms.tasks.Task<com.google.firebase.appcheck.AppCheckToken> getLimitedUseAppCheckToken();
25-
method public abstract void installAppCheckProviderFactory(@NonNull com.google.firebase.appcheck.AppCheckProviderFactory);
26-
method public abstract void installAppCheckProviderFactory(@NonNull com.google.firebase.appcheck.AppCheckProviderFactory, boolean);
27-
method public abstract void removeAppCheckListener(@NonNull com.google.firebase.appcheck.FirebaseAppCheck.AppCheckListener);
20+
method public abstract void addAppCheckListener(com.google.firebase.appcheck.FirebaseAppCheck.AppCheckListener);
21+
method public abstract com.google.android.gms.tasks.Task<com.google.firebase.appcheck.AppCheckToken!> getAppCheckToken(boolean);
22+
method public static com.google.firebase.appcheck.FirebaseAppCheck getInstance();
23+
method public static com.google.firebase.appcheck.FirebaseAppCheck getInstance(com.google.firebase.FirebaseApp);
24+
method public abstract com.google.android.gms.tasks.Task<com.google.firebase.appcheck.AppCheckToken!> getLimitedUseAppCheckToken();
25+
method public abstract void installAppCheckProviderFactory(com.google.firebase.appcheck.AppCheckProviderFactory);
26+
method public abstract void installAppCheckProviderFactory(com.google.firebase.appcheck.AppCheckProviderFactory, boolean);
27+
method public abstract void removeAppCheckListener(com.google.firebase.appcheck.FirebaseAppCheck.AppCheckListener);
2828
method public abstract void setTokenAutoRefreshEnabled(boolean);
2929
}
3030

3131
public static interface FirebaseAppCheck.AppCheckListener {
32-
method public void onAppCheckTokenChanged(@NonNull com.google.firebase.appcheck.AppCheckToken);
32+
method public void onAppCheckTokenChanged(com.google.firebase.appcheck.AppCheckToken);
3333
}
3434

3535
public final class FirebaseAppCheckKt {
36-
method @NonNull public static com.google.firebase.appcheck.FirebaseAppCheck appCheck(@NonNull com.google.firebase.Firebase, @NonNull com.google.firebase.FirebaseApp app);
37-
method @NonNull public static operator String component1(@NonNull com.google.firebase.appcheck.AppCheckToken);
38-
method public static operator long component2(@NonNull com.google.firebase.appcheck.AppCheckToken);
39-
method @NonNull public static com.google.firebase.appcheck.FirebaseAppCheck getAppCheck(@NonNull com.google.firebase.Firebase);
36+
method public static com.google.firebase.appcheck.FirebaseAppCheck appCheck(com.google.firebase.Firebase, com.google.firebase.FirebaseApp app);
37+
method public static operator String component1(com.google.firebase.appcheck.AppCheckToken);
38+
method public static operator long component2(com.google.firebase.appcheck.AppCheckToken);
39+
method public static com.google.firebase.appcheck.FirebaseAppCheck getAppCheck(com.google.firebase.Firebase);
4040
}
4141

4242
}
4343

4444
package com.google.firebase.appcheck.ktx {
4545

4646
public final class FirebaseAppCheckKt {
47-
method @Deprecated @NonNull public static com.google.firebase.appcheck.FirebaseAppCheck appCheck(@NonNull com.google.firebase.ktx.Firebase, @NonNull com.google.firebase.FirebaseApp app);
48-
method @Deprecated @NonNull public static operator String component1(@NonNull com.google.firebase.appcheck.AppCheckToken);
49-
method @Deprecated public static operator long component2(@NonNull com.google.firebase.appcheck.AppCheckToken);
50-
method @Deprecated @NonNull public static com.google.firebase.appcheck.FirebaseAppCheck getAppCheck(@NonNull com.google.firebase.ktx.Firebase);
47+
method @Deprecated public static com.google.firebase.appcheck.FirebaseAppCheck appCheck(com.google.firebase.ktx.Firebase, com.google.firebase.FirebaseApp app);
48+
method @Deprecated public static operator String component1(com.google.firebase.appcheck.AppCheckToken);
49+
method @Deprecated public static operator long component2(com.google.firebase.appcheck.AppCheckToken);
50+
method @Deprecated public static com.google.firebase.appcheck.FirebaseAppCheck getAppCheck(com.google.firebase.ktx.Firebase);
5151
}
5252

5353
}

‎appcheck/firebase-appcheck/ktx/api.txt‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1 @@
1-
// Signature format: 2.0
2-
package com.google.firebase.appcheck.ktx {
3-
4-
public final class LoggingKt {
5-
}
6-
7-
}
8-
1+
// Signature format: 3.0

‎encoders/firebase-decoders-json/api.txt‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
1-
// Signature format: 2.0
1+
// Signature format: 3.0
22
package com.google.firebase.decoders {
33

44
public abstract class Safe<T> {
55
ctor public Safe();
66
}
77

88
public abstract class TypeToken<T> {
9-
method @NonNull public static <T> com.google.firebase.decoders.TypeToken<T> of(@NonNull com.google.firebase.decoders.Safe<T>);
10-
method @NonNull public static <T> com.google.firebase.decoders.TypeToken<T> of(@NonNull Class<T>);
9+
method public static <T> com.google.firebase.decoders.TypeToken<T!> of(com.google.firebase.decoders.Safe<T!>);
10+
method public static <T> com.google.firebase.decoders.TypeToken<T!> of(Class<T!>);
1111
}
1212

13-
public static class TypeToken.ArrayToken<T> extends com.google.firebase.decoders.TypeToken<T> {
14-
method @NonNull public com.google.firebase.decoders.TypeToken<?> getComponentType();
13+
public static class TypeToken.ArrayToken<T> extends com.google.firebase.decoders.TypeToken<T!> {
14+
method public com.google.firebase.decoders.TypeToken<? extends java.lang.Object!> getComponentType();
1515
}
1616

17-
public static class TypeToken.ClassToken<T> extends com.google.firebase.decoders.TypeToken<T> {
18-
method @NonNull public Class<T> getRawType();
19-
method @NonNull public com.google.firebase.decoders.TypeTokenContainer getTypeArguments();
17+
public static class TypeToken.ClassToken<T> extends com.google.firebase.decoders.TypeToken<T!> {
18+
method public Class<T!> getRawType();
19+
method public com.google.firebase.decoders.TypeTokenContainer getTypeArguments();
2020
}
2121

2222
public final class TypeTokenContainer {
23-
ctor public TypeTokenContainer(@NonNull com.google.firebase.decoders.TypeToken[]);
24-
method @NonNull public <T> com.google.firebase.decoders.TypeToken<T> at(int);
25-
field @NonNull public static final com.google.firebase.decoders.TypeTokenContainer EMPTY;
23+
ctor public TypeTokenContainer(com.google.firebase.decoders.TypeToken![]);
24+
method public <T> com.google.firebase.decoders.TypeToken<T!> at(int);
25+
field public static final com.google.firebase.decoders.TypeTokenContainer EMPTY;
2626
}
2727

2828
}

‎encoders/firebase-encoders-json/api.txt‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
1-
// Signature format: 2.0
1+
// Signature format: 3.0
22
package com.google.firebase.encoders.json {
33

4-
public final class JsonDataEncoderBuilder implements com.google.firebase.encoders.config.EncoderConfig<com.google.firebase.encoders.json.JsonDataEncoderBuilder> {
4+
public final class JsonDataEncoderBuilder implements com.google.firebase.encoders.config.EncoderConfig<com.google.firebase.encoders.json.JsonDataEncoderBuilder!> {
55
ctor public JsonDataEncoderBuilder();
6-
method @NonNull public com.google.firebase.encoders.DataEncoder build();
7-
method @NonNull public com.google.firebase.encoders.json.JsonDataEncoderBuilder configureWith(@NonNull com.google.firebase.encoders.config.Configurator);
8-
method @NonNull public com.google.firebase.encoders.json.JsonDataEncoderBuilder ignoreNullValues(boolean);
9-
method @NonNull public <T> com.google.firebase.encoders.json.JsonDataEncoderBuilder registerEncoder(@NonNull Class<T>, @NonNull com.google.firebase.encoders.ObjectEncoder<? super T>);
10-
method @NonNull public <T> com.google.firebase.encoders.json.JsonDataEncoderBuilder registerEncoder(@NonNull Class<T>, @NonNull com.google.firebase.encoders.ValueEncoder<? super T>);
11-
method @NonNull public com.google.firebase.encoders.json.JsonDataEncoderBuilder registerFallbackEncoder(@NonNull com.google.firebase.encoders.ObjectEncoder<java.lang.Object>);
6+
method public com.google.firebase.encoders.DataEncoder build();
7+
method public com.google.firebase.encoders.json.JsonDataEncoderBuilder configureWith(com.google.firebase.encoders.config.Configurator);
8+
method public com.google.firebase.encoders.json.JsonDataEncoderBuilder ignoreNullValues(boolean);
9+
method public <T> com.google.firebase.encoders.json.JsonDataEncoderBuilder registerEncoder(Class<T!>, com.google.firebase.encoders.ObjectEncoder<? super T!>);
10+
method public <T> com.google.firebase.encoders.json.JsonDataEncoderBuilder registerEncoder(Class<T!>, com.google.firebase.encoders.ValueEncoder<? super T!>);
11+
method public com.google.firebase.encoders.json.JsonDataEncoderBuilder registerFallbackEncoder(com.google.firebase.encoders.ObjectEncoder<java.lang.Object!>);
12+
}
13+
14+
public interface NumberedEnum {
15+
method public int getNumber();
16+
property public abstract int number;
1217
}
1318

1419
}

‎encoders/firebase-encoders-proto/api.txt‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Signature format: 2.0
1+
// Signature format: 3.0
22
package com.google.firebase.encoders.proto {
33

44
public interface ProtoEnum {
@@ -17,18 +17,18 @@ package com.google.firebase.encoders.proto {
1717
}
1818

1919
public class ProtobufEncoder {
20-
method public static com.google.firebase.encoders.proto.ProtobufEncoder.Builder builder();
21-
method public void encode(@NonNull Object, @NonNull OutputStream);
22-
method @NonNull public byte[] encode(@NonNull Object);
20+
method public static com.google.firebase.encoders.proto.ProtobufEncoder.Builder! builder();
21+
method public byte[] encode(Object);
22+
method public void encode(Object, OutputStream);
2323
}
2424

25-
public static final class ProtobufEncoder.Builder implements com.google.firebase.encoders.config.EncoderConfig<com.google.firebase.encoders.proto.ProtobufEncoder.Builder> {
25+
public static final class ProtobufEncoder.Builder implements com.google.firebase.encoders.config.EncoderConfig<com.google.firebase.encoders.proto.ProtobufEncoder.Builder!> {
2626
ctor public ProtobufEncoder.Builder();
27-
method public com.google.firebase.encoders.proto.ProtobufEncoder build();
28-
method @NonNull public com.google.firebase.encoders.proto.ProtobufEncoder.Builder configureWith(@NonNull com.google.firebase.encoders.config.Configurator);
29-
method @NonNull public <U> com.google.firebase.encoders.proto.ProtobufEncoder.Builder registerEncoder(@NonNull Class<U>, @NonNull com.google.firebase.encoders.ObjectEncoder<? super U>);
30-
method @NonNull public <U> com.google.firebase.encoders.proto.ProtobufEncoder.Builder registerEncoder(@NonNull Class<U>, @NonNull com.google.firebase.encoders.ValueEncoder<? super U>);
31-
method @NonNull public com.google.firebase.encoders.proto.ProtobufEncoder.Builder registerFallbackEncoder(@NonNull com.google.firebase.encoders.ObjectEncoder<Object>);
27+
method public com.google.firebase.encoders.proto.ProtobufEncoder! build();
28+
method public com.google.firebase.encoders.proto.ProtobufEncoder.Builder configureWith(com.google.firebase.encoders.config.Configurator);
29+
method public <U> com.google.firebase.encoders.proto.ProtobufEncoder.Builder registerEncoder(Class<U!>, com.google.firebase.encoders.ObjectEncoder<? super U!>);
30+
method public <U> com.google.firebase.encoders.proto.ProtobufEncoder.Builder registerEncoder(Class<U!>, com.google.firebase.encoders.ValueEncoder<? super U!>);
31+
method public com.google.firebase.encoders.proto.ProtobufEncoder.Builder registerFallbackEncoder(com.google.firebase.encoders.ObjectEncoder<Object!>);
3232
}
3333

3434
}

0 commit comments

Comments
 (0)