Skip to content

Remove support for multiple sdk instances in Firebase App Distribution #3252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 20, 2021
Merged

Remove support for multiple sdk instances in Firebase App Distribution #3252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c99a2f
Remove support for multiple apps in Firebase App Distribution
Dec 20, 2021
e5dc742
fix failing test
Dec 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion firebase-app-distribution/api.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ package com.google.firebase.app.distribution {
public class FirebaseAppDistribution {
method @NonNull public com.google.android.gms.tasks.Task<com.google.firebase.app.distribution.AppDistributionRelease> checkForNewRelease();
method @NonNull public static com.google.firebase.app.distribution.FirebaseAppDistribution getInstance();
method @NonNull public static com.google.firebase.app.distribution.FirebaseAppDistribution getInstance(@NonNull com.google.firebase.FirebaseApp);
method public boolean isTesterSignedIn();
method @NonNull public com.google.android.gms.tasks.Task<java.lang.Void> signInTester();
method public void signOutTester();
Expand Down
1 change: 0 additions & 1 deletion firebase-app-distribution/ktx/api.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package com.google.firebase.app.distribution.ktx {

public final class FirebaseAppDistributionKt {
ctor public FirebaseAppDistributionKt();
method @NonNull public static com.google.firebase.app.distribution.FirebaseAppDistribution appDistribution(@NonNull com.google.firebase.ktx.Firebase, @NonNull com.google.firebase.FirebaseApp app);
method @NonNull public static com.google.firebase.app.distribution.FirebaseAppDistribution getAppDistribution(@NonNull com.google.firebase.ktx.Firebase);
}

Expand Down
6 changes: 0 additions & 6 deletions ...droidTest/kotlin/com/google/firebase/app/distribution/ktx/FirebaseAppDistributionTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,6 @@ class FirebaseAppDistributionTests : BaseTestCase() {
fun appDistribution_default_callsDefaultGetInstance() {
Truth.assertThat(Firebase.appDistribution).isSameInstanceAs(FirebaseAppDistribution.getInstance())
}

@Test
fun appDistribution_withFirebaseApp_callsGetInstanceWithApp() {
val app = Firebase.app(EXISTING_APP)
Truth.assertThat(Firebase.appDistribution(app)).isSameInstanceAs(FirebaseAppDistribution.getInstance(app))
}
}

internal const val LIBRARY_NAME: String = "fire-app-distribution-ktx"
Expand Down
4 changes: 0 additions & 4 deletions ...n/ktx/src/main/kotlin/com/google/firebase/app/distribution/ktx/FirebaseAppDistribution.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,6 @@ import com.google.firebase.platforminfo.LibraryVersionComponent
val Firebase.appDistribution: FirebaseAppDistribution
get() = FirebaseAppDistribution.getInstance()

/** Returns the [FirebaseAppDistribution] instance of a given [FirebaseApp]. */
fun Firebase.appDistribution(app: FirebaseApp): FirebaseAppDistribution =
FirebaseAppDistribution.getInstance(app)

internal const val LIBRARY_NAME: String = "fire-app-distribution-ktx"

/** @suppress */
Expand Down
15 changes: 1 addition & 14 deletions ...tribution/src/main/java/com/google/firebase/app/distribution/FirebaseAppDistribution.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import com.google.android.gms.common.internal.Preconditions;
import com.google.android.gms.tasks.Task;
import com.google.android.gms.tasks.Tasks;
import com.google.firebase.FirebaseApp;
Expand Down Expand Up @@ -113,19 +112,7 @@ firebaseApp, new FirebaseAppDistributionTesterApiClient(), firebaseInstallations
/** @return a FirebaseAppDistribution instance */
@NonNull
public static FirebaseAppDistribution getInstance() {
return getInstance(FirebaseApp.getInstance());
}

/**
* Returns the {@link FirebaseAppDistribution} initialized with a custom {@link FirebaseApp}.
*
* @param app a custom {@link FirebaseApp}
* @return a {@link FirebaseAppDistribution} instance
*/
@NonNull
public static FirebaseAppDistribution getInstance(@NonNull FirebaseApp app) {
Preconditions.checkArgument(app != null, "Null is not a valid value of FirebaseApp.");
return app.get(FirebaseAppDistribution.class);
return FirebaseApp.getInstance().get(FirebaseAppDistribution.class);
}

/**
Expand Down