Split android box tests by flavours

compiler/android-tests/android-module/android-module.ipr

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-    <excludeFromCompile>
-      <directory url="file://$PROJECT_DIR$/gen" includeSubdirectories="true" />
-    </excludeFromCompile>
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/android-module.iml" filepath="$PROJECT_DIR$/android_module.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="Android_SDK" project-jdk-type="Android SDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
-

compiler/android-tests/android-module/build.gradle

@@ -5,9 +5,8 @@ buildscript {
         google()
         jcenter()
     }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
-
+    dependencies {        
+        classpath 'com.android.tools.build:gradle:3.3.2'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -31,7 +30,6 @@ android {
         versionName "1.0"
         testApplicationId "org.jetbrains.kotlin.android.tests.gradle"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-        multiDexEnabled true
     }
     buildTypes {
         debug {
@@ -62,6 +60,19 @@ android {
         resultsDir = "build/test/results"
     }
 
+
+    flavorDimensions "box"
+
+    productFlavors {
+        ktest0 {
+            dimension "box"
+        }
+
+        ktest1 {
+            dimension "box"
+        }
+    }
+
 }
 
 task jarTestFolders() {
@@ -81,7 +92,8 @@ tasks.withType(JavaCompile) {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     androidTestImplementation 'junit:junit:4.12'
-    implementation 'com.android.support:multidex:1.0.3'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation fileTree(dir: 'libs/test', include: ['*.jar'])
+
+    ktest0Implementation fileTree(dir: 'libs/test', include: ['libtest0.jar'])
+    ktest1Implementation fileTree(dir: 'libs/test', include: ['libtest1.jar'])
 }

compiler/android-tests/android-module/project.properties

@@ -1,14 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-#proguard.config=${sdk.dir}\tools\proguard\proguard-android.txt:proguard-project.txt
-
-# Project target.
-target=android-16