Skip to content

Commit 4818313

Browse files
rachaprincepull[bot]
authored andcommitted
Remove support for multiple sdk instances in Firebase App Distribution (#3252)
* Remove support for multiple apps in Firebase App Distribution * fix failing test
1 parent 203d7c0 commit 4818313

File tree

5 files changed

+1
-26
lines changed

5 files changed

+1
-26
lines changed

firebase-app-distribution/api.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ package com.google.firebase.app.distribution {
1717
public class FirebaseAppDistribution {
1818
method @NonNull public com.google.android.gms.tasks.Task<com.google.firebase.app.distribution.AppDistributionRelease> checkForNewRelease();
1919
method @NonNull public static com.google.firebase.app.distribution.FirebaseAppDistribution getInstance();
20-
method @NonNull public static com.google.firebase.app.distribution.FirebaseAppDistribution getInstance(@NonNull com.google.firebase.FirebaseApp);
2120
method public boolean isTesterSignedIn();
2221
method @NonNull public com.google.android.gms.tasks.Task<java.lang.Void> signInTester();
2322
method public void signOutTester();

firebase-app-distribution/ktx/api.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package com.google.firebase.app.distribution.ktx {
33

44
public final class FirebaseAppDistributionKt {
55
ctor public FirebaseAppDistributionKt();
6-
method @NonNull public static com.google.firebase.app.distribution.FirebaseAppDistribution appDistribution(@NonNull com.google.firebase.ktx.Firebase, @NonNull com.google.firebase.FirebaseApp app);
76
method @NonNull public static com.google.firebase.app.distribution.FirebaseAppDistribution getAppDistribution(@NonNull com.google.firebase.ktx.Firebase);
87
}
98

firebase-app-distribution/ktx/src/androidTest/kotlin/com/google/firebase/app/distribution/ktx/FirebaseAppDistributionTests.kt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,6 @@ class FirebaseAppDistributionTests : BaseTestCase() {
7070
fun appDistribution_default_callsDefaultGetInstance() {
7171
Truth.assertThat(Firebase.appDistribution).isSameInstanceAs(FirebaseAppDistribution.getInstance())
7272
}
73-
74-
@Test
75-
fun appDistribution_withFirebaseApp_callsGetInstanceWithApp() {
76-
val app = Firebase.app(EXISTING_APP)
77-
Truth.assertThat(Firebase.appDistribution(app)).isSameInstanceAs(FirebaseAppDistribution.getInstance(app))
78-
}
7973
}
8074

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

firebase-app-distribution/ktx/src/main/kotlin/com/google/firebase/app/distribution/ktx/FirebaseAppDistribution.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@ import com.google.firebase.platforminfo.LibraryVersionComponent
2727
val Firebase.appDistribution: FirebaseAppDistribution
2828
get() = FirebaseAppDistribution.getInstance()
2929

30-
/** Returns the [FirebaseAppDistribution] instance of a given [FirebaseApp]. */
31-
fun Firebase.appDistribution(app: FirebaseApp): FirebaseAppDistribution =
32-
FirebaseAppDistribution.getInstance(app)
33-
3430
internal const val LIBRARY_NAME: String = "fire-app-distribution-ktx"
3531

3632
/** @suppress */

firebase-app-distribution/src/main/java/com/google/firebase/app/distribution/FirebaseAppDistribution.java

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import androidx.annotation.NonNull;
2727
import androidx.annotation.Nullable;
2828
import androidx.annotation.VisibleForTesting;
29-
import com.google.android.gms.common.internal.Preconditions;
3029
import com.google.android.gms.tasks.Task;
3130
import com.google.android.gms.tasks.Tasks;
3231
import com.google.firebase.FirebaseApp;
@@ -113,19 +112,7 @@ firebaseApp, new FirebaseAppDistributionTesterApiClient(), firebaseInstallations
113112
/** @return a FirebaseAppDistribution instance */
114113
@NonNull
115114
public static FirebaseAppDistribution getInstance() {
116-
return getInstance(FirebaseApp.getInstance());
117-
}
118-
119-
/**
120-
* Returns the {@link FirebaseAppDistribution} initialized with a custom {@link FirebaseApp}.
121-
*
122-
* @param app a custom {@link FirebaseApp}
123-
* @return a {@link FirebaseAppDistribution} instance
124-
*/
125-
@NonNull
126-
public static FirebaseAppDistribution getInstance(@NonNull FirebaseApp app) {
127-
Preconditions.checkArgument(app != null, "Null is not a valid value of FirebaseApp.");
128-
return app.get(FirebaseAppDistribution.class);
115+
return FirebaseApp.getInstance().get(FirebaseAppDistribution.class);
129116
}
130117

131118
/**

0 commit comments

Comments
 (0)