Fix after rebase on master

build-common/build.gradle.kts

@@ -9,6 +9,7 @@ dependencies {
     compile(project(":compiler:cli-common"))
     compile(project(":compiler:frontend.java"))
     compile(project(":js:js.serializer"))
+    compile(project(":js:js.frontend"))
     compile(ideaSdkDeps("util"))
     testCompile(commonDep("junit:junit"))
     testCompile(project(":compiler.tests-common"))

compiler/incremental-compilation-impl/build.gradle.kts

@@ -11,6 +11,7 @@ dependencies {
     compile(project(":compiler:cli"))
     compile(project(":kotlin-build-common"))
     testCompile(commonDep("junit:junit"))
+    testCompile(project(":compiler.tests-common"))
     testCompile(projectDist(":kotlin-test:kotlin-test-junit"))
     testCompile(projectDist(":kotlin-stdlib"))
     testCompile(projectTests(":kotlin-build-common"))

gradle.properties

@@ -4,5 +4,5 @@ org.gradle.configureondemand=false
 org.gradle.jvmargs=-Xmx1200m -XX:+CMSClassUnloadingEnabled -XX:+CMSPermGenSweepingEnabled
 
 systemProp.bootstrap.kotlin.repo=https://dl.bintray.com/kotlin/kotlin-dev
-systemProp.bootstrap.kotlin.version=1.1.5-dev-640
+systemProp.bootstrap.kotlin.version=1.1.5-dev-970
 #signingRequired=true

gradle/project-schema.json

@@ -503,8 +503,7 @@
     ":kotlin-annotation-processing": {
         "conventions": {
             "base": "org.gradle.api.plugins.BasePluginConvention",
-            "java": "org.gradle.api.plugins.JavaPluginConvention",
+            "java": "org.gradle.api.plugins.JavaPluginConvention"
-            "maven": "org.gradle.api.plugins.MavenPluginConvention"
         },
         "configurations": [
             "apiElements",
@@ -523,7 +522,6 @@
             "runtimeElements",
             "runtimeJar",
             "runtimeOnly",
-            "signatures",
             "testCompile",
             "testCompileClasspath",
             "testCompileOnly",
@@ -538,14 +536,14 @@
             "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension",
             "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension",
             "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet",
-            "reporting": "org.gradle.api.reporting.ReportingExtension",
+            "reporting": "org.gradle.api.reporting.ReportingExtension"
-            "signing": "org.gradle.plugins.signing.SigningExtension"
         }
     },
     ":kotlin-annotation-processing-gradle": {
         "conventions": {
             "base": "org.gradle.api.plugins.BasePluginConvention",
-            "java": "org.gradle.api.plugins.JavaPluginConvention"
+            "java": "org.gradle.api.plugins.JavaPluginConvention",
+            "maven": "org.gradle.api.plugins.MavenPluginConvention"
         },
         "configurations": [
             "apiElements",
@@ -558,11 +556,13 @@
             "implementation",
             "kapt",
             "kaptTest",
+            "packedJars",
             "runtime",
             "runtimeClasspath",
             "runtimeElements",
             "runtimeJar",
             "runtimeOnly",
+            "signatures",
             "testCompile",
             "testCompileClasspath",
             "testCompileOnly",
@@ -576,7 +576,8 @@
             "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension",
             "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension",
             "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet",
-            "reporting": "org.gradle.api.reporting.ReportingExtension"
+            "reporting": "org.gradle.api.reporting.ReportingExtension",
+            "signing": "org.gradle.plugins.signing.SigningExtension"
         }
     },
     ":kotlin-ant": {
@@ -3722,17 +3723,21 @@
     },
     ":prepare:kotlin-plugin": {
         "conventions": {
-            
+            "base": "org.gradle.api.plugins.BasePluginConvention",
+            "java": "org.gradle.api.plugins.JavaPluginConvention"
         },
         "configurations": [
             "archives",
             "buildVersion",
+            "default",
             "packedJars",
             "runtimeJar",
             "sideJars"
         ],
         "extensions": {
-            "ext": "org.gradle.api.plugins.ExtraPropertiesExtension"
+            "ext": "org.gradle.api.plugins.ExtraPropertiesExtension",
+            "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet",
+            "reporting": "org.gradle.api.reporting.ReportingExtension"
         }
     },
     ":prepare:mock-runtime-for-test": {

libraries/tools/kotlin-annotation-processing/build.gradle.kts

@@ -17,7 +17,7 @@ apply { plugin("kotlin") }
 val packedJars by configurations.creating
 
 dependencies {
-    compile(project(":kotlin-annotation-processing"))
+    compileOnly(project(":kotlin-annotation-processing"))
     compileOnly("org.jetbrains.kotlin:gradle-api:1.6")
     compileOnly("com.android.tools.build:gradle:1.1.0")
     compile(projectDist(":kotlin-stdlib"))

libraries/tools/kotlin-gradle-plugin/build.gradle

@@ -36,7 +36,7 @@ dependencies {
     compile project(':compiler:compiler-runner')
     compile project(":compiler:incremental-compilation-impl")
     compile project(":compiler:daemon")
-    compile project(':kotlin-annotation-processing-gradle')
+    compile project(path: ':kotlin-annotation-processing-gradle', configuration: "runtimeJar")
 
     compileOnly 'com.android.tools.build:gradle:2.0.0'
     compileOnly 'org.codehaus.groovy:groovy-all:2.3.9'