From cc7bd80099de425ae730357c694a2436a7e21d0f Mon Sep 17 00:00:00 2001 From: Mikhael Bogdanov Date: Fri, 16 Feb 2018 14:20:26 +0100 Subject: [PATCH] Enable multidex in android box tests --- compiler/android-tests/android-module/build.gradle | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/compiler/android-tests/android-module/build.gradle b/compiler/android-tests/android-module/build.gradle index cc4781d3ded..f1702c3a2c8 100644 --- a/compiler/android-tests/android-module/build.gradle +++ b/compiler/android-tests/android-module/build.gradle @@ -32,6 +32,7 @@ android { versionName "1.0" testApplicationId "org.jetbrains.kotlin.android.tests.gradle" testInstrumentationRunner "android.test.InstrumentationTestRunner" + multiDexEnabled true } buildTypes { debug { @@ -67,9 +68,8 @@ android { dexOptions { dexInProcess false - javaMaxHeapSize "600m" - //default is 4 and Total Memory = maxProcessCount * javaMaxHeapSize - maxProcessCount 1 + javaMaxHeapSize "1200m" + maxProcessCount 4 additionalParameters "--debug" } } @@ -91,4 +91,5 @@ tasks.withType(JavaCompile) { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) androidTestCompile 'junit:junit:4.12' + compile 'com.android.support:multidex:1.0.1' }