Restructure android test module, update dependencies

compiler/android-tests/android-module/AndroidManifest.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="org.jetbrains.kotlin.android.tests"
-          android:versionCode="1"
-          android:versionName="1.0">
-  <application>
-    <uses-library android:name="android.test.runner" />
-  </application>
-  <!--
-  This declares that this application uses the instrumentation test runner targeting
-  the package of com.example.  To execute the tests use the command:
-  "adb shell am instrument -w com.example.tests/android.test.InstrumentationTestRunner"
-  -->
-  <instrumentation android:name="android.test.InstrumentationTestRunner"
-                   android:targetPackage="org.jetbrains.kotlin.android.tests"
-                   android:label="Tests for org.jetbrains.kotlin.android.tests"/>
-</manifest>

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

@@ -7,7 +7,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.2.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -22,7 +22,7 @@ repositories {
 
 android {
     compileSdkVersion 19
-    buildToolsVersion "27.0.3"
+    buildToolsVersion "28.0.3"
 
     defaultConfig {
         applicationId "org.jetbrains.kotlin.android.tests"
@@ -31,7 +31,7 @@ android {
         versionCode 1
         versionName "1.0"
         testApplicationId "org.jetbrains.kotlin.android.tests.gradle"
-        testInstrumentationRunner "android.test.InstrumentationTestRunner"
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
     }
     buildTypes {
@@ -41,20 +41,6 @@ android {
         }
     }
 
-    sourceSets {
-        main {
-            manifest.srcFile 'AndroidManifest.xml'
-            java {
-                srcDirs = ['src']
-            }
-            res.srcDirs = ['res']
-        }
-        androidTest {
-            java {
-                srcDirs = ['src']
-            }
-        }
-    }
     packagingOptions { exclude 'META-INF/build.txt' }
 
     //TODO run under java 6, cause there is error on implicit 'stream' import in 'asWithMutable' test
@@ -72,6 +58,11 @@ android {
         maxProcessCount 4
         additionalParameters "--debug"
     }
+
+    testOptions {
+        resultsDir = "build/test/results"
+    }
+
 }
 
 task jarTestFolders() {
@@ -89,7 +80,8 @@ tasks.withType(JavaCompile) {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestCompile 'junit:junit:4.12'
-    compile 'com.android.support:multidex:1.0.1'
+    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'
 }

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

@@ -1,4 +1,3 @@
 #don't try to download android specific tools within gradle: licence acceptance will be required
 android.builder.sdkDownload=false
-android.enableAapt2=false
 android.enableD8=false

compiler/android-tests/android-module/src/main/AndroidManifest.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="org.jetbrains.kotlin.android.tests"
+          android:versionCode="1"
+          android:versionName="1.0">
+  <application>
+    <uses-library android:name="android.test.runner" />
+  </application>
+</manifest>

compiler/android-tests/android-module/tested-module/AndroidManifest.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="">
-    <application>
-    </application>
-</manifest>