Skip to content

Commit c293a6e

Browse files
author
rachaprince
authored
Rename package to avoid namespace conflicts with gradle plugin (#3105)
1 parent b3d94a4 commit c293a6e

Some content is hidden

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

41 files changed

+111
-111
lines changed

firebase-app-distribution/src/main/AndroidManifest.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<!-- limitations under the License. -->
1515

1616
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
17-
package="com.google.firebase.appdistribution">
17+
package="com.google.firebase.app.distribution">
1818

1919
<uses-permission android:name="android.permission.INTERNET" />
2020
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
@@ -26,15 +26,15 @@
2626
android:name="com.google.firebase.components.ComponentDiscoveryService"
2727
android:exported="false">
2828
<meta-data
29-
android:name="com.google.firebase.components:com.google.firebase.appdistribution.FirebaseAppDistributionRegistrar"
29+
android:name="com.google.firebase.components:com.google.firebase.app.distribution.FirebaseAppDistributionRegistrar"
3030
android:value="com.google.firebase.components.ComponentRegistrar" />
3131
</service>
3232
<!-- The launch mode for Install Activity is singleTask to ensure that after the unknown sources UI
3333
or the installation flow is complete, the Install Activity does not get recreated which causes loss of state
3434
See here for more info - https://developer.android.com/guide/components/activities/tasks-and-back-stack#ManifestForTasks -->
35-
<activity android:name=".InstallActivity" android:exported="true" android:launchMode="singleTask"/>
35+
<activity android:name="com.google.firebase.app.distribution.InstallActivity" android:exported="true" android:launchMode="singleTask"/>
3636

37-
<activity android:name=".SignInResultActivity" android:exported="true">
37+
<activity android:name="com.google.firebase.app.distribution.SignInResultActivity" android:exported="true">
3838
<intent-filter>
3939
<action android:name="android.intent.action.VIEW"/>
4040
<category android:name="android.intent.category.DEFAULT"/>
@@ -46,7 +46,7 @@
4646
</activity>
4747

4848
<provider
49-
android:name="com.google.firebase.appdistribution.FirebaseAppDistributionFileProvider"
49+
android:name="com.google.firebase.app.distribution.FirebaseAppDistributionFileProvider"
5050
android:authorities="${applicationId}.FirebaseAppDistributionFileProvider"
5151
android:exported="false"
5252
android:grantUriPermissions="true">
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
package com.google.firebase.appdistribution;
15+
package com.google.firebase.app.distribution;
1616

1717
import androidx.annotation.NonNull;
1818
import androidx.annotation.Nullable;
@@ -32,7 +32,7 @@ public abstract class AppDistributionRelease {
3232

3333
@NonNull
3434
public static Builder builder() {
35-
return new AutoValue_AppDistributionRelease.Builder();
35+
return new com.google.firebase.app.distribution.AutoValue_AppDistributionRelease.Builder();
3636
}
3737

3838
/** The short bundle version of this build (example 1.0.0) */

firebase-app-distribution/src/main/java/com/google/firebase/appdistribution/BinaryType.java renamed to firebase-app-distribution/src/main/java/com/google/firebase/app/distribution/BinaryType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
package com.google.firebase.appdistribution;
15+
package com.google.firebase.app.distribution;
1616

1717
/** Enum of Android App Binary types, used in AppDistributionRelease */
1818
public enum BinaryType {
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
package com.google.firebase.appdistribution;
15+
package com.google.firebase.app.distribution;
1616

17-
import static com.google.firebase.appdistribution.internal.ReleaseIdentificationUtils.calculateApkHash;
17+
import static com.google.firebase.app.distribution.internal.ReleaseIdentificationUtils.calculateApkHash;
1818

1919
import android.content.Context;
2020
import android.content.pm.PackageInfo;
@@ -25,8 +25,8 @@
2525
import com.google.android.gms.tasks.Task;
2626
import com.google.android.gms.tasks.Tasks;
2727
import com.google.firebase.FirebaseApp;
28-
import com.google.firebase.appdistribution.internal.AppDistributionReleaseInternal;
29-
import com.google.firebase.appdistribution.internal.ReleaseIdentificationUtils;
28+
import com.google.firebase.app.distribution.internal.AppDistributionReleaseInternal;
29+
import com.google.firebase.app.distribution.internal.ReleaseIdentificationUtils;
3030
import com.google.firebase.installations.FirebaseInstallationsApi;
3131
import com.google.firebase.installations.InstallationTokenResult;
3232
import java.io.File;

firebase-app-distribution/src/main/java/com/google/firebase/appdistribution/Constants.java renamed to firebase-app-distribution/src/main/java/com/google/firebase/app/distribution/Constants.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
package com.google.firebase.appdistribution;
15+
package com.google.firebase.app.distribution;
1616

1717
class Constants {
1818
static class ErrorMessages {
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
package com.google.firebase.appdistribution;
15+
package com.google.firebase.app.distribution;
1616

17-
import static com.google.firebase.appdistribution.FirebaseAppDistributionException.Status.AUTHENTICATION_FAILURE;
18-
import static com.google.firebase.appdistribution.TaskUtils.safeSetTaskException;
19-
import static com.google.firebase.appdistribution.TaskUtils.safeSetTaskResult;
17+
import static com.google.firebase.app.distribution.FirebaseAppDistributionException.Status.AUTHENTICATION_FAILURE;
18+
import static com.google.firebase.app.distribution.TaskUtils.safeSetTaskException;
19+
import static com.google.firebase.app.distribution.TaskUtils.safeSetTaskResult;
2020

2121
import android.app.Activity;
2222
import android.app.AlertDialog;
@@ -28,10 +28,10 @@
2828
import com.google.android.gms.tasks.Task;
2929
import com.google.android.gms.tasks.Tasks;
3030
import com.google.firebase.FirebaseApp;
31-
import com.google.firebase.appdistribution.Constants.ErrorMessages;
32-
import com.google.firebase.appdistribution.FirebaseAppDistributionException.Status;
33-
import com.google.firebase.appdistribution.internal.AppDistributionReleaseInternal;
34-
import com.google.firebase.appdistribution.internal.FirebaseAppDistributionLifecycleNotifier;
31+
import com.google.firebase.app.distribution.Constants.ErrorMessages;
32+
import com.google.firebase.app.distribution.FirebaseAppDistributionException.Status;
33+
import com.google.firebase.app.distribution.internal.AppDistributionReleaseInternal;
34+
import com.google.firebase.app.distribution.internal.FirebaseAppDistributionLifecycleNotifier;
3535
import com.google.firebase.installations.FirebaseInstallationsApi;
3636

3737
public class FirebaseAppDistribution {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
package com.google.firebase.appdistribution;
15+
package com.google.firebase.app.distribution;
1616

1717
import androidx.annotation.NonNull;
1818
import androidx.annotation.Nullable;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
package com.google.firebase.appdistribution;
15+
package com.google.firebase.app.distribution;
1616

1717
import androidx.core.content.FileProvider;
1818

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
package com.google.firebase.appdistribution;
15+
package com.google.firebase.app.distribution;
1616

1717
import android.app.NotificationChannel;
1818
import android.app.NotificationManager;
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
package com.google.firebase.appdistribution;
15+
package com.google.firebase.app.distribution;
1616

1717
import android.app.Application;
1818
import androidx.annotation.Keep;
1919
import androidx.annotation.NonNull;
2020
import com.google.firebase.FirebaseApp;
21-
import com.google.firebase.appdistribution.internal.FirebaseAppDistributionLifecycleNotifier;
21+
import com.google.firebase.app.distribution.internal.FirebaseAppDistributionLifecycleNotifier;
2222
import com.google.firebase.components.Component;
2323
import com.google.firebase.components.ComponentContainer;
2424
import com.google.firebase.components.ComponentRegistrar;
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
package com.google.firebase.appdistribution;
15+
package com.google.firebase.app.distribution;
1616

17-
import static com.google.firebase.appdistribution.FirebaseAppDistributionException.Status.AUTHENTICATION_FAILURE;
18-
import static com.google.firebase.appdistribution.FirebaseAppDistributionException.Status.NETWORK_FAILURE;
17+
import static com.google.firebase.app.distribution.FirebaseAppDistributionException.Status.AUTHENTICATION_FAILURE;
18+
import static com.google.firebase.app.distribution.FirebaseAppDistributionException.Status.NETWORK_FAILURE;
1919

2020
import android.content.Context;
2121
import android.content.pm.PackageManager;
2222
import androidx.annotation.NonNull;
2323
import com.google.android.gms.common.util.AndroidUtilsLight;
2424
import com.google.android.gms.common.util.Hex;
25-
import com.google.firebase.appdistribution.internal.AppDistributionReleaseInternal;
25+
import com.google.firebase.app.distribution.internal.AppDistributionReleaseInternal;
2626
import java.io.BufferedInputStream;
2727
import java.io.ByteArrayOutputStream;
2828
import java.io.IOException;

firebase-app-distribution/src/main/java/com/google/firebase/appdistribution/InstallActivity.java renamed to firebase-app-distribution/src/main/java/com/google/firebase/app/distribution/InstallActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
package com.google.firebase.appdistribution;
15+
package com.google.firebase.app.distribution;
1616

1717
import android.app.AlertDialog;
1818
import android.content.Intent;

firebase-app-distribution/src/main/java/com/google/firebase/appdistribution/InstallApkClient.java renamed to firebase-app-distribution/src/main/java/com/google/firebase/app/distribution/InstallApkClient.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
package com.google.firebase.appdistribution;
15+
package com.google.firebase.app.distribution;
1616

17-
import static com.google.firebase.appdistribution.TaskUtils.safeSetTaskException;
17+
import static com.google.firebase.app.distribution.TaskUtils.safeSetTaskException;
1818

1919
import android.app.Activity;
2020
import android.content.Intent;
2121
import androidx.annotation.GuardedBy;
2222
import androidx.annotation.Nullable;
2323
import com.google.android.gms.tasks.Task;
2424
import com.google.android.gms.tasks.TaskCompletionSource;
25-
import com.google.firebase.appdistribution.internal.FirebaseAppDistributionLifecycleNotifier;
25+
import com.google.firebase.app.distribution.internal.FirebaseAppDistributionLifecycleNotifier;
2626

2727
class InstallApkClient {
2828
private static final String TAG = "ApkInstallClient:";

firebase-app-distribution/src/main/java/com/google/firebase/appdistribution/LogWrapper.java renamed to firebase-app-distribution/src/main/java/com/google/firebase/app/distribution/LogWrapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
package com.google.firebase.appdistribution;
15+
package com.google.firebase.app.distribution;
1616

1717
import android.util.Log;
1818
import androidx.annotation.NonNull;

firebase-app-distribution/src/main/java/com/google/firebase/appdistribution/OnProgressListener.java renamed to firebase-app-distribution/src/main/java/com/google/firebase/app/distribution/OnProgressListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
package com.google.firebase.appdistribution;
15+
package com.google.firebase.app.distribution;
1616

1717
import androidx.annotation.NonNull;
1818

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
package com.google.firebase.appdistribution;
15+
package com.google.firebase.app.distribution;
1616

1717
import android.content.Context;
1818
import android.content.SharedPreferences;
19-
import com.google.firebase.appdistribution.internal.AppDistributionReleaseInternal;
19+
import com.google.firebase.app.distribution.internal.AppDistributionReleaseInternal;
2020

2121
public class ReleaseIdentifierStorage {
2222

firebase-app-distribution/src/main/java/com/google/firebase/appdistribution/ReleaseUtils.java renamed to firebase-app-distribution/src/main/java/com/google/firebase/app/distribution/ReleaseUtils.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
package com.google.firebase.appdistribution;
15+
package com.google.firebase.app.distribution;
1616

17-
import com.google.firebase.appdistribution.internal.AppDistributionReleaseInternal;
17+
import com.google.firebase.app.distribution.internal.AppDistributionReleaseInternal;
1818

1919
class ReleaseUtils {
2020
static AppDistributionRelease convertToAppDistributionRelease(
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
package com.google.firebase.appdistribution;
15+
package com.google.firebase.app.distribution;
1616

1717
import android.os.Bundle;
1818
import androidx.annotation.NonNull;

firebase-app-distribution/src/main/java/com/google/firebase/appdistribution/SignInStorage.java renamed to firebase-app-distribution/src/main/java/com/google/firebase/app/distribution/SignInStorage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
package com.google.firebase.appdistribution;
15+
package com.google.firebase.app.distribution;
1616

1717
import android.content.Context;
1818
import android.content.SharedPreferences;

firebase-app-distribution/src/main/java/com/google/firebase/appdistribution/TaskUtils.java renamed to firebase-app-distribution/src/main/java/com/google/firebase/app/distribution/TaskUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
package com.google.firebase.appdistribution;
15+
package com.google.firebase.app.distribution;
1616

1717
import com.google.android.gms.tasks.Task;
1818
import com.google.android.gms.tasks.TaskCompletionSource;

firebase-app-distribution/src/main/java/com/google/firebase/appdistribution/TesterSignInClient.java renamed to firebase-app-distribution/src/main/java/com/google/firebase/app/distribution/TesterSignInClient.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
package com.google.firebase.appdistribution;
15+
package com.google.firebase.app.distribution;
1616

17-
import static com.google.firebase.appdistribution.FirebaseAppDistributionException.Status.AUTHENTICATION_CANCELED;
18-
import static com.google.firebase.appdistribution.FirebaseAppDistributionException.Status.AUTHENTICATION_FAILURE;
19-
import static com.google.firebase.appdistribution.TaskUtils.safeSetTaskException;
20-
import static com.google.firebase.appdistribution.TaskUtils.safeSetTaskResult;
17+
import static com.google.firebase.app.distribution.FirebaseAppDistributionException.Status.AUTHENTICATION_CANCELED;
18+
import static com.google.firebase.app.distribution.FirebaseAppDistributionException.Status.AUTHENTICATION_FAILURE;
19+
import static com.google.firebase.app.distribution.TaskUtils.safeSetTaskException;
20+
import static com.google.firebase.app.distribution.TaskUtils.safeSetTaskResult;
2121

2222
import android.app.Activity;
2323
import android.app.AlertDialog;
@@ -35,8 +35,8 @@
3535
import com.google.android.gms.tasks.TaskCompletionSource;
3636
import com.google.android.gms.tasks.Tasks;
3737
import com.google.firebase.FirebaseApp;
38-
import com.google.firebase.appdistribution.Constants.ErrorMessages;
39-
import com.google.firebase.appdistribution.internal.FirebaseAppDistributionLifecycleNotifier;
38+
import com.google.firebase.app.distribution.Constants.ErrorMessages;
39+
import com.google.firebase.app.distribution.internal.FirebaseAppDistributionLifecycleNotifier;
4040
import com.google.firebase.installations.FirebaseInstallationsApi;
4141
import java.util.List;
4242

firebase-app-distribution/src/main/java/com/google/firebase/appdistribution/UpdateAabClient.java renamed to firebase-app-distribution/src/main/java/com/google/firebase/app/distribution/UpdateAabClient.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,19 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
package com.google.firebase.appdistribution;
15+
package com.google.firebase.app.distribution;
1616

17-
import static com.google.firebase.appdistribution.FirebaseAppDistributionException.Status.NETWORK_FAILURE;
18-
import static com.google.firebase.appdistribution.TaskUtils.safeSetTaskException;
17+
import static com.google.firebase.app.distribution.FirebaseAppDistributionException.Status.NETWORK_FAILURE;
18+
import static com.google.firebase.app.distribution.TaskUtils.safeSetTaskException;
1919

2020
import android.app.Activity;
2121
import android.content.Intent;
2222
import android.net.Uri;
2323
import androidx.annotation.GuardedBy;
2424
import androidx.annotation.NonNull;
2525
import androidx.annotation.VisibleForTesting;
26-
import com.google.firebase.appdistribution.internal.AppDistributionReleaseInternal;
27-
import com.google.firebase.appdistribution.internal.FirebaseAppDistributionLifecycleNotifier;
26+
import com.google.firebase.app.distribution.internal.AppDistributionReleaseInternal;
27+
import com.google.firebase.app.distribution.internal.FirebaseAppDistributionLifecycleNotifier;
2828
import java.io.IOException;
2929
import java.net.URL;
3030
import java.util.concurrent.Executor;

firebase-app-distribution/src/main/java/com/google/firebase/appdistribution/UpdateApkClient.java renamed to firebase-app-distribution/src/main/java/com/google/firebase/app/distribution/UpdateApkClient.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
package com.google.firebase.appdistribution;
15+
package com.google.firebase.app.distribution;
1616

17-
import static com.google.firebase.appdistribution.FirebaseAppDistributionException.Status.NETWORK_FAILURE;
18-
import static com.google.firebase.appdistribution.TaskUtils.safeSetTaskException;
19-
import static com.google.firebase.appdistribution.TaskUtils.safeSetTaskResult;
20-
import static com.google.firebase.appdistribution.internal.ReleaseIdentificationUtils.calculateApkHash;
17+
import static com.google.firebase.app.distribution.FirebaseAppDistributionException.Status.NETWORK_FAILURE;
18+
import static com.google.firebase.app.distribution.TaskUtils.safeSetTaskException;
19+
import static com.google.firebase.app.distribution.TaskUtils.safeSetTaskResult;
20+
import static com.google.firebase.app.distribution.internal.ReleaseIdentificationUtils.calculateApkHash;
2121

2222
import android.content.Context;
2323
import androidx.annotation.GuardedBy;
@@ -26,7 +26,7 @@
2626
import com.google.android.gms.tasks.Task;
2727
import com.google.android.gms.tasks.TaskCompletionSource;
2828
import com.google.firebase.FirebaseApp;
29-
import com.google.firebase.appdistribution.internal.AppDistributionReleaseInternal;
29+
import com.google.firebase.app.distribution.internal.AppDistributionReleaseInternal;
3030
import java.io.BufferedOutputStream;
3131
import java.io.File;
3232
import java.io.IOException;

firebase-app-distribution/src/main/java/com/google/firebase/appdistribution/UpdateAppClient.java renamed to firebase-app-distribution/src/main/java/com/google/firebase/app/distribution/UpdateAppClient.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
package com.google.firebase.appdistribution;
15+
package com.google.firebase.app.distribution;
1616

17-
import static com.google.firebase.appdistribution.FirebaseAppDistributionException.Status.UPDATE_NOT_AVAILABLE;
17+
import static com.google.firebase.app.distribution.FirebaseAppDistributionException.Status.UPDATE_NOT_AVAILABLE;
1818

1919
import androidx.annotation.NonNull;
2020
import androidx.annotation.Nullable;
2121
import androidx.annotation.VisibleForTesting;
2222
import com.google.firebase.FirebaseApp;
23-
import com.google.firebase.appdistribution.internal.AppDistributionReleaseInternal;
23+
import com.google.firebase.app.distribution.internal.AppDistributionReleaseInternal;
2424

2525
/** Client class for updateApp functionality in {@link FirebaseAppDistribution}. */
2626
public class UpdateAppClient {

0 commit comments

Comments
 (0)