diff --git a/buildSrc/src/main/groovy/com/google/firebase/gradle/plugins/FirebaseLibraryPlugin.java b/buildSrc/src/main/groovy/com/google/firebase/gradle/plugins/FirebaseLibraryPlugin.java index f3d06693cdb..4e66cb264a9 100644 --- a/buildSrc/src/main/groovy/com/google/firebase/gradle/plugins/FirebaseLibraryPlugin.java +++ b/buildSrc/src/main/groovy/com/google/firebase/gradle/plugins/FirebaseLibraryPlugin.java @@ -27,6 +27,9 @@ import java.nio.file.Paths; import org.gradle.api.Plugin; import org.gradle.api.Project; +import org.gradle.api.attributes.Attribute; +import org.gradle.api.file.FileCollection; +import org.gradle.api.tasks.TaskProvider; import org.jetbrains.kotlin.gradle.tasks.KotlinCompile; public class FirebaseLibraryPlugin implements Plugin { @@ -101,55 +104,80 @@ private static void setupApiInformationAnalysis(Project project, LibraryExtensio task -> { task.setOutputFile(metalavaOutputJarFile); }); - project - .getTasks() - .register( - "apiInformation", - ApiInformationTask.class, - task -> { - task.setApiTxt(project.file("api.txt")); - task.setMetalavaJarPath(metalavaOutputJarFile.getAbsolutePath()); - task.setSourceSet(mainSourceSet); - task.setOutputFile(outputFile); - task.setBaselineFile(project.file("baseline.txt")); - task.setOutputApiFile(outputApiFile); - if (project.hasProperty("updateBaseline")) { - task.setUpdateBaseline(true); - } else { - task.setUpdateBaseline(false); - } - task.dependsOn("getMetalavaJar"); - }); - - project - .getTasks() - .register( - "generateApiTxtFile", - GenerateApiTxtFileTask.class, - task -> { - task.setApiTxt(project.file("api.txt")); - task.setMetalavaJarPath(metalavaOutputJarFile.getAbsolutePath()); - task.setSourceSet(mainSourceSet); - task.setBaselineFile(project.file("baseline.txt")); - if (project.hasProperty("updateBaseline")) { - task.setUpdateBaseline(true); - } else { - task.setUpdateBaseline(false); + File apiTxt = + project.file("api.txt").exists() + ? project.file("api.txt") + : project.file(project.getRootDir() + "/empty-api.txt"); + TaskProvider apiInfo = + project + .getTasks() + .register( + "apiInformation", + ApiInformationTask.class, + task -> { + task.setApiTxt(apiTxt); + task.setMetalavaJarPath(metalavaOutputJarFile.getAbsolutePath()); + task.setSourceSet(mainSourceSet); + task.setOutputFile(outputFile); + task.setBaselineFile(project.file("baseline.txt")); + task.setOutputApiFile(outputApiFile); + if (project.hasProperty("updateBaseline")) { + task.setUpdateBaseline(true); + } else { + task.setUpdateBaseline(false); + } + task.dependsOn("getMetalavaJar"); + }); + + TaskProvider generateApiTxt = + project + .getTasks() + .register( + "generateApiTxtFile", + GenerateApiTxtFileTask.class, + task -> { + task.setApiTxt(project.file("api.txt")); + task.setMetalavaJarPath(metalavaOutputJarFile.getAbsolutePath()); + task.setSourceSet(mainSourceSet); + task.setBaselineFile(project.file("baseline.txt")); + task.setUpdateBaseline(project.hasProperty("updateBaseline")); + task.dependsOn("getMetalavaJar"); + }); + + TaskProvider docStubs = + project + .getTasks() + .register( + "docStubs", + GenerateStubsTask.class, + task -> { + task.setMetalavaJarPath(metalavaOutputJarFile.getAbsolutePath()); + task.setOutputDir(new File(project.getBuildDir(), "doc-stubs")); + task.dependsOn("getMetalavaJar"); + + task.setSourceSet(mainSourceSet); + }); + + android + .getLibraryVariants() + .all( + v -> { + if (v.getName().equals("release")) { + FileCollection jars = + v.getCompileConfiguration() + .getIncoming() + .artifactView( + config -> + config.attributes( + container -> + container.attribute( + Attribute.of("artifactType", String.class), "jar"))) + .getArtifacts() + .getArtifactFiles(); + apiInfo.configure(t -> t.setClassPath(jars)); + generateApiTxt.configure(t -> t.setClassPath(jars)); + docStubs.configure(t -> t.setClassPath(jars)); } - task.dependsOn("getMetalavaJar"); - }); - - project - .getTasks() - .register( - "docStubs", - GenerateStubsTask.class, - task -> { - task.setMetalavaJarPath(metalavaOutputJarFile.getAbsolutePath()); - task.setOutputDir(new File(project.getBuildDir(), "doc-stubs")); - task.dependsOn("getMetalavaJar"); - - task.setSourceSet(mainSourceSet); }); } diff --git a/buildSrc/src/main/groovy/com/google/firebase/gradle/plugins/SdkUtil.java b/buildSrc/src/main/groovy/com/google/firebase/gradle/plugins/SdkUtil.java new file mode 100644 index 00000000000..e8e0906718f --- /dev/null +++ b/buildSrc/src/main/groovy/com/google/firebase/gradle/plugins/SdkUtil.java @@ -0,0 +1,57 @@ +// Copyright 2019 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.gradle.plugins; + +import com.android.build.gradle.LibraryExtension; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.util.Properties; +import org.gradle.api.GradleException; +import org.gradle.api.Project; + +public final class SdkUtil { + public static File getSdkDir(Project project) { + Properties properties = new Properties(); + File localProperties = project.getRootProject().file("local.properties"); + if (localProperties.exists()) { + try (FileInputStream fis = new FileInputStream(localProperties)) { + properties.load(fis); + } catch (IOException ex) { + throw new GradleException("Could not load local.properties", ex); + } + } + + String sdkDir = properties.getProperty("sdk.dir"); + if (sdkDir != null) { + return project.file(sdkDir); + } + String androidHome = System.getenv("ANDROID_HOME"); + if (androidHome == null) { + throw new GradleException("No sdk.dir or ANDROID_HOME set."); + } + return project.file(androidHome); + } + + public static File getAndroidJar(Project project) { + LibraryExtension android = project.getExtensions().findByType(LibraryExtension.class); + if (android == null) { + throw new GradleException("Project " + project.getPath() + " is not an android library."); + } + return new File( + getSdkDir(project), + String.format("/platforms/%s/android.jar", android.getCompileSdkVersion())); + } +} diff --git a/buildSrc/src/main/groovy/com/google/firebase/gradle/plugins/apiinfo/ApiInformationTask.java b/buildSrc/src/main/groovy/com/google/firebase/gradle/plugins/apiinfo/ApiInformationTask.java index 22ae75ff57b..a0d155f9dff 100644 --- a/buildSrc/src/main/groovy/com/google/firebase/gradle/plugins/apiinfo/ApiInformationTask.java +++ b/buildSrc/src/main/groovy/com/google/firebase/gradle/plugins/apiinfo/ApiInformationTask.java @@ -15,6 +15,8 @@ package com.google.firebase.gradle.plugins.apiinfo; import com.android.build.gradle.api.AndroidSourceSet; +import com.google.firebase.gradle.plugins.SdkUtil; + import java.io.File; import java.io.FileNotFoundException; import java.io.FileOutputStream; @@ -22,10 +24,16 @@ import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; +import java.util.stream.Stream; +import java.util.stream.StreamSupport; + import org.gradle.api.DefaultTask; import org.gradle.api.GradleException; +import org.gradle.api.artifacts.Configuration; +import org.gradle.api.file.FileCollection; import org.gradle.api.tasks.Input; import org.gradle.api.tasks.InputFile; +import org.gradle.api.tasks.InputFiles; import org.gradle.api.tasks.OutputFile; import org.gradle.api.tasks.TaskAction; @@ -43,6 +51,9 @@ public abstract class ApiInformationTask extends DefaultTask { abstract AndroidSourceSet getSourceSet(); + @InputFiles + abstract FileCollection getClassPath(); + @OutputFile abstract File getBaselineFile(); @@ -57,6 +68,8 @@ public abstract class ApiInformationTask extends DefaultTask { public abstract void setSourceSet(AndroidSourceSet value); + public abstract void setClassPath(FileCollection value); + public abstract void setBaselineFile(File value); public abstract void setUpdateBaseline(boolean value); @@ -76,6 +89,19 @@ void execute() { .filter(File::exists) .map(File::getAbsolutePath) .collect(Collectors.joining(":")); + if (sourcePath.isEmpty()) { + getLogger() + .warn( + "Project {} has no sources in main source set, skipping...", getProject().getPath()); + return; + } + + String classPath = + Stream.concat( + getClassPath().getFiles().stream(), Stream.of(SdkUtil.getAndroidJar(getProject()))) + .map(File::getAbsolutePath) + .collect(Collectors.joining(":")); + File outputFileDir = getOutputFile().getParentFile(); if (!outputFileDir.exists()) { outputFileDir.mkdirs(); @@ -89,8 +115,11 @@ void execute() { spec.setArgs( Arrays.asList( getMetalavaJarPath(), + "--no-banner", "--source-path", sourcePath, + "--classpath", + classPath, "--api", getOutputApiFile().getAbsolutePath(), "--format=v2")); @@ -104,13 +133,13 @@ void execute() { new ArrayList<>( Arrays.asList( getMetalavaJarPath(), + "--no-banner", "--source-files", getOutputApiFile().getAbsolutePath(), "--check-compatibility:api:current", getApiTxt().getAbsolutePath(), "--format=v2", - "--no-color", - "--delete-empty-baselines")); + "--no-color")); if (getUpdateBaseline()) { args.addAll( Arrays.asList("--update-baseline", getBaselineFile().getAbsolutePath())); diff --git a/buildSrc/src/main/groovy/com/google/firebase/gradle/plugins/apiinfo/GenerateApiTxtFileTask.java b/buildSrc/src/main/groovy/com/google/firebase/gradle/plugins/apiinfo/GenerateApiTxtFileTask.java index bced7b25346..412ff890341 100644 --- a/buildSrc/src/main/groovy/com/google/firebase/gradle/plugins/apiinfo/GenerateApiTxtFileTask.java +++ b/buildSrc/src/main/groovy/com/google/firebase/gradle/plugins/apiinfo/GenerateApiTxtFileTask.java @@ -15,13 +15,19 @@ package com.google.firebase.gradle.plugins.apiinfo; import com.android.build.gradle.api.AndroidSourceSet; +import com.google.firebase.gradle.plugins.SdkUtil; + import java.io.File; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; +import java.util.stream.Stream; + import org.gradle.api.DefaultTask; +import org.gradle.api.file.FileCollection; import org.gradle.api.tasks.Input; +import org.gradle.api.tasks.InputFiles; import org.gradle.api.tasks.OutputFile; import org.gradle.api.tasks.TaskAction; @@ -35,6 +41,9 @@ public abstract class GenerateApiTxtFileTask extends DefaultTask { abstract AndroidSourceSet getSourceSet(); + @InputFiles + public abstract FileCollection getClassPath(); + @OutputFile abstract File getBaselineFile(); @@ -43,6 +52,8 @@ public abstract class GenerateApiTxtFileTask extends DefaultTask { public abstract void setSourceSet(AndroidSourceSet value); + public abstract void setClassPath(FileCollection value); + public abstract void setBaselineFile(File value); public abstract void setUpdateBaseline(boolean value); @@ -58,16 +69,29 @@ void execute() { .filter(File::exists) .map(File::getAbsolutePath) .collect(Collectors.joining(":")); + if (sourcePath.isEmpty()) { + getLogger() + .warn( + "Project {} has no sources in main source set, skipping...", getProject().getPath()); + return; + } + String classPath = + Stream.concat( + getClassPath().getFiles().stream(), Stream.of(SdkUtil.getAndroidJar(getProject()))) + .map(File::getAbsolutePath) + .collect(Collectors.joining(":")); List args = new ArrayList<>( Arrays.asList( getMetalavaJarPath(), + "--no-banner", "--source-path", sourcePath, + "--classpath", + classPath, "--api", getApiTxt().getAbsolutePath(), - "--format=v2", - "--delete-empty-baselines")); + "--format=v2")); if (getUpdateBaseline()) { args.addAll(Arrays.asList("--update-baseline", getBaselineFile().getAbsolutePath())); diff --git a/buildSrc/src/main/groovy/com/google/firebase/gradle/plugins/apiinfo/GenerateStubsTask.java b/buildSrc/src/main/groovy/com/google/firebase/gradle/plugins/apiinfo/GenerateStubsTask.java index 72a20a89323..984ab76f31f 100644 --- a/buildSrc/src/main/groovy/com/google/firebase/gradle/plugins/apiinfo/GenerateStubsTask.java +++ b/buildSrc/src/main/groovy/com/google/firebase/gradle/plugins/apiinfo/GenerateStubsTask.java @@ -15,11 +15,17 @@ package com.google.firebase.gradle.plugins.apiinfo; import com.android.build.gradle.api.AndroidSourceSet; +import com.google.firebase.gradle.plugins.SdkUtil; + import java.io.File; import java.util.Arrays; import java.util.stream.Collectors; +import java.util.stream.Stream; + import org.gradle.api.DefaultTask; +import org.gradle.api.file.FileCollection; import org.gradle.api.tasks.Input; +import org.gradle.api.tasks.InputFiles; import org.gradle.api.tasks.OutputDirectory; import org.gradle.api.tasks.TaskAction; @@ -31,8 +37,13 @@ public abstract class GenerateStubsTask extends DefaultTask { public abstract AndroidSourceSet getSourceSet(); + @InputFiles + public abstract FileCollection getClassPath(); + public abstract void setSourceSet(AndroidSourceSet sourceSet); + public abstract void setClassPath(FileCollection value); + @OutputDirectory public abstract File getOutputDir(); @@ -46,6 +57,12 @@ public void run() { .map(File::getAbsolutePath) .collect(Collectors.joining(":")); + String classPath = + Stream.concat( + getClassPath().getFiles().stream(), Stream.of(SdkUtil.getAndroidJar(getProject()))) + .map(File::getAbsolutePath) + .collect(Collectors.joining(":")); + getProject() .javaexec( spec -> { @@ -56,6 +73,8 @@ public void run() { "--quiet", "--source-path", sourcePath, + "--classpath", + classPath, "--include-annotations", "--doc-stubs", getOutputDir().getAbsolutePath())); diff --git a/protolite-well-known-types/api.txt b/empty-api.txt similarity index 100% rename from protolite-well-known-types/api.txt rename to empty-api.txt diff --git a/encoders/firebase-encoders-json/api.txt b/encoders/firebase-encoders-json/api.txt index 16233753bcc..71b1e762df8 100644 --- a/encoders/firebase-encoders-json/api.txt +++ b/encoders/firebase-encoders-json/api.txt @@ -2,11 +2,11 @@ package com.google.firebase.encoders { public interface DataEncoder { - method public void encode(@NonNull Object, @NonNull Writer) throws com.google.firebase.encoders.EncodingException; + method public void encode(@NonNull Object, @NonNull java.io.Writer) throws com.google.firebase.encoders.EncodingException, java.io.IOException; method @NonNull public String encode(@NonNull Object) throws com.google.firebase.encoders.EncodingException; } - public final class EncodingException { + public final class EncodingException extends java.lang.Exception { ctor public EncodingException(@NonNull String); ctor public EncodingException(@NonNull String, @NonNull Exception); } @@ -15,38 +15,38 @@ package com.google.firebase.encoders { } public interface ObjectEncoderContext { - method @NonNull public com.google.firebase.encoders.ObjectEncoderContext add(@NonNull String, @Nullable Object) throws com.google.firebase.encoders.EncodingException; - method @NonNull public com.google.firebase.encoders.ObjectEncoderContext add(@NonNull String, double) throws com.google.firebase.encoders.EncodingException; - method @NonNull public com.google.firebase.encoders.ObjectEncoderContext add(@NonNull String, int) throws com.google.firebase.encoders.EncodingException; - method @NonNull public com.google.firebase.encoders.ObjectEncoderContext add(@NonNull String, long) throws com.google.firebase.encoders.EncodingException; - method @NonNull public com.google.firebase.encoders.ObjectEncoderContext add(@NonNull String, boolean) throws com.google.firebase.encoders.EncodingException; - method @NonNull public com.google.firebase.encoders.ObjectEncoderContext nested(@NonNull String); + method @NonNull public com.google.firebase.encoders.ObjectEncoderContext add(@NonNull String, @Nullable Object) throws com.google.firebase.encoders.EncodingException, java.io.IOException; + method @NonNull public com.google.firebase.encoders.ObjectEncoderContext add(@NonNull String, double) throws com.google.firebase.encoders.EncodingException, java.io.IOException; + method @NonNull public com.google.firebase.encoders.ObjectEncoderContext add(@NonNull String, int) throws com.google.firebase.encoders.EncodingException, java.io.IOException; + method @NonNull public com.google.firebase.encoders.ObjectEncoderContext add(@NonNull String, long) throws com.google.firebase.encoders.EncodingException, java.io.IOException; + method @NonNull public com.google.firebase.encoders.ObjectEncoderContext add(@NonNull String, boolean) throws com.google.firebase.encoders.EncodingException, java.io.IOException; + method @NonNull public com.google.firebase.encoders.ObjectEncoderContext nested(@NonNull String) throws java.io.IOException; } public interface ValueEncoder { } public interface ValueEncoderContext { - method @NonNull public com.google.firebase.encoders.ValueEncoderContext add(@Nullable String) throws com.google.firebase.encoders.EncodingException; - method @NonNull public com.google.firebase.encoders.ValueEncoderContext add(double) throws com.google.firebase.encoders.EncodingException; - method @NonNull public com.google.firebase.encoders.ValueEncoderContext add(int) throws com.google.firebase.encoders.EncodingException; - method @NonNull public com.google.firebase.encoders.ValueEncoderContext add(long) throws com.google.firebase.encoders.EncodingException; - method @NonNull public com.google.firebase.encoders.ValueEncoderContext add(boolean) throws com.google.firebase.encoders.EncodingException; - method @NonNull public com.google.firebase.encoders.ValueEncoderContext add(@NonNull byte[]) throws com.google.firebase.encoders.EncodingException; + method @NonNull public com.google.firebase.encoders.ValueEncoderContext add(@Nullable String) throws com.google.firebase.encoders.EncodingException, java.io.IOException; + method @NonNull public com.google.firebase.encoders.ValueEncoderContext add(double) throws com.google.firebase.encoders.EncodingException, java.io.IOException; + method @NonNull public com.google.firebase.encoders.ValueEncoderContext add(int) throws com.google.firebase.encoders.EncodingException, java.io.IOException; + method @NonNull public com.google.firebase.encoders.ValueEncoderContext add(long) throws com.google.firebase.encoders.EncodingException, java.io.IOException; + method @NonNull public com.google.firebase.encoders.ValueEncoderContext add(boolean) throws com.google.firebase.encoders.EncodingException, java.io.IOException; + method @NonNull public com.google.firebase.encoders.ValueEncoderContext add(@NonNull byte[]) throws com.google.firebase.encoders.EncodingException, java.io.IOException; } } package com.google.firebase.encoders.annotations { - @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) public @interface Encodable { + @java.lang.annotation.Target(java.lang.annotation.ElementType.TYPE) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) public @interface Encodable { } - @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) public static @interface Encodable.Field { + @java.lang.annotation.Target(java.lang.annotation.ElementType.METHOD) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) public static @interface Encodable.Field { method public abstract String name() default ""; } - @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) public static @interface Encodable.Ignore { + @java.lang.annotation.Target(java.lang.annotation.ElementType.METHOD) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) public static @interface Encodable.Ignore { } } diff --git a/firebase-common/api.txt b/firebase-common/api.txt index 7c29677a162..adbb4aa440e 100644 --- a/firebase-common/api.txt +++ b/firebase-common/api.txt @@ -2,37 +2,31 @@ package com.google.firebase { public class FirebaseApp { - method public boolean equals(Object); - method @NonNull public Context getApplicationContext(); - method @NonNull public static List getApps(@NonNull Context); + method @NonNull public android.content.Context getApplicationContext(); + method @NonNull public static java.util.List getApps(@NonNull android.content.Context); method @NonNull public static com.google.firebase.FirebaseApp getInstance(); method @NonNull public static com.google.firebase.FirebaseApp getInstance(@NonNull String); method @NonNull public String getName(); method @NonNull public com.google.firebase.FirebaseOptions getOptions(); - method public int hashCode(); - method @Nullable public static com.google.firebase.FirebaseApp initializeApp(@NonNull Context); - method @NonNull public static com.google.firebase.FirebaseApp initializeApp(@NonNull Context, @NonNull com.google.firebase.FirebaseOptions); - method @NonNull public static com.google.firebase.FirebaseApp initializeApp(@NonNull Context, @NonNull com.google.firebase.FirebaseOptions, @NonNull String); + method @Nullable public static com.google.firebase.FirebaseApp initializeApp(@NonNull android.content.Context); + method @NonNull public static com.google.firebase.FirebaseApp initializeApp(@NonNull android.content.Context, @NonNull com.google.firebase.FirebaseOptions); + method @NonNull public static com.google.firebase.FirebaseApp initializeApp(@NonNull android.content.Context, @NonNull com.google.firebase.FirebaseOptions, @NonNull String); method public void setAutomaticResourceManagementEnabled(boolean); - method public String toString(); - field @NonNull public static final String DEFAULT_APP_NAME; + field @NonNull public static final String DEFAULT_APP_NAME = "[DEFAULT]"; } - public class FirebaseNetworkException { + public class FirebaseNetworkException extends com.google.firebase.FirebaseException { ctor public FirebaseNetworkException(@NonNull String); } public final class FirebaseOptions { - method public boolean equals(Object); - method @Nullable public static com.google.firebase.FirebaseOptions fromResource(@NonNull Context); + method @Nullable public static com.google.firebase.FirebaseOptions fromResource(@NonNull android.content.Context); method @NonNull public String getApiKey(); method @NonNull public String getApplicationId(); method @Nullable public String getDatabaseUrl(); method @Nullable public String getGcmSenderId(); method @Nullable public String getProjectId(); method @Nullable public String getStorageBucket(); - method public int hashCode(); - method public String toString(); } public static final class FirebaseOptions.Builder { @@ -47,7 +41,7 @@ package com.google.firebase { method @NonNull public com.google.firebase.FirebaseOptions.Builder setStorageBucket(@Nullable String); } - public class FirebaseTooManyRequestsException { + public class FirebaseTooManyRequestsException extends com.google.firebase.FirebaseException { ctor public FirebaseTooManyRequestsException(@NonNull String); } @@ -55,15 +49,14 @@ package com.google.firebase { package com.google.firebase.provider { - public class FirebaseInitProvider { + public class FirebaseInitProvider extends android.content.ContentProvider { ctor public FirebaseInitProvider(); - method public void attachInfo(@NonNull Context, @NonNull ProviderInfo); - method public int delete(@NonNull Uri, @Nullable String, @Nullable String[]); - method @Nullable public String getType(@NonNull Uri); - method @Nullable public Uri insert(@NonNull Uri, @Nullable ContentValues); + method public int delete(@NonNull android.net.Uri, @Nullable String, @Nullable String[]); + method @Nullable public String getType(@NonNull android.net.Uri); + method @Nullable public android.net.Uri insert(@NonNull android.net.Uri, @Nullable android.content.ContentValues); method public boolean onCreate(); - method @Nullable public Cursor query(@NonNull Uri, @Nullable String[], @Nullable String, @Nullable String[], @Nullable String); - method public int update(@NonNull Uri, @Nullable ContentValues, @Nullable String, @Nullable String[]); + method @Nullable public android.database.Cursor query(@NonNull android.net.Uri, @Nullable String[], @Nullable String, @Nullable String[], @Nullable String); + method public int update(@NonNull android.net.Uri, @Nullable android.content.ContentValues, @Nullable String, @Nullable String[]); } } diff --git a/firebase-common/ktx/api.txt b/firebase-common/ktx/api.txt new file mode 100644 index 00000000000..a55220fdc87 --- /dev/null +++ b/firebase-common/ktx/api.txt @@ -0,0 +1,19 @@ +// Signature format: 2.0 +package com.google.firebase.ktx { + + public final class Firebase { + field public static final com.google.firebase.ktx.Firebase INSTANCE; + } + + public final class FirebaseKt { + ctor public FirebaseKt(); + method @NonNull public static com.google.firebase.FirebaseApp app(@NonNull com.google.firebase.ktx.Firebase, @NonNull String name); + method @NonNull public static com.google.firebase.FirebaseApp getApp(@NonNull com.google.firebase.ktx.Firebase); + method @NonNull public static com.google.firebase.FirebaseOptions getOptions(@NonNull com.google.firebase.ktx.Firebase); + method @Nullable public static com.google.firebase.FirebaseApp initialize(@NonNull com.google.firebase.ktx.Firebase, @NonNull android.content.Context context); + method @NonNull public static com.google.firebase.FirebaseApp initialize(@NonNull com.google.firebase.ktx.Firebase, @NonNull android.content.Context context, @NonNull com.google.firebase.FirebaseOptions options); + method @NonNull public static com.google.firebase.FirebaseApp initialize(@NonNull com.google.firebase.ktx.Firebase, @NonNull android.content.Context context, @NonNull com.google.firebase.FirebaseOptions options, @NonNull String name); + } + +} + diff --git a/firebase-config/api.txt b/firebase-config/api.txt index 53e03331d59..a1c87a0a22a 100644 --- a/firebase-config/api.txt +++ b/firebase-config/api.txt @@ -2,35 +2,35 @@ package com.google.firebase.remoteconfig { public class FirebaseRemoteConfig { - method @NonNull public Task activate(); - method @Deprecated public boolean activateFetched(); - method @NonNull public Task ensureInitialized(); - method @NonNull public Task fetch(); - method @NonNull public Task fetch(long); - method @NonNull public Task fetchAndActivate(); - method @NonNull public Map getAll(); + method @NonNull public com.google.android.gms.tasks.Task activate(); + method @Deprecated @WorkerThread public boolean activateFetched(); + method @NonNull public com.google.android.gms.tasks.Task ensureInitialized(); + method @NonNull public com.google.android.gms.tasks.Task fetch(); + method @NonNull public com.google.android.gms.tasks.Task fetch(long); + method @NonNull public com.google.android.gms.tasks.Task fetchAndActivate(); + method @NonNull public java.util.Map getAll(); method public boolean getBoolean(@NonNull String); - method @NonNull public byte[] getByteArray(@NonNull String); + method @Deprecated @NonNull public byte[] getByteArray(@NonNull String); method public double getDouble(@NonNull String); method @NonNull public com.google.firebase.remoteconfig.FirebaseRemoteConfigInfo getInfo(); method @NonNull public static com.google.firebase.remoteconfig.FirebaseRemoteConfig getInstance(); - method @NonNull public static com.google.firebase.remoteconfig.FirebaseRemoteConfig getInstance(@NonNull FirebaseApp); - method @NonNull public Set getKeysByPrefix(@NonNull String); + method @NonNull public static com.google.firebase.remoteconfig.FirebaseRemoteConfig getInstance(@NonNull com.google.firebase.FirebaseApp); + method @NonNull public java.util.Set getKeysByPrefix(@NonNull String); method public long getLong(@NonNull String); method @NonNull public String getString(@NonNull String); method @NonNull public com.google.firebase.remoteconfig.FirebaseRemoteConfigValue getValue(@NonNull String); - method @NonNull public Task reset(); + method @NonNull public com.google.android.gms.tasks.Task reset(); method @Deprecated public void setConfigSettings(@NonNull com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings); - method @NonNull public Task setConfigSettingsAsync(@NonNull com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings); - method @Deprecated public void setDefaults(@NonNull Map); - method @Deprecated public void setDefaults(int); - method @NonNull public Task setDefaultsAsync(@NonNull Map); - method @NonNull public Task setDefaultsAsync(int); + method @NonNull public com.google.android.gms.tasks.Task setConfigSettingsAsync(@NonNull com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings); + method @Deprecated public void setDefaults(@NonNull java.util.Map); + method @Deprecated public void setDefaults(@XmlRes int); + method @NonNull public com.google.android.gms.tasks.Task setDefaultsAsync(@NonNull java.util.Map); + method @NonNull public com.google.android.gms.tasks.Task setDefaultsAsync(@XmlRes int); field public static final boolean DEFAULT_VALUE_FOR_BOOLEAN = false; field public static final byte[] DEFAULT_VALUE_FOR_BYTE_ARRAY; field public static final double DEFAULT_VALUE_FOR_DOUBLE = 0.0; field public static final long DEFAULT_VALUE_FOR_LONG = 0L; // 0x0L - field public static final String DEFAULT_VALUE_FOR_STRING; + field public static final String DEFAULT_VALUE_FOR_STRING = ""; field public static final int LAST_FETCH_STATUS_FAILURE = 1; // 0x1 field public static final int LAST_FETCH_STATUS_NO_FETCH_YET = 0; // 0x0 field public static final int LAST_FETCH_STATUS_SUCCESS = -1; // 0xffffffff @@ -45,7 +45,7 @@ package com.google.firebase.remoteconfig { ctor public FirebaseRemoteConfigClientException(@NonNull String, @Nullable Throwable); } - public class FirebaseRemoteConfigException { + public class FirebaseRemoteConfigException extends com.google.firebase.FirebaseException { ctor public FirebaseRemoteConfigException(@NonNull String); ctor public FirebaseRemoteConfigException(@NonNull String, @Nullable Throwable); } @@ -85,15 +85,15 @@ package com.google.firebase.remoteconfig { method public long getFetchTimeoutInSeconds(); method public long getMinimumFetchIntervalInSeconds(); method @Deprecated @NonNull public com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings.Builder setDeveloperModeEnabled(boolean); - method @NonNull public com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings.Builder setFetchTimeoutInSeconds(long); + method @NonNull public com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings.Builder setFetchTimeoutInSeconds(long) throws java.lang.IllegalArgumentException; method @NonNull public com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings.Builder setMinimumFetchIntervalInSeconds(long); } public interface FirebaseRemoteConfigValue { - method public boolean asBoolean(); + method public boolean asBoolean() throws java.lang.IllegalArgumentException; method @NonNull public byte[] asByteArray(); - method public double asDouble(); - method public long asLong(); + method public double asDouble() throws java.lang.IllegalArgumentException; + method public long asLong() throws java.lang.IllegalArgumentException; method @NonNull public String asString(); method public int getSource(); } diff --git a/firebase-config/ktx/api.txt b/firebase-config/ktx/api.txt new file mode 100644 index 00000000000..c5063771eb2 --- /dev/null +++ b/firebase-config/ktx/api.txt @@ -0,0 +1,13 @@ +// Signature format: 2.0 +package com.google.firebase.remoteconfig.ktx { + + public final class RemoteConfigKt { + ctor public RemoteConfigKt(); + method @NonNull public static operator com.google.firebase.remoteconfig.FirebaseRemoteConfigValue get(@NonNull com.google.firebase.remoteconfig.FirebaseRemoteConfig, @NonNull String key); + method @NonNull public static com.google.firebase.remoteconfig.FirebaseRemoteConfig getRemoteConfig(@NonNull com.google.firebase.ktx.Firebase); + method @NonNull public static com.google.firebase.remoteconfig.FirebaseRemoteConfig remoteConfig(@NonNull com.google.firebase.ktx.Firebase, @NonNull com.google.firebase.FirebaseApp app); + method @NonNull public static com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings remoteConfigSettings(@NonNull kotlin.jvm.functions.Function1 init); + } + +} + diff --git a/firebase-database/api.txt b/firebase-database/api.txt index 0b8eaa4ea38..9abefc59b28 100644 --- a/firebase-database/api.txt +++ b/firebase-database/api.txt @@ -12,7 +12,7 @@ package com.google.firebase.database { public class DataSnapshot { method @NonNull public com.google.firebase.database.DataSnapshot child(@NonNull String); method public boolean exists(); - method @NonNull public Iterable getChildren(); + method @NonNull public Iterable getChildren(); method public long getChildrenCount(); method @Nullable public String getKey(); method @Nullable public Object getPriority(); @@ -23,7 +23,6 @@ package com.google.firebase.database { method @Nullable public T getValue(@NonNull com.google.firebase.database.GenericTypeIndicator); method public boolean hasChild(@NonNull String); method public boolean hasChildren(); - method public String toString(); } public class DatabaseError { @@ -32,7 +31,6 @@ package com.google.firebase.database { method @NonNull public String getDetails(); method @NonNull public String getMessage(); method @NonNull public com.google.firebase.database.DatabaseException toException(); - method public String toString(); field public static final int DATA_STALE = -1; // 0xffffffff field public static final int DISCONNECTED = -4; // 0xfffffffc field public static final int EXPIRED_TOKEN = -6; // 0xfffffffa @@ -48,49 +46,46 @@ package com.google.firebase.database { field public static final int WRITE_CANCELED = -25; // 0xffffffe7 } - public class DatabaseException { + public class DatabaseException extends java.lang.RuntimeException { } public class DatabaseReference extends com.google.firebase.database.Query { method @NonNull public com.google.firebase.database.DatabaseReference child(@NonNull String); - method public boolean equals(Object); method @NonNull public com.google.firebase.database.FirebaseDatabase getDatabase(); method @Nullable public String getKey(); method @Nullable public com.google.firebase.database.DatabaseReference getParent(); method @NonNull public com.google.firebase.database.DatabaseReference getRoot(); method public static void goOffline(); method public static void goOnline(); - method public int hashCode(); method @NonNull public com.google.firebase.database.OnDisconnect onDisconnect(); method @NonNull public com.google.firebase.database.DatabaseReference push(); - method @NonNull public Task removeValue(); + method @NonNull public com.google.android.gms.tasks.Task removeValue(); method public void removeValue(@Nullable com.google.firebase.database.DatabaseReference.CompletionListener); method public void runTransaction(@NonNull com.google.firebase.database.Transaction.Handler); method public void runTransaction(@NonNull com.google.firebase.database.Transaction.Handler, boolean); - method @NonNull public Task setPriority(@Nullable Object); + method @NonNull public com.google.android.gms.tasks.Task setPriority(@Nullable Object); method public void setPriority(@Nullable Object, @Nullable com.google.firebase.database.DatabaseReference.CompletionListener); - method @NonNull public Task setValue(@Nullable Object); - method @NonNull public Task setValue(@Nullable Object, @Nullable Object); + method @NonNull public com.google.android.gms.tasks.Task setValue(@Nullable Object); + method @NonNull public com.google.android.gms.tasks.Task setValue(@Nullable Object, @Nullable Object); method public void setValue(@Nullable Object, @Nullable com.google.firebase.database.DatabaseReference.CompletionListener); method public void setValue(@Nullable Object, @Nullable Object, @Nullable com.google.firebase.database.DatabaseReference.CompletionListener); - method public String toString(); - method @NonNull public Task updateChildren(@NonNull Map); - method public void updateChildren(@NonNull Map, @Nullable com.google.firebase.database.DatabaseReference.CompletionListener); + method @NonNull public com.google.android.gms.tasks.Task updateChildren(@NonNull java.util.Map); + method public void updateChildren(@NonNull java.util.Map, @Nullable com.google.firebase.database.DatabaseReference.CompletionListener); } public static interface DatabaseReference.CompletionListener { method public void onComplete(@Nullable com.google.firebase.database.DatabaseError, @NonNull com.google.firebase.database.DatabaseReference); } - @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) public @interface Exclude { + @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.FIELD}) public @interface Exclude { } public class FirebaseDatabase { - method @NonNull public FirebaseApp getApp(); + method @NonNull public com.google.firebase.FirebaseApp getApp(); method @NonNull public static com.google.firebase.database.FirebaseDatabase getInstance(); method @NonNull public static com.google.firebase.database.FirebaseDatabase getInstance(@NonNull String); - method @NonNull public static com.google.firebase.database.FirebaseDatabase getInstance(@NonNull FirebaseApp); - method @NonNull public static com.google.firebase.database.FirebaseDatabase getInstance(@NonNull FirebaseApp, @NonNull String); + method @NonNull public static com.google.firebase.database.FirebaseDatabase getInstance(@NonNull com.google.firebase.FirebaseApp); + method @NonNull public static com.google.firebase.database.FirebaseDatabase getInstance(@NonNull com.google.firebase.FirebaseApp, @NonNull String); method @NonNull public com.google.firebase.database.DatabaseReference getReference(); method @NonNull public com.google.firebase.database.DatabaseReference getReference(@NonNull String); method @NonNull public com.google.firebase.database.DatabaseReference getReferenceFromUrl(@NonNull String); @@ -107,7 +102,7 @@ package com.google.firebase.database { ctor public GenericTypeIndicator(); } - @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) public @interface IgnoreExtraProperties { + @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE}) public @interface IgnoreExtraProperties { } public interface Logger { @@ -123,8 +118,7 @@ package com.google.firebase.database { public class MutableData { method @NonNull public com.google.firebase.database.MutableData child(@NonNull String); - method public boolean equals(Object); - method @NonNull public Iterable getChildren(); + method @NonNull public Iterable getChildren(); method public long getChildrenCount(); method @Nullable public String getKey(); method @Nullable public Object getPriority(); @@ -135,26 +129,25 @@ package com.google.firebase.database { method public boolean hasChildren(); method public void setPriority(@Nullable Object); method public void setValue(@Nullable Object) throws com.google.firebase.database.DatabaseException; - method public String toString(); } public class OnDisconnect { - method @NonNull public Task cancel(); + method @NonNull public com.google.android.gms.tasks.Task cancel(); method public void cancel(@NonNull com.google.firebase.database.DatabaseReference.CompletionListener); - method @NonNull public Task removeValue(); + method @NonNull public com.google.android.gms.tasks.Task removeValue(); method public void removeValue(@Nullable com.google.firebase.database.DatabaseReference.CompletionListener); - method @NonNull public Task setValue(@Nullable Object); - method @NonNull public Task setValue(@Nullable Object, @Nullable String); - method @NonNull public Task setValue(@Nullable Object, double); + method @NonNull public com.google.android.gms.tasks.Task setValue(@Nullable Object); + method @NonNull public com.google.android.gms.tasks.Task setValue(@Nullable Object, @Nullable String); + method @NonNull public com.google.android.gms.tasks.Task setValue(@Nullable Object, double); method public void setValue(@Nullable Object, @Nullable com.google.firebase.database.DatabaseReference.CompletionListener); method public void setValue(@Nullable Object, @Nullable String, @Nullable com.google.firebase.database.DatabaseReference.CompletionListener); method public void setValue(@Nullable Object, double, @Nullable com.google.firebase.database.DatabaseReference.CompletionListener); - method public void setValue(@Nullable Object, @Nullable Map, @Nullable com.google.firebase.database.DatabaseReference.CompletionListener); - method @NonNull public Task updateChildren(@NonNull Map); - method public void updateChildren(@NonNull Map, @Nullable com.google.firebase.database.DatabaseReference.CompletionListener); + method public void setValue(@Nullable Object, @Nullable java.util.Map, @Nullable com.google.firebase.database.DatabaseReference.CompletionListener); + method @NonNull public com.google.android.gms.tasks.Task updateChildren(@NonNull java.util.Map); + method public void updateChildren(@NonNull java.util.Map, @Nullable com.google.firebase.database.DatabaseReference.CompletionListener); } - @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) public @interface PropertyName { + @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.FIELD}) public @interface PropertyName { method public abstract String value(); } @@ -194,10 +187,10 @@ package com.google.firebase.database { public class ServerValue { ctor public ServerValue(); - field @NonNull public static final Map TIMESTAMP; + field @NonNull public static final java.util.Map TIMESTAMP; } - @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) public @interface ThrowOnExtraProperties { + @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE}) public @interface ThrowOnExtraProperties { } public class Transaction { diff --git a/firebase-database/ktx/api.txt b/firebase-database/ktx/api.txt new file mode 100644 index 00000000000..b404246b6e0 --- /dev/null +++ b/firebase-database/ktx/api.txt @@ -0,0 +1,14 @@ +// Signature format: 2.0 +package com.google.firebase.database.ktx { + + public final class DatabaseKt { + ctor public DatabaseKt(); + method @NonNull public static com.google.firebase.database.FirebaseDatabase database(@NonNull com.google.firebase.ktx.Firebase, @NonNull String url); + method @NonNull public static com.google.firebase.database.FirebaseDatabase database(@NonNull com.google.firebase.ktx.Firebase, @NonNull com.google.firebase.FirebaseApp app); + method @NonNull public static com.google.firebase.database.FirebaseDatabase database(@NonNull com.google.firebase.ktx.Firebase, @NonNull com.google.firebase.FirebaseApp app, @NonNull String url); + method @NonNull public static com.google.firebase.database.FirebaseDatabase getDatabase(@NonNull com.google.firebase.ktx.Firebase); + method @Nullable public static inline T getValue(@NonNull com.google.firebase.database.DataSnapshot); + } + +} + diff --git a/firebase-dynamic-links/api.txt b/firebase-dynamic-links/api.txt index 38bd8f1383c..8896d8321da 100644 --- a/firebase-dynamic-links/api.txt +++ b/firebase-dynamic-links/api.txt @@ -2,7 +2,7 @@ package com.google.firebase.dynamiclinks { public final class DynamicLink { - method @NonNull public Uri getUri(); + method @NonNull public android.net.Uri getUri(); } public static final class DynamicLink.AndroidParameters { @@ -12,27 +12,27 @@ package com.google.firebase.dynamiclinks { ctor public DynamicLink.AndroidParameters.Builder(); ctor public DynamicLink.AndroidParameters.Builder(@NonNull String); method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.AndroidParameters build(); - method @NonNull public Uri getFallbackUrl(); + method @NonNull public android.net.Uri getFallbackUrl(); method public int getMinimumVersion(); - method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.AndroidParameters.Builder setFallbackUrl(@NonNull Uri); + method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.AndroidParameters.Builder setFallbackUrl(@NonNull android.net.Uri); method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.AndroidParameters.Builder setMinimumVersion(int); } public static final class DynamicLink.Builder { method @NonNull public com.google.firebase.dynamiclinks.DynamicLink buildDynamicLink(); - method @NonNull public Task buildShortDynamicLink(); - method @NonNull public Task buildShortDynamicLink(@com.google.firebase.dynamiclinks.ShortDynamicLink.Suffix int); + method @NonNull public com.google.android.gms.tasks.Task buildShortDynamicLink(); + method @NonNull public com.google.android.gms.tasks.Task buildShortDynamicLink(@com.google.firebase.dynamiclinks.ShortDynamicLink.Suffix int); method @NonNull public String getDomainUriPrefix(); - method @NonNull public Uri getLink(); - method @NonNull public Uri getLongLink(); + method @NonNull public android.net.Uri getLink(); + method @NonNull public android.net.Uri getLongLink(); method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.Builder setAndroidParameters(@NonNull com.google.firebase.dynamiclinks.DynamicLink.AndroidParameters); method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.Builder setDomainUriPrefix(@NonNull String); method @Deprecated @NonNull public com.google.firebase.dynamiclinks.DynamicLink.Builder setDynamicLinkDomain(@NonNull String); method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.Builder setGoogleAnalyticsParameters(@NonNull com.google.firebase.dynamiclinks.DynamicLink.GoogleAnalyticsParameters); method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.Builder setIosParameters(@NonNull com.google.firebase.dynamiclinks.DynamicLink.IosParameters); method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.Builder setItunesConnectAnalyticsParameters(@NonNull com.google.firebase.dynamiclinks.DynamicLink.ItunesConnectAnalyticsParameters); - method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.Builder setLink(@NonNull Uri); - method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.Builder setLongLink(@NonNull Uri); + method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.Builder setLink(@NonNull android.net.Uri); + method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.Builder setLongLink(@NonNull android.net.Uri); method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.Builder setNavigationInfoParameters(@NonNull com.google.firebase.dynamiclinks.DynamicLink.NavigationInfoParameters); method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.Builder setSocialMetaTagParameters(@NonNull com.google.firebase.dynamiclinks.DynamicLink.SocialMetaTagParameters); } @@ -65,13 +65,13 @@ package com.google.firebase.dynamiclinks { method @NonNull public String getAppStoreId(); method @NonNull public String getCustomScheme(); method @NonNull public String getIpadBundleId(); - method @NonNull public Uri getIpadFallbackUrl(); + method @NonNull public android.net.Uri getIpadFallbackUrl(); method @NonNull public String getMinimumVersion(); method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.IosParameters.Builder setAppStoreId(@NonNull String); method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.IosParameters.Builder setCustomScheme(@NonNull String); - method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.IosParameters.Builder setFallbackUrl(@NonNull Uri); + method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.IosParameters.Builder setFallbackUrl(@NonNull android.net.Uri); method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.IosParameters.Builder setIpadBundleId(@NonNull String); - method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.IosParameters.Builder setIpadFallbackUrl(@NonNull Uri); + method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.IosParameters.Builder setIpadFallbackUrl(@NonNull android.net.Uri); method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.IosParameters.Builder setMinimumVersion(@NonNull String); } @@ -106,37 +106,37 @@ package com.google.firebase.dynamiclinks { ctor public DynamicLink.SocialMetaTagParameters.Builder(); method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.SocialMetaTagParameters build(); method @NonNull public String getDescription(); - method @NonNull public Uri getImageUrl(); + method @NonNull public android.net.Uri getImageUrl(); method @NonNull public String getTitle(); method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.SocialMetaTagParameters.Builder setDescription(@NonNull String); - method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.SocialMetaTagParameters.Builder setImageUrl(@NonNull Uri); + method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.SocialMetaTagParameters.Builder setImageUrl(@NonNull android.net.Uri); method @NonNull public com.google.firebase.dynamiclinks.DynamicLink.SocialMetaTagParameters.Builder setTitle(@NonNull String); } public abstract class FirebaseDynamicLinks { ctor public FirebaseDynamicLinks(); method @NonNull public abstract com.google.firebase.dynamiclinks.DynamicLink.Builder createDynamicLink(); - method @NonNull public abstract Task getDynamicLink(@NonNull Intent); - method @NonNull public abstract Task getDynamicLink(@NonNull Uri); + method @NonNull public abstract com.google.android.gms.tasks.Task getDynamicLink(@NonNull android.content.Intent); + method @NonNull public abstract com.google.android.gms.tasks.Task getDynamicLink(@NonNull android.net.Uri); method @NonNull public static com.google.firebase.dynamiclinks.FirebaseDynamicLinks getInstance(); - method @NonNull public static com.google.firebase.dynamiclinks.FirebaseDynamicLinks getInstance(@NonNull FirebaseApp); + method @NonNull public static com.google.firebase.dynamiclinks.FirebaseDynamicLinks getInstance(@NonNull com.google.firebase.FirebaseApp); } public class PendingDynamicLinkData { - ctor protected PendingDynamicLinkData(@Nullable String, int, long, @Nullable Uri); + ctor protected PendingDynamicLinkData(@Nullable String, int, long, @Nullable android.net.Uri); method public long getClickTimestamp(); - method @Nullable public Uri getLink(); + method @Nullable public android.net.Uri getLink(); method public int getMinimumAppVersion(); - method @Nullable public Intent getUpdateAppIntent(@NonNull Context); + method @Nullable public android.content.Intent getUpdateAppIntent(@NonNull android.content.Context); } public interface ShortDynamicLink { - method @Nullable public Uri getPreviewLink(); - method @Nullable public Uri getShortLink(); - method @NonNull public List getWarnings(); + method @Nullable public android.net.Uri getPreviewLink(); + method @Nullable public android.net.Uri getShortLink(); + method @NonNull public java.util.List getWarnings(); } - @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) public static @interface ShortDynamicLink.Suffix { + @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) @IntDef({com.google.firebase.dynamiclinks.ShortDynamicLink.Suffix.UNGUESSABLE, com.google.firebase.dynamiclinks.ShortDynamicLink.Suffix.SHORT}) public static @interface ShortDynamicLink.Suffix { field public static final int SHORT = 2; // 0x2 field public static final int UNGUESSABLE = 1; // 0x1 } diff --git a/firebase-dynamic-links/ktx/api.txt b/firebase-dynamic-links/ktx/api.txt new file mode 100644 index 00000000000..79744de6298 --- /dev/null +++ b/firebase-dynamic-links/ktx/api.txt @@ -0,0 +1,22 @@ +// Signature format: 2.0 +package com.google.firebase.dynamiclinks.ktx { + + public final class FirebaseDynamicLinksKt { + ctor public FirebaseDynamicLinksKt(); + method @NonNull public static void androidParameters(@NonNull com.google.firebase.dynamiclinks.DynamicLink.Builder, @NonNull kotlin.jvm.functions.Function1 init); + method @NonNull public static void androidParameters(@NonNull com.google.firebase.dynamiclinks.DynamicLink.Builder, @NonNull String packageName, @NonNull kotlin.jvm.functions.Function1 init); + method @NonNull public static com.google.firebase.dynamiclinks.DynamicLink dynamicLink(@NonNull com.google.firebase.dynamiclinks.FirebaseDynamicLinks, @NonNull kotlin.jvm.functions.Function1 init); + method @NonNull public static com.google.firebase.dynamiclinks.FirebaseDynamicLinks dynamicLinks(@NonNull com.google.firebase.ktx.Firebase, @NonNull com.google.firebase.FirebaseApp app); + method @NonNull public static com.google.firebase.dynamiclinks.FirebaseDynamicLinks getDynamicLinks(@NonNull com.google.firebase.ktx.Firebase); + method @NonNull public static void googleAnalyticsParameters(@NonNull com.google.firebase.dynamiclinks.DynamicLink.Builder, @NonNull kotlin.jvm.functions.Function1 init); + method @NonNull public static void googleAnalyticsParameters(@NonNull com.google.firebase.dynamiclinks.DynamicLink.Builder, @NonNull String source, @NonNull String medium, @NonNull String campaign, @NonNull kotlin.jvm.functions.Function1 init); + method @NonNull public static void iosParameters(@NonNull com.google.firebase.dynamiclinks.DynamicLink.Builder, @NonNull String bundleId, @NonNull kotlin.jvm.functions.Function1 init); + method @NonNull public static void itunesConnectAnalyticsParameters(@NonNull com.google.firebase.dynamiclinks.DynamicLink.Builder, @NonNull kotlin.jvm.functions.Function1 init); + method @NonNull public static void navigationInfoParameters(@NonNull com.google.firebase.dynamiclinks.DynamicLink.Builder, @NonNull kotlin.jvm.functions.Function1 init); + method @NonNull public static com.google.android.gms.tasks.Task shortLinkAsync(@NonNull com.google.firebase.dynamiclinks.FirebaseDynamicLinks, @NonNull kotlin.jvm.functions.Function1 init); + method @NonNull public static com.google.android.gms.tasks.Task shortLinkAsync(@NonNull com.google.firebase.dynamiclinks.FirebaseDynamicLinks, int suffix, @NonNull kotlin.jvm.functions.Function1 init); + method @NonNull public static void socialMetaTagParameters(@NonNull com.google.firebase.dynamiclinks.DynamicLink.Builder, @NonNull kotlin.jvm.functions.Function1 init); + } + +} + diff --git a/firebase-firestore/api.txt b/firebase-firestore/api.txt index 8b160882251..d077d842a32 100644 --- a/firebase-firestore/api.txt +++ b/firebase-firestore/api.txt @@ -1,38 +1,32 @@ // Signature format: 2.0 package com.google.firebase { - public final class Timestamp { + public final class Timestamp implements java.lang.Comparable android.os.Parcelable { ctor public Timestamp(long, int); - ctor protected Timestamp(@NonNull Parcel); - ctor public Timestamp(@NonNull Date); + ctor protected Timestamp(@NonNull android.os.Parcel); + ctor public Timestamp(@NonNull java.util.Date); method public int compareTo(@NonNull com.google.firebase.Timestamp); method public int describeContents(); - method public boolean equals(Object); method public int getNanoseconds(); method public long getSeconds(); - method public int hashCode(); method @NonNull public static com.google.firebase.Timestamp now(); - method @NonNull public Date toDate(); - method public String toString(); - method public void writeToParcel(@NonNull Parcel, int); - field @NonNull public static final Parcelable.Creator CREATOR; + method @NonNull public java.util.Date toDate(); + method public void writeToParcel(@NonNull android.os.Parcel, int); + field @NonNull public static final android.os.Parcelable.Creator CREATOR; } } package com.google.firebase.firestore { - public class Blob { + public class Blob implements java.lang.Comparable { method public int compareTo(@NonNull com.google.firebase.firestore.Blob); - method public boolean equals(@Nullable Object); method @NonNull public static com.google.firebase.firestore.Blob fromBytes(@NonNull byte[]); - method public int hashCode(); method @NonNull public byte[] toBytes(); - method @NonNull public String toString(); } public class CollectionReference extends com.google.firebase.firestore.Query { - method @NonNull public Task add(@NonNull Object); + method @NonNull public com.google.android.gms.tasks.Task add(@NonNull Object); method @NonNull public com.google.firebase.firestore.DocumentReference document(); method @NonNull public com.google.firebase.firestore.DocumentReference document(@NonNull String); method @NonNull public String getId(); @@ -41,12 +35,10 @@ package com.google.firebase.firestore { } public class DocumentChange { - method public boolean equals(@Nullable Object); method @NonNull public com.google.firebase.firestore.QueryDocumentSnapshot getDocument(); method public int getNewIndex(); method public int getOldIndex(); method @NonNull public com.google.firebase.firestore.DocumentChange.Type getType(); - method public int hashCode(); } public enum DocumentChange.Type { @@ -55,37 +47,34 @@ package com.google.firebase.firestore { enum_constant public static final com.google.firebase.firestore.DocumentChange.Type REMOVED; } - @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) public @interface DocumentId { + @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.METHOD}) public @interface DocumentId { } public class DocumentReference { method @NonNull public com.google.firebase.firestore.ListenerRegistration addSnapshotListener(@NonNull com.google.firebase.firestore.EventListener); - method @NonNull public com.google.firebase.firestore.ListenerRegistration addSnapshotListener(@NonNull Executor, @NonNull com.google.firebase.firestore.EventListener); - method @NonNull public com.google.firebase.firestore.ListenerRegistration addSnapshotListener(@NonNull Activity, @NonNull com.google.firebase.firestore.EventListener); + method @NonNull public com.google.firebase.firestore.ListenerRegistration addSnapshotListener(@NonNull java.util.concurrent.Executor, @NonNull com.google.firebase.firestore.EventListener); + method @NonNull public com.google.firebase.firestore.ListenerRegistration addSnapshotListener(@NonNull android.app.Activity, @NonNull com.google.firebase.firestore.EventListener); method @NonNull public com.google.firebase.firestore.ListenerRegistration addSnapshotListener(@NonNull com.google.firebase.firestore.MetadataChanges, @NonNull com.google.firebase.firestore.EventListener); - method @NonNull public com.google.firebase.firestore.ListenerRegistration addSnapshotListener(@NonNull Executor, @NonNull com.google.firebase.firestore.MetadataChanges, @NonNull com.google.firebase.firestore.EventListener); - method @NonNull public com.google.firebase.firestore.ListenerRegistration addSnapshotListener(@NonNull Activity, @NonNull com.google.firebase.firestore.MetadataChanges, @NonNull com.google.firebase.firestore.EventListener); + method @NonNull public com.google.firebase.firestore.ListenerRegistration addSnapshotListener(@NonNull java.util.concurrent.Executor, @NonNull com.google.firebase.firestore.MetadataChanges, @NonNull com.google.firebase.firestore.EventListener); + method @NonNull public com.google.firebase.firestore.ListenerRegistration addSnapshotListener(@NonNull android.app.Activity, @NonNull com.google.firebase.firestore.MetadataChanges, @NonNull com.google.firebase.firestore.EventListener); method @NonNull public com.google.firebase.firestore.CollectionReference collection(@NonNull String); - method @NonNull public Task delete(); - method public boolean equals(Object); - method @NonNull public Task get(); - method @NonNull public Task get(@NonNull com.google.firebase.firestore.Source); + method @NonNull public com.google.android.gms.tasks.Task delete(); + method @NonNull public com.google.android.gms.tasks.Task get(); + method @NonNull public com.google.android.gms.tasks.Task get(@NonNull com.google.firebase.firestore.Source); method @NonNull public com.google.firebase.firestore.FirebaseFirestore getFirestore(); method @NonNull public String getId(); method @NonNull public com.google.firebase.firestore.CollectionReference getParent(); method @NonNull public String getPath(); - method public int hashCode(); - method @NonNull public Task set(@NonNull Object); - method @NonNull public Task set(@NonNull Object, @NonNull com.google.firebase.firestore.SetOptions); - method @NonNull public Task update(@NonNull Map); - method @NonNull public Task update(@NonNull String, @Nullable Object, Object...); - method @NonNull public Task update(@NonNull com.google.firebase.firestore.FieldPath, @Nullable Object, Object...); + method @NonNull public com.google.android.gms.tasks.Task set(@NonNull Object); + method @NonNull public com.google.android.gms.tasks.Task set(@NonNull Object, @NonNull com.google.firebase.firestore.SetOptions); + method @NonNull public com.google.android.gms.tasks.Task update(@NonNull java.util.Map); + method @NonNull public com.google.android.gms.tasks.Task update(@NonNull String, @Nullable Object, java.lang.Object...); + method @NonNull public com.google.android.gms.tasks.Task update(@NonNull com.google.firebase.firestore.FieldPath, @Nullable Object, java.lang.Object...); } public class DocumentSnapshot { method public boolean contains(@NonNull String); method public boolean contains(@NonNull com.google.firebase.firestore.FieldPath); - method public boolean equals(@Nullable Object); method public boolean exists(); method @Nullable public Object get(@NonNull String); method @Nullable public Object get(@NonNull String, @NonNull com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior); @@ -97,10 +86,10 @@ package com.google.firebase.firestore { method @Nullable public T get(@NonNull com.google.firebase.firestore.FieldPath, @NonNull Class, @NonNull com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior); method @Nullable public com.google.firebase.firestore.Blob getBlob(@NonNull String); method @Nullable public Boolean getBoolean(@NonNull String); - method @Nullable public Map getData(); - method @Nullable public Map getData(@NonNull com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior); - method @Nullable public Date getDate(@NonNull String); - method @Nullable public Date getDate(@NonNull String, @NonNull com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior); + method @Nullable public java.util.Map getData(); + method @Nullable public java.util.Map getData(@NonNull com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior); + method @Nullable public java.util.Date getDate(@NonNull String); + method @Nullable public java.util.Date getDate(@NonNull String, @NonNull com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior); method @Nullable public com.google.firebase.firestore.DocumentReference getDocumentReference(@NonNull String); method @Nullable public Double getDouble(@NonNull String); method @Nullable public com.google.firebase.firestore.GeoPoint getGeoPoint(@NonNull String); @@ -111,10 +100,8 @@ package com.google.firebase.firestore { method @Nullable public String getString(@NonNull String); method @Nullable public com.google.firebase.Timestamp getTimestamp(@NonNull String); method @Nullable public com.google.firebase.Timestamp getTimestamp(@NonNull String, @NonNull com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior); - method public int hashCode(); method @Nullable public T toObject(@NonNull Class); method @Nullable public T toObject(@NonNull Class, @NonNull com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior); - method public String toString(); } public enum DocumentSnapshot.ServerTimestampBehavior { @@ -127,20 +114,17 @@ package com.google.firebase.firestore { method public void onEvent(@Nullable T, @Nullable com.google.firebase.firestore.FirebaseFirestoreException); } - @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) public @interface Exclude { + @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.FIELD}) public @interface Exclude { } public final class FieldPath { method @NonNull public static com.google.firebase.firestore.FieldPath documentId(); - method public boolean equals(Object); - method public int hashCode(); - method @NonNull public static com.google.firebase.firestore.FieldPath of(String...); - method public String toString(); + method @NonNull public static com.google.firebase.firestore.FieldPath of(java.lang.String...); } public abstract class FieldValue { - method @NonNull public static com.google.firebase.firestore.FieldValue arrayRemove(Object...); - method @NonNull public static com.google.firebase.firestore.FieldValue arrayUnion(Object...); + method @NonNull public static com.google.firebase.firestore.FieldValue arrayRemove(java.lang.Object...); + method @NonNull public static com.google.firebase.firestore.FieldValue arrayUnion(java.lang.Object...); method @NonNull public static com.google.firebase.firestore.FieldValue delete(); method @NonNull public static com.google.firebase.firestore.FieldValue increment(long); method @NonNull public static com.google.firebase.firestore.FieldValue increment(double); @@ -149,28 +133,28 @@ package com.google.firebase.firestore { public class FirebaseFirestore { method @NonNull public com.google.firebase.firestore.ListenerRegistration addSnapshotsInSyncListener(@NonNull Runnable); - method @NonNull public com.google.firebase.firestore.ListenerRegistration addSnapshotsInSyncListener(@NonNull Activity, @NonNull Runnable); - method @NonNull public com.google.firebase.firestore.ListenerRegistration addSnapshotsInSyncListener(@NonNull Executor, @NonNull Runnable); + method @NonNull public com.google.firebase.firestore.ListenerRegistration addSnapshotsInSyncListener(@NonNull android.app.Activity, @NonNull Runnable); + method @NonNull public com.google.firebase.firestore.ListenerRegistration addSnapshotsInSyncListener(@NonNull java.util.concurrent.Executor, @NonNull Runnable); method @NonNull public com.google.firebase.firestore.WriteBatch batch(); - method @NonNull public Task clearPersistence(); + method @NonNull public com.google.android.gms.tasks.Task clearPersistence(); method @NonNull public com.google.firebase.firestore.CollectionReference collection(@NonNull String); method @NonNull public com.google.firebase.firestore.Query collectionGroup(@NonNull String); - method @NonNull public Task disableNetwork(); + method @NonNull public com.google.android.gms.tasks.Task disableNetwork(); method @NonNull public com.google.firebase.firestore.DocumentReference document(@NonNull String); - method @NonNull public Task enableNetwork(); - method @NonNull public FirebaseApp getApp(); + method @NonNull public com.google.android.gms.tasks.Task enableNetwork(); + method @NonNull public com.google.firebase.FirebaseApp getApp(); method @NonNull public com.google.firebase.firestore.FirebaseFirestoreSettings getFirestoreSettings(); method @NonNull public static com.google.firebase.firestore.FirebaseFirestore getInstance(); - method @NonNull public static com.google.firebase.firestore.FirebaseFirestore getInstance(@NonNull FirebaseApp); - method @NonNull public Task runBatch(@NonNull com.google.firebase.firestore.WriteBatch.Function); - method @NonNull public Task runTransaction(@NonNull com.google.firebase.firestore.Transaction.Function); + method @NonNull public static com.google.firebase.firestore.FirebaseFirestore getInstance(@NonNull com.google.firebase.FirebaseApp); + method @NonNull public com.google.android.gms.tasks.Task runBatch(@NonNull com.google.firebase.firestore.WriteBatch.Function); + method @NonNull public com.google.android.gms.tasks.Task runTransaction(@NonNull com.google.firebase.firestore.Transaction.Function); method public void setFirestoreSettings(@NonNull com.google.firebase.firestore.FirebaseFirestoreSettings); method public static void setLoggingEnabled(boolean); - method @NonNull public Task terminate(); - method @NonNull public Task waitForPendingWrites(); + method @NonNull public com.google.android.gms.tasks.Task terminate(); + method @NonNull public com.google.android.gms.tasks.Task waitForPendingWrites(); } - public class FirebaseFirestoreException { + public class FirebaseFirestoreException extends com.google.firebase.FirebaseException { ctor public FirebaseFirestoreException(@NonNull String, @NonNull com.google.firebase.firestore.FirebaseFirestoreException.Code); ctor public FirebaseFirestoreException(@NonNull String, @NonNull com.google.firebase.firestore.FirebaseFirestoreException.Code, @Nullable Throwable); method @NonNull public com.google.firebase.firestore.FirebaseFirestoreException.Code getCode(); @@ -200,13 +184,10 @@ package com.google.firebase.firestore { public final class FirebaseFirestoreSettings { method public boolean areTimestampsInSnapshotsEnabled(); - method public boolean equals(@Nullable Object); method public long getCacheSizeBytes(); method @NonNull public String getHost(); - method public int hashCode(); method public boolean isPersistenceEnabled(); method public boolean isSslEnabled(); - method @NonNull public String toString(); field public static final long CACHE_SIZE_UNLIMITED = -1L; // 0xffffffffffffffffL } @@ -225,17 +206,14 @@ package com.google.firebase.firestore { method @Deprecated @NonNull public com.google.firebase.firestore.FirebaseFirestoreSettings.Builder setTimestampsInSnapshotsEnabled(boolean); } - public class GeoPoint { + public class GeoPoint implements java.lang.Comparable { ctor public GeoPoint(double, double); method public int compareTo(@NonNull com.google.firebase.firestore.GeoPoint); - method public boolean equals(@Nullable Object); method public double getLatitude(); method public double getLongitude(); - method public int hashCode(); - method @NonNull public String toString(); } - @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) public @interface IgnoreExtraProperties { + @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE}) public @interface IgnoreExtraProperties { } public interface ListenerRegistration { @@ -247,26 +225,24 @@ package com.google.firebase.firestore { enum_constant public static final com.google.firebase.firestore.MetadataChanges INCLUDE; } - @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) public @interface PropertyName { + @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.FIELD}) public @interface PropertyName { method public abstract String value(); } public class Query { method @NonNull public com.google.firebase.firestore.ListenerRegistration addSnapshotListener(@NonNull com.google.firebase.firestore.EventListener); - method @NonNull public com.google.firebase.firestore.ListenerRegistration addSnapshotListener(@NonNull Executor, @NonNull com.google.firebase.firestore.EventListener); - method @NonNull public com.google.firebase.firestore.ListenerRegistration addSnapshotListener(@NonNull Activity, @NonNull com.google.firebase.firestore.EventListener); + method @NonNull public com.google.firebase.firestore.ListenerRegistration addSnapshotListener(@NonNull java.util.concurrent.Executor, @NonNull com.google.firebase.firestore.EventListener); + method @NonNull public com.google.firebase.firestore.ListenerRegistration addSnapshotListener(@NonNull android.app.Activity, @NonNull com.google.firebase.firestore.EventListener); method @NonNull public com.google.firebase.firestore.ListenerRegistration addSnapshotListener(@NonNull com.google.firebase.firestore.MetadataChanges, @NonNull com.google.firebase.firestore.EventListener); - method @NonNull public com.google.firebase.firestore.ListenerRegistration addSnapshotListener(@NonNull Executor, @NonNull com.google.firebase.firestore.MetadataChanges, @NonNull com.google.firebase.firestore.EventListener); - method @NonNull public com.google.firebase.firestore.ListenerRegistration addSnapshotListener(@NonNull Activity, @NonNull com.google.firebase.firestore.MetadataChanges, @NonNull com.google.firebase.firestore.EventListener); + method @NonNull public com.google.firebase.firestore.ListenerRegistration addSnapshotListener(@NonNull java.util.concurrent.Executor, @NonNull com.google.firebase.firestore.MetadataChanges, @NonNull com.google.firebase.firestore.EventListener); + method @NonNull public com.google.firebase.firestore.ListenerRegistration addSnapshotListener(@NonNull android.app.Activity, @NonNull com.google.firebase.firestore.MetadataChanges, @NonNull com.google.firebase.firestore.EventListener); method @NonNull public com.google.firebase.firestore.Query endAt(@NonNull com.google.firebase.firestore.DocumentSnapshot); - method @NonNull public com.google.firebase.firestore.Query endAt(Object...); + method @NonNull public com.google.firebase.firestore.Query endAt(java.lang.Object...); method @NonNull public com.google.firebase.firestore.Query endBefore(@NonNull com.google.firebase.firestore.DocumentSnapshot); - method @NonNull public com.google.firebase.firestore.Query endBefore(Object...); - method public boolean equals(Object); - method @NonNull public Task get(); - method @NonNull public Task get(@NonNull com.google.firebase.firestore.Source); + method @NonNull public com.google.firebase.firestore.Query endBefore(java.lang.Object...); + method @NonNull public com.google.android.gms.tasks.Task get(); + method @NonNull public com.google.android.gms.tasks.Task get(@NonNull com.google.firebase.firestore.Source); method @NonNull public com.google.firebase.firestore.FirebaseFirestore getFirestore(); - method public int hashCode(); method @NonNull public com.google.firebase.firestore.Query limit(long); method @NonNull public com.google.firebase.firestore.Query limitToLast(long); method @NonNull public com.google.firebase.firestore.Query orderBy(@NonNull String); @@ -274,21 +250,21 @@ package com.google.firebase.firestore { method @NonNull public com.google.firebase.firestore.Query orderBy(@NonNull String, @NonNull com.google.firebase.firestore.Query.Direction); method @NonNull public com.google.firebase.firestore.Query orderBy(@NonNull com.google.firebase.firestore.FieldPath, @NonNull com.google.firebase.firestore.Query.Direction); method @NonNull public com.google.firebase.firestore.Query startAfter(@NonNull com.google.firebase.firestore.DocumentSnapshot); - method @NonNull public com.google.firebase.firestore.Query startAfter(Object...); + method @NonNull public com.google.firebase.firestore.Query startAfter(java.lang.Object...); method @NonNull public com.google.firebase.firestore.Query startAt(@NonNull com.google.firebase.firestore.DocumentSnapshot); - method @NonNull public com.google.firebase.firestore.Query startAt(Object...); + method @NonNull public com.google.firebase.firestore.Query startAt(java.lang.Object...); method @NonNull public com.google.firebase.firestore.Query whereArrayContains(@NonNull String, @NonNull Object); method @NonNull public com.google.firebase.firestore.Query whereArrayContains(@NonNull com.google.firebase.firestore.FieldPath, @NonNull Object); - method @NonNull public com.google.firebase.firestore.Query whereArrayContainsAny(@NonNull String, @NonNull List); - method @NonNull public com.google.firebase.firestore.Query whereArrayContainsAny(@NonNull com.google.firebase.firestore.FieldPath, @NonNull List); + method @NonNull public com.google.firebase.firestore.Query whereArrayContainsAny(@NonNull String, @NonNull java.util.List); + method @NonNull public com.google.firebase.firestore.Query whereArrayContainsAny(@NonNull com.google.firebase.firestore.FieldPath, @NonNull java.util.List); method @NonNull public com.google.firebase.firestore.Query whereEqualTo(@NonNull String, @Nullable Object); method @NonNull public com.google.firebase.firestore.Query whereEqualTo(@NonNull com.google.firebase.firestore.FieldPath, @Nullable Object); method @NonNull public com.google.firebase.firestore.Query whereGreaterThan(@NonNull String, @NonNull Object); method @NonNull public com.google.firebase.firestore.Query whereGreaterThan(@NonNull com.google.firebase.firestore.FieldPath, @NonNull Object); method @NonNull public com.google.firebase.firestore.Query whereGreaterThanOrEqualTo(@NonNull String, @NonNull Object); method @NonNull public com.google.firebase.firestore.Query whereGreaterThanOrEqualTo(@NonNull com.google.firebase.firestore.FieldPath, @NonNull Object); - method @NonNull public com.google.firebase.firestore.Query whereIn(@NonNull String, @NonNull List); - method @NonNull public com.google.firebase.firestore.Query whereIn(@NonNull com.google.firebase.firestore.FieldPath, @NonNull List); + method @NonNull public com.google.firebase.firestore.Query whereIn(@NonNull String, @NonNull java.util.List); + method @NonNull public com.google.firebase.firestore.Query whereIn(@NonNull com.google.firebase.firestore.FieldPath, @NonNull java.util.List); method @NonNull public com.google.firebase.firestore.Query whereLessThan(@NonNull String, @NonNull Object); method @NonNull public com.google.firebase.firestore.Query whereLessThan(@NonNull com.google.firebase.firestore.FieldPath, @NonNull Object); method @NonNull public com.google.firebase.firestore.Query whereLessThanOrEqualTo(@NonNull String, @NonNull Object); @@ -303,39 +279,32 @@ package com.google.firebase.firestore { public class QueryDocumentSnapshot extends com.google.firebase.firestore.DocumentSnapshot { } - public class QuerySnapshot { - method public boolean equals(@Nullable Object); - method @NonNull public List getDocumentChanges(); - method @NonNull public List getDocumentChanges(@NonNull com.google.firebase.firestore.MetadataChanges); - method @NonNull public List getDocuments(); + public class QuerySnapshot implements java.lang.Iterable { + method @NonNull public java.util.List getDocumentChanges(); + method @NonNull public java.util.List getDocumentChanges(@NonNull com.google.firebase.firestore.MetadataChanges); + method @NonNull public java.util.List getDocuments(); method @NonNull public com.google.firebase.firestore.SnapshotMetadata getMetadata(); method @NonNull public com.google.firebase.firestore.Query getQuery(); - method public int hashCode(); method public boolean isEmpty(); - method @NonNull public Iterator iterator(); + method @NonNull public java.util.Iterator iterator(); method public int size(); - method @NonNull public List toObjects(@NonNull Class); - method @NonNull public List toObjects(@NonNull Class, @NonNull com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior); + method @NonNull public java.util.List toObjects(@NonNull Class); + method @NonNull public java.util.List toObjects(@NonNull Class, @NonNull com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior); } - @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) public @interface ServerTimestamp { + @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.FIELD}) public @interface ServerTimestamp { } public final class SetOptions { - method public boolean equals(Object); - method public int hashCode(); method @NonNull public static com.google.firebase.firestore.SetOptions merge(); - method @NonNull public static com.google.firebase.firestore.SetOptions mergeFieldPaths(@NonNull List); - method @NonNull public static com.google.firebase.firestore.SetOptions mergeFields(@NonNull List); - method @NonNull public static com.google.firebase.firestore.SetOptions mergeFields(String...); + method @NonNull public static com.google.firebase.firestore.SetOptions mergeFieldPaths(@NonNull java.util.List); + method @NonNull public static com.google.firebase.firestore.SetOptions mergeFields(@NonNull java.util.List); + method @NonNull public static com.google.firebase.firestore.SetOptions mergeFields(java.lang.String...); } public class SnapshotMetadata { - method public boolean equals(@Nullable Object); method public boolean hasPendingWrites(); - method public int hashCode(); method public boolean isFromCache(); - method public String toString(); } public enum Source { @@ -344,7 +313,7 @@ package com.google.firebase.firestore { enum_constant public static final com.google.firebase.firestore.Source SERVER; } - @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) public @interface ThrowOnExtraProperties { + @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE}) public @interface ThrowOnExtraProperties { } public class Transaction { @@ -352,9 +321,9 @@ package com.google.firebase.firestore { method @NonNull public com.google.firebase.firestore.DocumentSnapshot get(@NonNull com.google.firebase.firestore.DocumentReference) throws com.google.firebase.firestore.FirebaseFirestoreException; method @NonNull public com.google.firebase.firestore.Transaction set(@NonNull com.google.firebase.firestore.DocumentReference, @NonNull Object); method @NonNull public com.google.firebase.firestore.Transaction set(@NonNull com.google.firebase.firestore.DocumentReference, @NonNull Object, @NonNull com.google.firebase.firestore.SetOptions); - method @NonNull public com.google.firebase.firestore.Transaction update(@NonNull com.google.firebase.firestore.DocumentReference, @NonNull Map); - method @NonNull public com.google.firebase.firestore.Transaction update(@NonNull com.google.firebase.firestore.DocumentReference, @NonNull String, @Nullable Object, Object...); - method @NonNull public com.google.firebase.firestore.Transaction update(@NonNull com.google.firebase.firestore.DocumentReference, @NonNull com.google.firebase.firestore.FieldPath, @Nullable Object, Object...); + method @NonNull public com.google.firebase.firestore.Transaction update(@NonNull com.google.firebase.firestore.DocumentReference, @NonNull java.util.Map); + method @NonNull public com.google.firebase.firestore.Transaction update(@NonNull com.google.firebase.firestore.DocumentReference, @NonNull String, @Nullable Object, java.lang.Object...); + method @NonNull public com.google.firebase.firestore.Transaction update(@NonNull com.google.firebase.firestore.DocumentReference, @NonNull com.google.firebase.firestore.FieldPath, @Nullable Object, java.lang.Object...); } public static interface Transaction.Function { @@ -362,13 +331,13 @@ package com.google.firebase.firestore { } public class WriteBatch { - method @NonNull public Task commit(); + method @NonNull public com.google.android.gms.tasks.Task commit(); method @NonNull public com.google.firebase.firestore.WriteBatch delete(@NonNull com.google.firebase.firestore.DocumentReference); method @NonNull public com.google.firebase.firestore.WriteBatch set(@NonNull com.google.firebase.firestore.DocumentReference, @NonNull Object); method @NonNull public com.google.firebase.firestore.WriteBatch set(@NonNull com.google.firebase.firestore.DocumentReference, @NonNull Object, @NonNull com.google.firebase.firestore.SetOptions); - method @NonNull public com.google.firebase.firestore.WriteBatch update(@NonNull com.google.firebase.firestore.DocumentReference, @NonNull Map); - method @NonNull public com.google.firebase.firestore.WriteBatch update(@NonNull com.google.firebase.firestore.DocumentReference, @NonNull String, @Nullable Object, Object...); - method @NonNull public com.google.firebase.firestore.WriteBatch update(@NonNull com.google.firebase.firestore.DocumentReference, @NonNull com.google.firebase.firestore.FieldPath, @Nullable Object, Object...); + method @NonNull public com.google.firebase.firestore.WriteBatch update(@NonNull com.google.firebase.firestore.DocumentReference, @NonNull java.util.Map); + method @NonNull public com.google.firebase.firestore.WriteBatch update(@NonNull com.google.firebase.firestore.DocumentReference, @NonNull String, @Nullable Object, java.lang.Object...); + method @NonNull public com.google.firebase.firestore.WriteBatch update(@NonNull com.google.firebase.firestore.DocumentReference, @NonNull com.google.firebase.firestore.FieldPath, @Nullable Object, java.lang.Object...); } public static interface WriteBatch.Function { diff --git a/firebase-firestore/ktx/api.txt b/firebase-firestore/ktx/api.txt new file mode 100644 index 00000000000..634bb8923d9 --- /dev/null +++ b/firebase-firestore/ktx/api.txt @@ -0,0 +1,22 @@ +// Signature format: 2.0 +package com.google.firebase.firestore.ktx { + + public final class FirestoreKt { + ctor public FirestoreKt(); + method @NonNull public static com.google.firebase.firestore.FirebaseFirestore firestore(@NonNull com.google.firebase.ktx.Firebase, @NonNull com.google.firebase.FirebaseApp app); + method @NonNull public static com.google.firebase.firestore.FirebaseFirestoreSettings firestoreSettings(@NonNull kotlin.jvm.functions.Function1 init); + method @Nullable public static inline T getField(@NonNull com.google.firebase.firestore.DocumentSnapshot, @NonNull String field); + method @Nullable public static inline T getField(@NonNull com.google.firebase.firestore.DocumentSnapshot, @NonNull String field, @NonNull com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior serverTimestampBehavior); + method @Nullable public static inline T getField(@NonNull com.google.firebase.firestore.DocumentSnapshot, @NonNull com.google.firebase.firestore.FieldPath fieldPath); + method @Nullable public static inline T getField(@NonNull com.google.firebase.firestore.DocumentSnapshot, @NonNull com.google.firebase.firestore.FieldPath fieldPath, @NonNull com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior serverTimestampBehavior); + method @NonNull public static com.google.firebase.firestore.FirebaseFirestore getFirestore(@NonNull com.google.firebase.ktx.Firebase); + method @Nullable public static inline T toObject(@NonNull com.google.firebase.firestore.DocumentSnapshot); + method @Nullable public static inline T toObject(@NonNull com.google.firebase.firestore.DocumentSnapshot, @NonNull com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior serverTimestampBehavior); + method @NonNull public static inline T toObject(@NonNull com.google.firebase.firestore.QueryDocumentSnapshot); + method @NonNull public static inline T toObject(@NonNull com.google.firebase.firestore.QueryDocumentSnapshot, @NonNull com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior serverTimestampBehavior); + method @NonNull public static inline java.util.List toObjects(@NonNull com.google.firebase.firestore.QuerySnapshot); + method @NonNull public static inline java.util.List toObjects(@NonNull com.google.firebase.firestore.QuerySnapshot, @NonNull com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior serverTimestampBehavior); + } + +} + diff --git a/firebase-functions/api.txt b/firebase-functions/api.txt index 042d8c05b32..61547cc0f12 100644 --- a/firebase-functions/api.txt +++ b/firebase-functions/api.txt @@ -3,14 +3,14 @@ package com.google.firebase.functions { public class FirebaseFunctions { method @NonNull public com.google.firebase.functions.HttpsCallableReference getHttpsCallable(@NonNull String); - method @NonNull public static com.google.firebase.functions.FirebaseFunctions getInstance(@NonNull FirebaseApp, @NonNull String); - method @NonNull public static com.google.firebase.functions.FirebaseFunctions getInstance(@NonNull FirebaseApp); + method @NonNull public static com.google.firebase.functions.FirebaseFunctions getInstance(@NonNull com.google.firebase.FirebaseApp, @NonNull String); + method @NonNull public static com.google.firebase.functions.FirebaseFunctions getInstance(@NonNull com.google.firebase.FirebaseApp); method @NonNull public static com.google.firebase.functions.FirebaseFunctions getInstance(@NonNull String); method @NonNull public static com.google.firebase.functions.FirebaseFunctions getInstance(); method public void useFunctionsEmulator(@NonNull String); } - public class FirebaseFunctionsException { + public class FirebaseFunctionsException extends com.google.firebase.FirebaseException { method @NonNull public com.google.firebase.functions.FirebaseFunctionsException.Code getCode(); method @Nullable public Object getDetails(); } @@ -36,11 +36,11 @@ package com.google.firebase.functions { } public class HttpsCallableReference { - method @NonNull public Task call(@Nullable Object); - method @NonNull public Task call(); + method @NonNull public com.google.android.gms.tasks.Task call(@Nullable Object); + method @NonNull public com.google.android.gms.tasks.Task call(); method public long getTimeout(); - method public void setTimeout(long, @NonNull TimeUnit); - method @NonNull public com.google.firebase.functions.HttpsCallableReference withTimeout(long, @NonNull TimeUnit); + method public void setTimeout(long, @NonNull java.util.concurrent.TimeUnit); + method @NonNull public com.google.firebase.functions.HttpsCallableReference withTimeout(long, @NonNull java.util.concurrent.TimeUnit); } public class HttpsCallableResult { diff --git a/firebase-functions/ktx/api.txt b/firebase-functions/ktx/api.txt new file mode 100644 index 00000000000..47f771d2f38 --- /dev/null +++ b/firebase-functions/ktx/api.txt @@ -0,0 +1,13 @@ +// Signature format: 2.0 +package com.google.firebase.functions.ktx { + + public final class FunctionsKt { + ctor public FunctionsKt(); + method @NonNull public static com.google.firebase.functions.FirebaseFunctions functions(@NonNull com.google.firebase.ktx.Firebase, @NonNull String region); + method @NonNull public static com.google.firebase.functions.FirebaseFunctions functions(@NonNull com.google.firebase.ktx.Firebase, @NonNull com.google.firebase.FirebaseApp app); + method @NonNull public static com.google.firebase.functions.FirebaseFunctions functions(@NonNull com.google.firebase.ktx.Firebase, @NonNull com.google.firebase.FirebaseApp app, @NonNull String region); + method @NonNull public static com.google.firebase.functions.FirebaseFunctions getFunctions(@NonNull com.google.firebase.ktx.Firebase); + } + +} + diff --git a/firebase-inappmessaging-display/api.txt b/firebase-inappmessaging-display/api.txt index 429d5684a37..85000934f59 100644 --- a/firebase-inappmessaging-display/api.txt +++ b/firebase-inappmessaging-display/api.txt @@ -1,9 +1,16 @@ // Signature format: 2.0 package com.google.firebase.inappmessaging.display { - public class FirebaseInAppMessagingDisplay { - method public void displayMessage(InAppMessage, FirebaseInAppMessagingDisplayCallbacks); - method @NonNull public static com.google.firebase.inappmessaging.display.FirebaseInAppMessagingDisplay getInstance(); + @Keep public class FirebaseInAppMessagingDisplay implements android.app.Application.ActivityLifecycleCallbacks com.google.firebase.inappmessaging.FirebaseInAppMessagingDisplay { + method public void displayMessage(com.google.firebase.inappmessaging.model.InAppMessage, com.google.firebase.inappmessaging.FirebaseInAppMessagingDisplayCallbacks); + method @NonNull @Keep public static com.google.firebase.inappmessaging.display.FirebaseInAppMessagingDisplay getInstance(); + method public void onActivityCreated(android.app.Activity, android.os.Bundle); + method @Keep public void onActivityDestroyed(android.app.Activity); + method @Keep public void onActivityPaused(android.app.Activity); + method @Keep public void onActivityResumed(android.app.Activity); + method public void onActivitySaveInstanceState(android.app.Activity, android.os.Bundle); + method @Keep public void onActivityStarted(android.app.Activity); + method public void onActivityStopped(android.app.Activity); } } diff --git a/firebase-inappmessaging-display/ktx/api.txt b/firebase-inappmessaging-display/ktx/api.txt new file mode 100644 index 00000000000..7566b98cfbb --- /dev/null +++ b/firebase-inappmessaging-display/ktx/api.txt @@ -0,0 +1,10 @@ +// Signature format: 2.0 +package com.google.firebase.inappmessaging.display.ktx { + + public final class InAppMessagingDisplayKt { + ctor public InAppMessagingDisplayKt(); + method @NonNull public static com.google.firebase.inappmessaging.display.FirebaseInAppMessagingDisplay getInAppMessagingDisplay(@NonNull com.google.firebase.ktx.Firebase); + } + +} + diff --git a/firebase-inappmessaging-display/ktx/src/main/kotlin/com/google/firebase/inappmessaging/display/InAppMessagingDisplay.kt b/firebase-inappmessaging-display/ktx/src/main/kotlin/com/google/firebase/inappmessaging/display/ktx/InAppMessagingDisplay.kt similarity index 100% rename from firebase-inappmessaging-display/ktx/src/main/kotlin/com/google/firebase/inappmessaging/display/InAppMessagingDisplay.kt rename to firebase-inappmessaging-display/ktx/src/main/kotlin/com/google/firebase/inappmessaging/display/ktx/InAppMessagingDisplay.kt diff --git a/firebase-inappmessaging/api.txt b/firebase-inappmessaging/api.txt index b7e2988aee2..8cca7cb36f6 100644 --- a/firebase-inappmessaging/api.txt +++ b/firebase-inappmessaging/api.txt @@ -2,23 +2,150 @@ package com.google.firebase.inappmessaging { public class FirebaseInAppMessaging { - method public void addClickListener(FirebaseInAppMessagingClickListener); - method public void addClickListener(FirebaseInAppMessagingClickListener, Executor); - method public void addDisplayErrorListener(FirebaseInAppMessagingDisplayErrorListener); - method public void addDisplayErrorListener(FirebaseInAppMessagingDisplayErrorListener, Executor); - method public void addImpressionListener(FirebaseInAppMessagingImpressionListener); - method public void addImpressionListener(FirebaseInAppMessagingImpressionListener, Executor); - method public boolean areMessagesSuppressed(); - method public void displayMessage(InAppMessage, FirebaseInAppMessagingDisplayCallbacks); - method public boolean isAutomaticDataCollectionEnabled(); - method public static com.google.firebase.inappmessaging.FirebaseInAppMessaging getInstance(); - method public void removeClickListener(FirebaseInAppMessagingClickListener); - method public void removeDisplayErrorListener(FirebaseInAppMessagingDisplayErrorListener); - method public void removeImpressionListener(FirebaseInAppMessagingImpressionListener); - method public void setAutomaticDataCollectionEnabled(boolean); - method public void setMessageDisplayComponent(com.google.firebase.inappmessaging.display.FirebaseInAppMessagingDisplay) - method public void setMessagesSuppressed(Boolean); - method public void triggerEvent(String); - } - -} \ No newline at end of file + method public void addClickListener(@NonNull com.google.firebase.inappmessaging.FirebaseInAppMessagingClickListener); + method public void addClickListener(@NonNull com.google.firebase.inappmessaging.FirebaseInAppMessagingClickListener, @NonNull java.util.concurrent.Executor); + method public void addDisplayErrorListener(@NonNull com.google.firebase.inappmessaging.FirebaseInAppMessagingDisplayErrorListener); + method public void addDisplayErrorListener(@NonNull com.google.firebase.inappmessaging.FirebaseInAppMessagingDisplayErrorListener, @NonNull java.util.concurrent.Executor); + method public void addImpressionListener(@NonNull com.google.firebase.inappmessaging.FirebaseInAppMessagingImpressionListener); + method public void addImpressionListener(@NonNull com.google.firebase.inappmessaging.FirebaseInAppMessagingImpressionListener, @NonNull java.util.concurrent.Executor); + method @Keep public boolean areMessagesSuppressed(); + method @NonNull @Keep public static com.google.firebase.inappmessaging.FirebaseInAppMessaging getInstance(); + method @Keep public boolean isAutomaticDataCollectionEnabled(); + method public void removeClickListener(@NonNull com.google.firebase.inappmessaging.FirebaseInAppMessagingClickListener); + method public void removeDisplayErrorListener(@NonNull com.google.firebase.inappmessaging.FirebaseInAppMessagingDisplayErrorListener); + method public void removeImpressionListener(@NonNull com.google.firebase.inappmessaging.FirebaseInAppMessagingImpressionListener); + method @Keep public void setAutomaticDataCollectionEnabled(boolean); + method @Keep public void setMessageDisplayComponent(@NonNull com.google.firebase.inappmessaging.FirebaseInAppMessagingDisplay); + method @Keep public void setMessagesSuppressed(@NonNull Boolean); + } + + public interface FirebaseInAppMessagingClickListener { + method public void messageClicked(@NonNull com.google.firebase.inappmessaging.model.InAppMessage, @NonNull com.google.firebase.inappmessaging.model.Action); + } + + public class FirebaseInAppMessagingContextualTrigger { + ctor public FirebaseInAppMessagingContextualTrigger(@NonNull String); + method @NonNull public String getTriggerName(); + } + + @Keep public interface FirebaseInAppMessagingDisplay { + method @Keep public void displayMessage(@NonNull com.google.firebase.inappmessaging.model.InAppMessage, @NonNull com.google.firebase.inappmessaging.FirebaseInAppMessagingDisplayCallbacks); + } + + public interface FirebaseInAppMessagingDisplayCallbacks { + method @NonNull public com.google.android.gms.tasks.Task displayErrorEncountered(@NonNull com.google.firebase.inappmessaging.FirebaseInAppMessagingDisplayCallbacks.InAppMessagingErrorReason); + method @NonNull public com.google.android.gms.tasks.Task impressionDetected(); + method @Deprecated @NonNull public com.google.android.gms.tasks.Task messageClicked(@NonNull com.google.firebase.inappmessaging.model.Action); + method @NonNull public com.google.android.gms.tasks.Task messageDismissed(@NonNull com.google.firebase.inappmessaging.FirebaseInAppMessagingDisplayCallbacks.InAppMessagingDismissType); + } + + public enum FirebaseInAppMessagingDisplayCallbacks.InAppMessagingDismissType { + enum_constant public static final com.google.firebase.inappmessaging.FirebaseInAppMessagingDisplayCallbacks.InAppMessagingDismissType AUTO; + enum_constant public static final com.google.firebase.inappmessaging.FirebaseInAppMessagingDisplayCallbacks.InAppMessagingDismissType CLICK; + enum_constant public static final com.google.firebase.inappmessaging.FirebaseInAppMessagingDisplayCallbacks.InAppMessagingDismissType SWIPE; + enum_constant public static final com.google.firebase.inappmessaging.FirebaseInAppMessagingDisplayCallbacks.InAppMessagingDismissType UNKNOWN_DISMISS_TYPE; + } + + public enum FirebaseInAppMessagingDisplayCallbacks.InAppMessagingErrorReason { + enum_constant public static final com.google.firebase.inappmessaging.FirebaseInAppMessagingDisplayCallbacks.InAppMessagingErrorReason IMAGE_DISPLAY_ERROR; + enum_constant public static final com.google.firebase.inappmessaging.FirebaseInAppMessagingDisplayCallbacks.InAppMessagingErrorReason IMAGE_FETCH_ERROR; + enum_constant public static final com.google.firebase.inappmessaging.FirebaseInAppMessagingDisplayCallbacks.InAppMessagingErrorReason IMAGE_UNSUPPORTED_FORMAT; + enum_constant public static final com.google.firebase.inappmessaging.FirebaseInAppMessagingDisplayCallbacks.InAppMessagingErrorReason UNSPECIFIED_RENDER_ERROR; + } + + public interface FirebaseInAppMessagingDisplayErrorListener { + method public void displayErrorEncountered(@NonNull com.google.firebase.inappmessaging.model.InAppMessage, @NonNull com.google.firebase.inappmessaging.FirebaseInAppMessagingDisplayCallbacks.InAppMessagingErrorReason); + } + + public interface FirebaseInAppMessagingImpressionListener { + method public void impressionDetected(@NonNull com.google.firebase.inappmessaging.model.InAppMessage); + } + +} + +package com.google.firebase.inappmessaging.model { + + public class Action { + method @Nullable public String getActionUrl(); + method @Nullable public com.google.firebase.inappmessaging.model.Button getButton(); + } + + public class BannerMessage extends com.google.firebase.inappmessaging.model.InAppMessage { + method @Nullable public com.google.firebase.inappmessaging.model.Action getAction(); + method @NonNull public String getBackgroundHexColor(); + method @Nullable public com.google.firebase.inappmessaging.model.Text getBody(); + method @Nullable public com.google.firebase.inappmessaging.model.ImageData getImageData(); + method @NonNull public com.google.firebase.inappmessaging.model.Text getTitle(); + } + + public class Button { + method @NonNull public String getButtonHexColor(); + method @NonNull public com.google.firebase.inappmessaging.model.Text getText(); + } + + public class CampaignMetadata { + method @NonNull public String getCampaignId(); + method @NonNull public String getCampaignName(); + method public boolean getIsTestMessage(); + } + + public class CardMessage extends com.google.firebase.inappmessaging.model.InAppMessage { + method @Deprecated @Nullable public com.google.firebase.inappmessaging.model.Action getAction(); + method @NonNull public String getBackgroundHexColor(); + method @Nullable public com.google.firebase.inappmessaging.model.Text getBody(); + method @Nullable public com.google.firebase.inappmessaging.model.ImageData getLandscapeImageData(); + method @Nullable public com.google.firebase.inappmessaging.model.ImageData getPortraitImageData(); + method @NonNull public com.google.firebase.inappmessaging.model.Action getPrimaryAction(); + method @Nullable public com.google.firebase.inappmessaging.model.Action getSecondaryAction(); + method @NonNull public com.google.firebase.inappmessaging.model.Text getTitle(); + } + + public class ImageData { + method @Nullable public android.graphics.Bitmap getBitmapData(); + method @NonNull public String getImageUrl(); + } + + public class ImageOnlyMessage extends com.google.firebase.inappmessaging.model.InAppMessage { + method @Nullable public com.google.firebase.inappmessaging.model.Action getAction(); + method @NonNull public com.google.firebase.inappmessaging.model.ImageData getImageData(); + } + + public abstract class InAppMessage { + method @Deprecated @Nullable public abstract com.google.firebase.inappmessaging.model.Action getAction(); + method @Deprecated @Nullable public com.google.firebase.inappmessaging.model.Button getActionButton(); + method @Deprecated @Nullable public String getBackgroundHexColor(); + method @Deprecated @Nullable public com.google.firebase.inappmessaging.model.Text getBody(); + method @Deprecated @Nullable public String getCampaignId(); + method @Nullable public com.google.firebase.inappmessaging.model.CampaignMetadata getCampaignMetadata(); + method @Deprecated @Nullable public String getCampaignName(); + method @Nullable public java.util.Map getData(); + method @Deprecated @Nullable public com.google.firebase.inappmessaging.model.ImageData getImageData(); + method @Deprecated @Nullable public String getImageUrl(); + method @Deprecated @Nullable public Boolean getIsTestMessage(); + method @Nullable public com.google.firebase.inappmessaging.model.MessageType getMessageType(); + method @Deprecated @Nullable public com.google.firebase.inappmessaging.model.Text getTitle(); + } + + @Keep public enum MessageType { + enum_constant @Keep public static final com.google.firebase.inappmessaging.model.MessageType BANNER; + enum_constant @Keep public static final com.google.firebase.inappmessaging.model.MessageType CARD; + enum_constant @Keep public static final com.google.firebase.inappmessaging.model.MessageType IMAGE_ONLY; + enum_constant @Keep public static final com.google.firebase.inappmessaging.model.MessageType MODAL; + enum_constant @Keep public static final com.google.firebase.inappmessaging.model.MessageType UNSUPPORTED; + } + + public class ModalMessage extends com.google.firebase.inappmessaging.model.InAppMessage { + method @Nullable public com.google.firebase.inappmessaging.model.Action getAction(); + method @NonNull public String getBackgroundHexColor(); + method @Nullable public com.google.firebase.inappmessaging.model.Text getBody(); + method @Nullable public com.google.firebase.inappmessaging.model.ImageData getImageData(); + method @NonNull public com.google.firebase.inappmessaging.model.Text getTitle(); + } + + public class Text { + method @NonNull public String getHexColor(); + method @Nullable public String getText(); + } + +} + diff --git a/firebase-inappmessaging/ktx/api.txt b/firebase-inappmessaging/ktx/api.txt new file mode 100644 index 00000000000..1c04bf758ca --- /dev/null +++ b/firebase-inappmessaging/ktx/api.txt @@ -0,0 +1,10 @@ +// Signature format: 2.0 +package com.google.firebase.inappmessaging.ktx { + + public final class InAppMessagingKt { + ctor public InAppMessagingKt(); + method @NonNull public static com.google.firebase.inappmessaging.FirebaseInAppMessaging getInAppMessaging(@NonNull com.google.firebase.ktx.Firebase); + } + +} + diff --git a/firebase-storage/api.txt b/firebase-storage/api.txt index 48292e2af71..ab7104eb132 100644 --- a/firebase-storage/api.txt +++ b/firebase-storage/api.txt @@ -1,21 +1,20 @@ // Signature format: 2.0 package com.google.firebase.storage { - public abstract class CancellableTask { + public abstract class CancellableTask extends com.google.android.gms.tasks.Task { ctor public CancellableTask(); method @NonNull public abstract com.google.firebase.storage.CancellableTask addOnProgressListener(@NonNull com.google.firebase.storage.OnProgressListener); - method @NonNull public abstract com.google.firebase.storage.CancellableTask addOnProgressListener(@NonNull Executor, @NonNull com.google.firebase.storage.OnProgressListener); - method @NonNull public abstract com.google.firebase.storage.CancellableTask addOnProgressListener(@NonNull Activity, @NonNull com.google.firebase.storage.OnProgressListener); + method @NonNull public abstract com.google.firebase.storage.CancellableTask addOnProgressListener(@NonNull java.util.concurrent.Executor, @NonNull com.google.firebase.storage.OnProgressListener); + method @NonNull public abstract com.google.firebase.storage.CancellableTask addOnProgressListener(@NonNull android.app.Activity, @NonNull com.google.firebase.storage.OnProgressListener); method public abstract boolean cancel(); - method public abstract boolean isCanceled(); method public abstract boolean isInProgress(); } public abstract class ControllableTask extends com.google.firebase.storage.CancellableTask { ctor public ControllableTask(); method @NonNull public abstract com.google.firebase.storage.ControllableTask addOnPausedListener(@NonNull com.google.firebase.storage.OnPausedListener); - method @NonNull public abstract com.google.firebase.storage.ControllableTask addOnPausedListener(@NonNull Executor, @NonNull com.google.firebase.storage.OnPausedListener); - method @NonNull public abstract com.google.firebase.storage.ControllableTask addOnPausedListener(@NonNull Activity, @NonNull com.google.firebase.storage.OnPausedListener); + method @NonNull public abstract com.google.firebase.storage.ControllableTask addOnPausedListener(@NonNull java.util.concurrent.Executor, @NonNull com.google.firebase.storage.OnPausedListener); + method @NonNull public abstract com.google.firebase.storage.ControllableTask addOnPausedListener(@NonNull android.app.Activity, @NonNull com.google.firebase.storage.OnPausedListener); method public abstract boolean isPaused(); method public abstract boolean pause(); method public abstract boolean resume(); @@ -30,11 +29,11 @@ package com.google.firebase.storage { } public class FirebaseStorage { - method @NonNull public FirebaseApp getApp(); + method @NonNull public com.google.firebase.FirebaseApp getApp(); method @NonNull public static com.google.firebase.storage.FirebaseStorage getInstance(); method @NonNull public static com.google.firebase.storage.FirebaseStorage getInstance(@NonNull String); - method @NonNull public static com.google.firebase.storage.FirebaseStorage getInstance(@NonNull FirebaseApp); - method @NonNull public static com.google.firebase.storage.FirebaseStorage getInstance(@NonNull FirebaseApp, @NonNull String); + method @NonNull public static com.google.firebase.storage.FirebaseStorage getInstance(@NonNull com.google.firebase.FirebaseApp); + method @NonNull public static com.google.firebase.storage.FirebaseStorage getInstance(@NonNull com.google.firebase.FirebaseApp, @NonNull String); method public long getMaxDownloadRetryTimeMillis(); method public long getMaxOperationRetryTimeMillis(); method public long getMaxUploadRetryTimeMillis(); @@ -47,9 +46,9 @@ package com.google.firebase.storage { } public final class ListResult { - method @NonNull public List getItems(); + method @NonNull public java.util.List getItems(); method @Nullable public String getPageToken(); - method @NonNull public List getPrefixes(); + method @NonNull public java.util.List getPrefixes(); } public interface OnPausedListener { @@ -60,11 +59,10 @@ package com.google.firebase.storage { method public void onProgress(@NonNull ProgressT); } - public class StorageException { - method @NonNull public static com.google.firebase.storage.StorageException fromErrorStatus(@NonNull Status); + public class StorageException extends com.google.firebase.FirebaseException { + method @NonNull public static com.google.firebase.storage.StorageException fromErrorStatus(@NonNull com.google.android.gms.common.api.Status); method @NonNull public static com.google.firebase.storage.StorageException fromException(@NonNull Throwable); method @Nullable public static com.google.firebase.storage.StorageException fromExceptionAndHttpCode(@Nullable Throwable, int); - method @Nullable public Throwable getCause(); method @com.google.firebase.storage.StorageException.ErrorCode public int getErrorCode(); method public int getHttpResultCode(); method public boolean getIsRecoverableException(); @@ -80,7 +78,7 @@ package com.google.firebase.storage { field public static final int ERROR_UNKNOWN = -13000; // 0xffffcd38 } - @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) public static @interface StorageException.ErrorCode { + @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) @IntDef({com.google.firebase.storage.StorageException.ERROR_UNKNOWN, com.google.firebase.storage.StorageException.ERROR_OBJECT_NOT_FOUND, com.google.firebase.storage.StorageException.ERROR_BUCKET_NOT_FOUND, com.google.firebase.storage.StorageException.ERROR_PROJECT_NOT_FOUND, com.google.firebase.storage.StorageException.ERROR_QUOTA_EXCEEDED, com.google.firebase.storage.StorageException.ERROR_NOT_AUTHENTICATED, com.google.firebase.storage.StorageException.ERROR_NOT_AUTHORIZED, com.google.firebase.storage.StorageException.ERROR_RETRY_LIMIT_EXCEEDED, com.google.firebase.storage.StorageException.ERROR_INVALID_CHECKSUM, com.google.firebase.storage.StorageException.ERROR_CANCELED}) public static @interface StorageException.ErrorCode { } public class StorageMetadata { @@ -93,7 +91,7 @@ package com.google.firebase.storage { method @Nullable public String getContentType(); method public long getCreationTimeMillis(); method @Nullable public String getCustomMetadata(@NonNull String); - method @NonNull public Set getCustomMetadataKeys(); + method @NonNull public java.util.Set getCustomMetadataKeys(); method @Nullable public String getGeneration(); method @Nullable public String getMd5Hash(); method @Nullable public String getMetadataGeneration(); @@ -121,19 +119,18 @@ package com.google.firebase.storage { method @NonNull public com.google.firebase.storage.StorageMetadata.Builder setCustomMetadata(@NonNull String, @Nullable String); } - public class StorageReference { + public class StorageReference implements java.lang.Comparable { method @NonNull public com.google.firebase.storage.StorageReference child(@NonNull String); method public int compareTo(@NonNull com.google.firebase.storage.StorageReference); - method @NonNull public Task delete(); - method public boolean equals(Object); - method @NonNull public List getActiveDownloadTasks(); - method @NonNull public List getActiveUploadTasks(); + method @NonNull public com.google.android.gms.tasks.Task delete(); + method @NonNull public java.util.List getActiveDownloadTasks(); + method @NonNull public java.util.List getActiveUploadTasks(); method @NonNull public String getBucket(); - method @NonNull public Task getBytes(long); - method @NonNull public Task getDownloadUrl(); - method @NonNull public com.google.firebase.storage.FileDownloadTask getFile(@NonNull Uri); - method @NonNull public com.google.firebase.storage.FileDownloadTask getFile(@NonNull File); - method @NonNull public Task getMetadata(); + method @NonNull public com.google.android.gms.tasks.Task getBytes(long); + method @NonNull public com.google.android.gms.tasks.Task getDownloadUrl(); + method @NonNull public com.google.firebase.storage.FileDownloadTask getFile(@NonNull android.net.Uri); + method @NonNull public com.google.firebase.storage.FileDownloadTask getFile(@NonNull java.io.File); + method @NonNull public com.google.android.gms.tasks.Task getMetadata(); method @NonNull public String getName(); method @Nullable public com.google.firebase.storage.StorageReference getParent(); method @NonNull public String getPath(); @@ -141,49 +138,47 @@ package com.google.firebase.storage { method @NonNull public com.google.firebase.storage.FirebaseStorage getStorage(); method @NonNull public com.google.firebase.storage.StreamDownloadTask getStream(); method @NonNull public com.google.firebase.storage.StreamDownloadTask getStream(@NonNull com.google.firebase.storage.StreamDownloadTask.StreamProcessor); - method public int hashCode(); - method @NonNull public Task list(int); - method @NonNull public Task list(int, @NonNull String); - method @NonNull public Task listAll(); + method @NonNull public com.google.android.gms.tasks.Task list(int); + method @NonNull public com.google.android.gms.tasks.Task list(int, @NonNull String); + method @NonNull public com.google.android.gms.tasks.Task listAll(); method @NonNull public com.google.firebase.storage.UploadTask putBytes(@NonNull byte[]); method @NonNull public com.google.firebase.storage.UploadTask putBytes(@NonNull byte[], @NonNull com.google.firebase.storage.StorageMetadata); - method @NonNull public com.google.firebase.storage.UploadTask putFile(@NonNull Uri); - method @NonNull public com.google.firebase.storage.UploadTask putFile(@NonNull Uri, @NonNull com.google.firebase.storage.StorageMetadata); - method @NonNull public com.google.firebase.storage.UploadTask putFile(@NonNull Uri, @Nullable com.google.firebase.storage.StorageMetadata, @Nullable Uri); - method @NonNull public com.google.firebase.storage.UploadTask putStream(@NonNull InputStream); - method @NonNull public com.google.firebase.storage.UploadTask putStream(@NonNull InputStream, @NonNull com.google.firebase.storage.StorageMetadata); - method public String toString(); - method @NonNull public Task updateMetadata(@NonNull com.google.firebase.storage.StorageMetadata); + method @NonNull public com.google.firebase.storage.UploadTask putFile(@NonNull android.net.Uri); + method @NonNull public com.google.firebase.storage.UploadTask putFile(@NonNull android.net.Uri, @NonNull com.google.firebase.storage.StorageMetadata); + method @NonNull public com.google.firebase.storage.UploadTask putFile(@NonNull android.net.Uri, @Nullable com.google.firebase.storage.StorageMetadata, @Nullable android.net.Uri); + method @NonNull public com.google.firebase.storage.UploadTask putStream(@NonNull java.io.InputStream); + method @NonNull public com.google.firebase.storage.UploadTask putStream(@NonNull java.io.InputStream, @NonNull com.google.firebase.storage.StorageMetadata); + method @NonNull public com.google.android.gms.tasks.Task updateMetadata(@NonNull com.google.firebase.storage.StorageMetadata); } public abstract class StorageTask extends com.google.firebase.storage.ControllableTask { ctor protected StorageTask(); - method @NonNull public com.google.firebase.storage.StorageTask addOnCanceledListener(@NonNull OnCanceledListener); - method @NonNull public com.google.firebase.storage.StorageTask addOnCanceledListener(@NonNull Executor, @NonNull OnCanceledListener); - method @NonNull public com.google.firebase.storage.StorageTask addOnCanceledListener(@NonNull Activity, @NonNull OnCanceledListener); - method @NonNull public com.google.firebase.storage.StorageTask addOnCompleteListener(@NonNull OnCompleteListener); - method @NonNull public com.google.firebase.storage.StorageTask addOnCompleteListener(@NonNull Executor, @NonNull OnCompleteListener); - method @NonNull public com.google.firebase.storage.StorageTask addOnCompleteListener(@NonNull Activity, @NonNull OnCompleteListener); - method @NonNull public com.google.firebase.storage.StorageTask addOnFailureListener(@NonNull OnFailureListener); - method @NonNull public com.google.firebase.storage.StorageTask addOnFailureListener(@NonNull Executor, @NonNull OnFailureListener); - method @NonNull public com.google.firebase.storage.StorageTask addOnFailureListener(@NonNull Activity, @NonNull OnFailureListener); + method @NonNull public com.google.firebase.storage.StorageTask addOnCanceledListener(@NonNull com.google.android.gms.tasks.OnCanceledListener); + method @NonNull public com.google.firebase.storage.StorageTask addOnCanceledListener(@NonNull java.util.concurrent.Executor, @NonNull com.google.android.gms.tasks.OnCanceledListener); + method @NonNull public com.google.firebase.storage.StorageTask addOnCanceledListener(@NonNull android.app.Activity, @NonNull com.google.android.gms.tasks.OnCanceledListener); + method @NonNull public com.google.firebase.storage.StorageTask addOnCompleteListener(@NonNull com.google.android.gms.tasks.OnCompleteListener); + method @NonNull public com.google.firebase.storage.StorageTask addOnCompleteListener(@NonNull java.util.concurrent.Executor, @NonNull com.google.android.gms.tasks.OnCompleteListener); + method @NonNull public com.google.firebase.storage.StorageTask addOnCompleteListener(@NonNull android.app.Activity, @NonNull com.google.android.gms.tasks.OnCompleteListener); + method @NonNull public com.google.firebase.storage.StorageTask addOnFailureListener(@NonNull com.google.android.gms.tasks.OnFailureListener); + method @NonNull public com.google.firebase.storage.StorageTask addOnFailureListener(@NonNull java.util.concurrent.Executor, @NonNull com.google.android.gms.tasks.OnFailureListener); + method @NonNull public com.google.firebase.storage.StorageTask addOnFailureListener(@NonNull android.app.Activity, @NonNull com.google.android.gms.tasks.OnFailureListener); method @NonNull public com.google.firebase.storage.StorageTask addOnPausedListener(@NonNull com.google.firebase.storage.OnPausedListener); - method @NonNull public com.google.firebase.storage.StorageTask addOnPausedListener(@NonNull Executor, @NonNull com.google.firebase.storage.OnPausedListener); - method @NonNull public com.google.firebase.storage.StorageTask addOnPausedListener(@NonNull Activity, @NonNull com.google.firebase.storage.OnPausedListener); + method @NonNull public com.google.firebase.storage.StorageTask addOnPausedListener(@NonNull java.util.concurrent.Executor, @NonNull com.google.firebase.storage.OnPausedListener); + method @NonNull public com.google.firebase.storage.StorageTask addOnPausedListener(@NonNull android.app.Activity, @NonNull com.google.firebase.storage.OnPausedListener); method @NonNull public com.google.firebase.storage.StorageTask addOnProgressListener(@NonNull com.google.firebase.storage.OnProgressListener); - method @NonNull public com.google.firebase.storage.StorageTask addOnProgressListener(@NonNull Executor, @NonNull com.google.firebase.storage.OnProgressListener); - method @NonNull public com.google.firebase.storage.StorageTask addOnProgressListener(@NonNull Activity, @NonNull com.google.firebase.storage.OnProgressListener); - method @NonNull public com.google.firebase.storage.StorageTask addOnSuccessListener(@NonNull OnSuccessListener); - method @NonNull public com.google.firebase.storage.StorageTask addOnSuccessListener(@NonNull Executor, @NonNull OnSuccessListener); - method @NonNull public com.google.firebase.storage.StorageTask addOnSuccessListener(@NonNull Activity, @NonNull OnSuccessListener); + method @NonNull public com.google.firebase.storage.StorageTask addOnProgressListener(@NonNull java.util.concurrent.Executor, @NonNull com.google.firebase.storage.OnProgressListener); + method @NonNull public com.google.firebase.storage.StorageTask addOnProgressListener(@NonNull android.app.Activity, @NonNull com.google.firebase.storage.OnProgressListener); + method @NonNull public com.google.firebase.storage.StorageTask addOnSuccessListener(@NonNull com.google.android.gms.tasks.OnSuccessListener); + method @NonNull public com.google.firebase.storage.StorageTask addOnSuccessListener(@NonNull java.util.concurrent.Executor, @NonNull com.google.android.gms.tasks.OnSuccessListener); + method @NonNull public com.google.firebase.storage.StorageTask addOnSuccessListener(@NonNull android.app.Activity, @NonNull com.google.android.gms.tasks.OnSuccessListener); method public boolean cancel(); - method @NonNull public Task continueWith(@NonNull Continuation); - method @NonNull public Task continueWith(@NonNull Executor, @NonNull Continuation); - method @NonNull public Task continueWithTask(@NonNull Continuation>); - method @NonNull public Task continueWithTask(@NonNull Executor, @NonNull Continuation>); + method @NonNull public com.google.android.gms.tasks.Task continueWith(@NonNull com.google.android.gms.tasks.Continuation); + method @NonNull public com.google.android.gms.tasks.Task continueWith(@NonNull java.util.concurrent.Executor, @NonNull com.google.android.gms.tasks.Continuation); + method @NonNull public com.google.android.gms.tasks.Task continueWithTask(@NonNull com.google.android.gms.tasks.Continuation>); + method @NonNull public com.google.android.gms.tasks.Task continueWithTask(@NonNull java.util.concurrent.Executor, @NonNull com.google.android.gms.tasks.Continuation>); method @Nullable public Exception getException(); method @NonNull public ResultT getResult(); - method @NonNull public ResultT getResult(@NonNull Class) throws X; + method @NonNull public ResultT getResult(@NonNull Class) throws X; method @NonNull public ResultT getSnapshot(); method public boolean isCanceled(); method public boolean isComplete(); @@ -196,15 +191,15 @@ package com.google.firebase.storage { method protected void onProgress(); method protected void onQueued(); method protected void onSuccess(); - method @NonNull public Task onSuccessTask(@NonNull SuccessContinuation); - method @NonNull public Task onSuccessTask(@NonNull Executor, @NonNull SuccessContinuation); + method @NonNull public com.google.android.gms.tasks.Task onSuccessTask(@NonNull com.google.android.gms.tasks.SuccessContinuation); + method @NonNull public com.google.android.gms.tasks.Task onSuccessTask(@NonNull java.util.concurrent.Executor, @NonNull com.google.android.gms.tasks.SuccessContinuation); method public boolean pause(); - method @NonNull public com.google.firebase.storage.StorageTask removeOnCanceledListener(@NonNull OnCanceledListener); - method @NonNull public com.google.firebase.storage.StorageTask removeOnCompleteListener(@NonNull OnCompleteListener); - method @NonNull public com.google.firebase.storage.StorageTask removeOnFailureListener(@NonNull OnFailureListener); + method @NonNull public com.google.firebase.storage.StorageTask removeOnCanceledListener(@NonNull com.google.android.gms.tasks.OnCanceledListener); + method @NonNull public com.google.firebase.storage.StorageTask removeOnCompleteListener(@NonNull com.google.android.gms.tasks.OnCompleteListener); + method @NonNull public com.google.firebase.storage.StorageTask removeOnFailureListener(@NonNull com.google.android.gms.tasks.OnFailureListener); method @NonNull public com.google.firebase.storage.StorageTask removeOnPausedListener(@NonNull com.google.firebase.storage.OnPausedListener); method @NonNull public com.google.firebase.storage.StorageTask removeOnProgressListener(@NonNull com.google.firebase.storage.OnProgressListener); - method @NonNull public com.google.firebase.storage.StorageTask removeOnSuccessListener(@NonNull OnSuccessListener); + method @NonNull public com.google.firebase.storage.StorageTask removeOnSuccessListener(@NonNull com.google.android.gms.tasks.OnSuccessListener); method public boolean resume(); field protected final Object syncObject; } @@ -224,12 +219,12 @@ package com.google.firebase.storage { } public static interface StreamDownloadTask.StreamProcessor { - method public void doInBackground(@NonNull com.google.firebase.storage.StreamDownloadTask.TaskSnapshot, @NonNull InputStream); + method public void doInBackground(@NonNull com.google.firebase.storage.StreamDownloadTask.TaskSnapshot, @NonNull java.io.InputStream) throws java.io.IOException; } public class StreamDownloadTask.TaskSnapshot extends com.google.firebase.storage.StorageTask.SnapshotBase { method public long getBytesTransferred(); - method @NonNull public InputStream getStream(); + method @NonNull public java.io.InputStream getStream(); method public long getTotalByteCount(); } @@ -242,7 +237,7 @@ package com.google.firebase.storage { method public long getBytesTransferred(); method @Nullable public com.google.firebase.storage.StorageMetadata getMetadata(); method public long getTotalByteCount(); - method @Nullable public Uri getUploadSessionUri(); + method @Nullable public android.net.Uri getUploadSessionUri(); } } diff --git a/firebase-storage/ktx/api.txt b/firebase-storage/ktx/api.txt new file mode 100644 index 00000000000..c58bbe20375 --- /dev/null +++ b/firebase-storage/ktx/api.txt @@ -0,0 +1,14 @@ +// Signature format: 2.0 +package com.google.firebase.storage.ktx { + + public final class StorageKt { + ctor public StorageKt(); + method @NonNull public static com.google.firebase.storage.FirebaseStorage getStorage(@NonNull com.google.firebase.ktx.Firebase); + method @NonNull public static com.google.firebase.storage.FirebaseStorage storage(@NonNull com.google.firebase.ktx.Firebase, @NonNull String url); + method @NonNull public static com.google.firebase.storage.FirebaseStorage storage(@NonNull com.google.firebase.ktx.Firebase, @NonNull com.google.firebase.FirebaseApp app); + method @NonNull public static com.google.firebase.storage.FirebaseStorage storage(@NonNull com.google.firebase.ktx.Firebase, @NonNull com.google.firebase.FirebaseApp app, @NonNull String url); + method @NonNull public static com.google.firebase.storage.StorageMetadata storageMetadata(@NonNull kotlin.jvm.functions.Function1 init); + } + +} +