Dummy change to see build in TeamCity dependencies

#KT-10505 Fixed
(cherry picked from commit c1dbfee)

build.xml

@@ -1077,4 +1077,5 @@
     <target name="build-bootstrap-artifacts" depends="dist,zip-compiler"/>
 
     <target name="build-artifacts" depends="dist,zip-compiler,kotlin-for-upsource,zip-test-data"/>
+    <!-- Dummy change to see build in TeamCity dependencies -->
 </project>

jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt

@@ -184,6 +184,12 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR
 
         messageCollector.report(INFO, "Kotlin JPS plugin version " + KotlinVersion.VERSION, CompilerMessageLocation.NO_LOCATION)
 
+        val targetsWithoutOutputDir = targets.filter { it.outputDir == null }
+        if (targetsWithoutOutputDir.isNotEmpty()) {
+            messageCollector.report(ERROR, "Output directory not specified for " + targetsWithoutOutputDir.joinToString(), CompilerMessageLocation.NO_LOCATION)
+            return ABORT
+        }
+
         val project = projectDescriptor.project
         val lookupTracker = getLookupTracker(project)
         val incrementalCaches = getIncrementalCaches(chunk, context)

jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java

@@ -115,12 +115,12 @@ public class KotlinBuilderModuleScriptGenerator {
     }
 
     @Nullable
-    public static File getFriendDirSafe(@NotNull ModuleBuildTarget target) throws ProjectBuildException {
+    private static File getFriendDirSafe(@NotNull ModuleBuildTarget target) throws ProjectBuildException {
         if (!target.isTests()) return null;
 
         File outputDirForProduction = JpsJavaExtensionService.getInstance().getOutputDirectory(target.getModule(), false);
         if (outputDirForProduction == null) {
-            throw new ProjectBuildException("No output production directory found for " + target);
+            return null;
         }
         return outputDirForProduction;
     }

jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt

@@ -103,7 +103,7 @@ public class IncrementalCacheImpl(
     private val supertypesMap = registerExperimentalMap(SupertypesMap(SUPERTYPES.storageFile))
 
     private val dependents = arrayListOf<IncrementalCacheImpl>()
-    private val outputDir = requireNotNull(target.outputDir) { "Target is expected to have output directory: $target" }
+    private val outputDir by lazy(LazyThreadSafetyMode.NONE) { requireNotNull(target.outputDir) { "Target is expected to have output directory: $target" } }
 
     private val dependentsWithThis: Iterable<IncrementalCacheImpl>
             get() = dependents + this

jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt

@@ -717,6 +717,25 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
         assertFalse(File(storageRoot, "targets/java-production/module2/kotlin").exists())
     }
 
+    fun testKotlinProjectWithEmptyProductionOutputDir() {
+        initProject()
+        val result = makeAll()
+        result.assertFailed()
+        result.checkErrors()
+    }
+
+    fun testKotlinProjectWithEmptyTestOutputDir() {
+        doTest()
+    }
+
+    fun testKotlinProjectWithEmptyProductionOutputDirWithoutSrcDir() {
+        doTest()
+    }
+
+    fun testKotlinProjectWithEmptyOutputDirInSomeModules() {
+        doTest()
+    }
+
     private fun BuildResult.checkErrors() {
         val actualErrors = getMessages(BuildMessage.Kind.ERROR)
                 .map { it as CompilerMessage }

jps-plugin/testData/general/KotlinProjectWithEmptyOutputDirInSomeModules/kotlinProject.ipr

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <option name="DEFAULT_COMPILER" value="Javac" />
+  </component>
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/produciton_module/produciton_module.iml" filepath="$PROJECT_DIR$/produciton_module/produciton_module.iml" />
+      <module fileurl="file://$PROJECT_DIR$/test_module/test_module.iml" filepath="$PROJECT_DIR$/test_module/test_module.iml" />
+    </modules>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>

jps-plugin/testData/general/KotlinProjectWithEmptyOutputDirInSomeModules/produciton_module/produciton_module.iml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/../out/production/produciton_module" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
+    </content>
+    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
+

jps-plugin/testData/general/KotlinProjectWithEmptyOutputDirInSomeModules/produciton_module/src/foo.kt

@@ -0,0 +1,3 @@
+fun foo() {
+
+}

jps-plugin/testData/general/KotlinProjectWithEmptyOutputDirInSomeModules/test_module/test/test.kt

@@ -0,0 +1,3 @@
+fun test() {
+    foo()
+}

jps-plugin/testData/general/KotlinProjectWithEmptyOutputDirInSomeModules/test_module/test_module.iml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output-test url="file://$MODULE_DIR$/../out/test/test_module" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
+    </content>
+    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="produciton_module" />
+  </component>
+</module>
+

jps-plugin/testData/general/KotlinProjectWithEmptyProductionOutputDir/errors.txt

@@ -0,0 +1 @@
+Output directory not specified for Module 'kotlinProject' production at line -1, column -1

jps-plugin/testData/general/KotlinProjectWithEmptyProductionOutputDir/kotlinProject.iml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output-test url="file://$MODULE_DIR$/out/test/kotlinProject" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
+    </content>
+    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="kotlinProject" />
+  </component>
+</module>

jps-plugin/testData/general/KotlinProjectWithEmptyProductionOutputDir/kotlinProject.ipr

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <option name="DEFAULT_COMPILER" value="Javac" />
+  </component>
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
+    </modules>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>

jps-plugin/testData/general/KotlinProjectWithEmptyProductionOutputDir/src/foo.kt

@@ -0,0 +1,3 @@
+fun foo() {
+
+}

jps-plugin/testData/general/KotlinProjectWithEmptyProductionOutputDir/test/test.kt

@@ -0,0 +1,3 @@
+fun test() {
+
+}

jps-plugin/testData/general/KotlinProjectWithEmptyProductionOutputDirWithoutSrcDir/kotlinProject.iml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output-test url="file://$MODULE_DIR$/out/test/kotlinProject" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
+    </content>
+    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="kotlinProject" />
+  </component>
+</module>

jps-plugin/testData/general/KotlinProjectWithEmptyProductionOutputDirWithoutSrcDir/kotlinProject.ipr

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <option name="DEFAULT_COMPILER" value="Javac" />
+  </component>
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
+    </modules>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>

jps-plugin/testData/general/KotlinProjectWithEmptyProductionOutputDirWithoutSrcDir/test/test.kt

@@ -0,0 +1,3 @@
+fun test() {
+
+}

jps-plugin/testData/general/KotlinProjectWithEmptyTestOutputDir/kotlinProject.iml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/out/production/kotlinProject" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
+    </content>
+    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="kotlinProject" />
+  </component>
+</module>

jps-plugin/testData/general/KotlinProjectWithEmptyTestOutputDir/kotlinProject.ipr

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <option name="DEFAULT_COMPILER" value="Javac" />
+  </component>
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
+    </modules>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>

jps-plugin/testData/general/KotlinProjectWithEmptyTestOutputDir/src/foo.kt

@@ -0,0 +1,3 @@
+fun foo() {
+
+}

jps-plugin/testData/general/KotlinProjectWithEmptyTestOutputDir/test/test.kt

@@ -0,0 +1,3 @@
+fun test() {
+
+}

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt

@@ -399,7 +399,7 @@ open class KotlinAndroidPlugin @Inject constructor(val scriptHandler: ScriptHand
             // getJavaSources should return the Java sources used for compilation
             // We want to collect only generated files, like R-class output dir
             // Actual java sources will be collected later
-            val additionalSourceFiles = variantData.getJavaSources().filterIsInstance(javaClass<File>())
+            val additionalSourceFiles = AndroidGradleWrapper.getGeneratedSourceDirs(variantData)
             for (file in additionalSourceFiles) {
                 kotlinTask.source(file)
                 logger.kotlinDebug("Source directory with generated files ${file.getAbsolutePath()} was added to kotlin source for $kotlinTaskName")

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/android/AndroidGradleWrapper.groovy

@@ -7,6 +7,7 @@ import com.android.build.gradle.api.ApkVariant
 import com.android.build.gradle.api.BaseVariant
 import com.android.build.gradle.api.TestVariant
 import com.android.build.gradle.internal.VariantManager
+import com.android.build.gradle.internal.variant.BaseVariantData
 import org.gradle.api.internal.DefaultDomainObjectSet
 import org.gradle.api.tasks.compile.AbstractCompile
 import org.gradle.api.tasks.util.PatternFilterable
@@ -102,4 +103,37 @@ class AndroidGradleWrapper {
   static def VariantManager getVariantDataManager(BasePlugin plugin) {
     return plugin.getVariantManager()
   }
+
+  static def List<File> getGeneratedSourceDirs(BaseVariantData variantData) {
+    def getJavaSourcesMethod = variantData.getMetaClass().getMetaMethod("getJavaSources")
+    if (getJavaSourcesMethod.returnType.metaClass == Object[].metaClass) {
+      return variantData.getJavaSources().findAll { it instanceof File }
+    }
+    else {
+      def result = new ArrayList<File>()
+
+      if (variantData.scope.getGenerateRClassTask() != null) {
+        result.add(variantData.scope.getRClassSourceOutputDir());
+      }
+
+      if (variantData.scope.getGenerateBuildConfigTask() != null) {
+        result.add(variantData.scope.getBuildConfigSourceOutputDir());
+      }
+
+      if (variantData.scope.getAidlCompileTask() != null) {
+        result.add(variantData.scope.getAidlSourceOutputDir());
+      }
+
+      if (variantData.scope.getGlobalScope().getExtension().getDataBinding().isEnabled()) {
+        result.add(variantData.scope.getClassOutputForDataBinding());
+      }
+
+      if (!variantData.variantConfiguration.getRenderscriptNdkModeEnabled()
+              && variantData.scope.getRenderscriptCompileTask() != null) {
+        result.add(variantData.scope.getRenderscriptSourceOutputDir());
+      }
+
+      return result
+    }
+  }
 }