mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 20:33:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Adding multidex to support more method references (#3755)

Browse source 
* adding multidex to support more method references

* add multidex version to gradle properties
This commit is contained in:
Cloe Riva 2020-05-19 14:32:33 +01:00 • committed by GitHub
parent 7084fd2535
commit 01839dec6e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/build.gradle
View file

@ -121,6 +121,8 @@ dependencies {
implementation "androidx.preference:preference:$PREFERENCE_VERSION" implementation "androidx.preference:preference:$PREFERENCE_VERSION"
// Kotlin // Kotlin
implementation "androidx.preference:preference-ktx:$PREFERENCE_VERSION" implementation "androidx.preference:preference-ktx:$PREFERENCE_VERSION"
implementation "androidx.multidex:multidex:$MULTIDEX_VERSION"
} }
android { android {
@ -138,6 +140,8 @@ android {
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
testInstrumentationRunnerArguments clearPackageData: 'true' testInstrumentationRunnerArguments clearPackageData: 'true'
multiDexEnabled true
testOptions { testOptions {
execution 'ANDROIDX_TEST_ORCHESTRATOR' execution 'ANDROIDX_TEST_ORCHESTRATOR'
} }

3
app/src/main/java/fr/free/nrw/commons/CommonsApplication.java
View file

@ -18,6 +18,7 @@ import android.os.Build;
import android.os.Process; import android.os.Process;
import android.util.Log; import android.util.Log;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.multidex.MultiDexApplication;
import com.facebook.drawee.backends.pipeline.Fresco; import com.facebook.drawee.backends.pipeline.Fresco;
import com.facebook.imagepipeline.core.ImagePipeline; import com.facebook.imagepipeline.core.ImagePipeline;
import com.facebook.imagepipeline.core.ImagePipelineConfig; import com.facebook.imagepipeline.core.ImagePipelineConfig;
@ -77,7 +78,7 @@ import timber.log.Timber;
resCommentPrompt = R.string.crash_dialog_comment_prompt resCommentPrompt = R.string.crash_dialog_comment_prompt
) )
public class CommonsApplication extends Application { public class CommonsApplication extends MultiDexApplication {
@Inject SessionManager sessionManager; @Inject SessionManager sessionManager;
@Inject DBOpenHelper dbOpenHelper; @Inject DBOpenHelper dbOpenHelper;

1
gradle.properties
View file

@ -23,6 +23,7 @@ DAGGER_VERSION=2.21
ROOM_VERSION=2.2.3 ROOM_VERSION=2.2.3
PREFERENCE_VERSION=1.1.0 PREFERENCE_VERSION=1.1.0
CORE_KTX_VERSION=1.2.0 CORE_KTX_VERSION=1.2.0
MULTIDEX_VERSION=2.0.1
systemProp.http.proxyPort=0 systemProp.http.proxyPort=0
systemProp.http.proxyHost= systemProp.http.proxyHost=