Fix maven and android tests after modularizing and rebasing

compiler/compiler.pro

@@ -165,6 +165,7 @@ messages/**)
 -keep class gnu.trove.TIntHashSet { *; }
 -keep class gnu.trove.TIntIterator { *; }
 -keep class org.iq80.snappy.SlowMemory { *; }
+-keep class javaslang.match.PatternsProcessor { *; }
 
 -keepclassmembers enum * {
     public static **[] values();

generators/build.gradle.kts

@@ -32,7 +32,7 @@ dependencies {
     compile(projectTests(":plugins:uast-kotlin"))
     compile(projectTests(":js:js.tests"))
     compile(protobufFull())
-    compileOnly(ideaSdkDeps("jps-build-test", subdir = "jps/test"))
+    compile(ideaSdkDeps("jps-build-test", subdir = "jps/test"))
     testCompile(project(":compiler.tests-common"))
     testCompile(project(":idea:idea-test-framework")) { isTransitive = false }
     testCompile(project(":compiler:incremental-compilation-impl"))
@@ -62,3 +62,11 @@ sourceSets {
 projectTest {
     workingDir = rootDir
 }
+
+val generateTests by task<JavaExec> {
+    classpath = the<JavaPluginConvention>().sourceSets["test"].runtimeClasspath
+
+    main = "org.jetbrains.kotlin.generators.tests.GenerateTestsKt"
+
+    workingDir = rootDir
+}

idea/idea-android/build.gradle.kts

@@ -21,6 +21,7 @@ dependencies {
     testCompile(project(":compiler.tests-common"))
     testCompile(project(":idea:idea-test-framework")) { isTransitive = false }
     testCompile(project(":plugins:lint")) { isTransitive = false }
+    testCompile(project(":idea:idea-jvm"))
     testCompile(projectTests(":idea"))
     testCompile(projectTests(":idea:idea-gradle"))
     testCompile(ideaPluginDeps("properties", plugin = "properties"))

js/js.ast/build.gradle.kts

@@ -1,6 +1,8 @@
 
 apply { plugin("kotlin") }
 
+jvmTarget = "1.6"
+
 dependencies {
     compile(project(":compiler:util"))
     compile(project(":compiler:frontend"))

js/js.frontend/build.gradle.kts

@@ -1,6 +1,8 @@
 
 apply { plugin("kotlin") }
 
+jvmTarget = "1.6"
+
 dependencies {
     compile(project(":compiler:util"))
     compile(project(":compiler:frontend"))

js/js.serializer/build.gradle.kts

@@ -1,6 +1,8 @@
 
 apply { plugin("kotlin") }
 
+jvmTarget = "1.6"
+
 dependencies {
     compile(project(":compiler:util"))
     compile(project(":compiler:frontend"))

js/js.translator/build.gradle.kts

@@ -1,6 +1,8 @@
 
 apply { plugin("kotlin") }
 
+jvmTarget = "1.6"
+
 dependencies {
     compile(project(":core"))
     compile(project(":compiler:util"))

libraries/examples/kotlin-java-example/pom.xml

@@ -39,6 +39,14 @@
                   </configuration>
             </plugin>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.19.1</version>
+                <configuration>
+                    <jvm>${env.JDK_18}/bin/java</jvm>
+                </configuration>
+            </plugin>
         </plugins>
 
     </build>

libraries/tools/kotlin-maven-plugin/pom.xml

@@ -40,6 +40,21 @@
             <artifactId>kotlin-compiler</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-stdlib</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-reflect</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-script-runtime</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-all</artifactId>

libraries/tools/kotlin-reflect/build.gradle

@@ -47,7 +47,7 @@ dependencies {
     shadows project(path: ':custom-dependencies:protobuf-lite', configuration: 'default')
 
     compile project(':kotlin-stdlib')
-    compile project(path: ':custom-dependencies:protobuf-lite', configuration: 'default')
+    compileOnly project(path: ':custom-dependencies:protobuf-lite', configuration: 'default')
 }
 
 task copyAnnotations(type: Sync) {