Add multidex to the auth app (firebase#362)

devalp-pro · Nov 9, 2017 · 940ac4d · 940ac4d
1 parent ba4b3fb
commit 940ac4d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -20,5 +20,5 @@ cache:
     - $HOME/.android/build-cache
 
 before_script:
-  - echo y | ${ANDROID_HOME}tools/bin/sdkmanager --channel=3 "tools" "platform-tools" "build-tools;26.0.1" "platforms;android-26" "extras;google;m2repository"
+  - echo y | ${ANDROID_HOME}/tools/bin/sdkmanager --channel=3 "tools" "platform-tools" "build-tools;26.0.1" "platforms;android-26" "extras;google;m2repository"
 script: ./build.sh
diff --git a/auth/app/build.gradle b/auth/app/build.gradle
@@ -48,6 +48,8 @@ configurations.all {
 }
 
 dependencies {
+    compile 'com.android.support:multidex:1.0.2'
+
     compile 'com.android.support:appcompat-v7:26.1.0'
     compile 'com.android.support:animated-vector-drawable:26.1.0'
     compile 'com.android.support:cardview-v7:26.1.0'

diff --git a/auth/app/src/main/AndroidManifest.xml b/auth/app/src/main/AndroidManifest.xml
@@ -8,6 +8,7 @@
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:name="android.support.multidex.MultiDexApplication"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity android:name=".ChooserActivity">
@@ -32,7 +33,7 @@
             android:windowSoftInputMode="stateAlwaysHidden" />
         <activity
             android:name=".PhoneAuthActivity"
-            android:label="@string/label_phone_auth"></activity>
+            android:label="@string/label_phone_auth" />
         <activity
             android:name=".AnonymousAuthActivity"
             android:label="@string/label_anonymous_auth" />