Skip to content

Commit bc87ad5

Browse files
Merge pull request commons-app#1237 from knight-shade/Fixes-#1225
Fixes commons-app#1225 bug causing multidex
2 parents f45f606 + 0acc42d commit bc87ad5

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

app/build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,11 @@ dependencies {
4848
compile 'com.facebook.fresco:fresco:1.3.0'
4949
compile 'com.facebook.stetho:stetho:1.5.0'
5050

51+
compile 'com.android.support:multidex:1.0.3'
52+
5153
testCompile 'junit:junit:4.12'
5254
testCompile 'org.robolectric:robolectric:3.7.1'
55+
testCompile "org.robolectric:multidex:3.4.2"
5356

5457
testCompile 'com.squareup.okhttp3:mockwebserver:3.8.1'
5558
androidTestCompile 'com.squareup.okhttp3:mockwebserver:3.8.1'

app/src/main/java/fr/free/nrw/commons/CommonsApplication.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import android.content.Context;
55
import android.content.SharedPreferences;
66
import android.database.sqlite.SQLiteDatabase;
7+
import android.support.multidex.MultiDexApplication;
78

89
import com.facebook.drawee.backends.pipeline.Fresco;
910
import com.facebook.stetho.Stetho;
@@ -40,7 +41,7 @@
4041
resDialogCommentPrompt = R.string.crash_dialog_comment_prompt,
4142
resDialogOkToast = R.string.crash_dialog_ok_toast
4243
)
43-
public class CommonsApplication extends Application {
44+
public class CommonsApplication extends MultiDexApplication {
4445

4546
@Inject SessionManager sessionManager;
4647
@Inject DBOpenHelper dbOpenHelper;

0 commit comments

Comments
 (0)