From f4c77ec66f52b83b7b1c07adca08305bd5669654 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Fri, 26 Oct 2018 14:35:54 +0200
Subject: [PATCH] Minor, rework groovyTraitsWithFields integration test

Declaring Groovy and Kotlin classes in the same project is not necessary
for this test, split them to two projects instead to avoid the hack with
modifying task dependencies manually
---
 .../testProject/groovyTraitsWithFields/build.gradle    | 10 +---------
 .../groovyTraitsWithFields/lib/build.gradle            |  9 +++++++++
 .../{ => lib}/src/main/groovy/MyTrait.groovy           |  0
 .../{ => lib}/src/main/groovy/MyTraitAccessor.groovy   |  0
 .../testProject/groovyTraitsWithFields/settings.gradle |  1 +
 5 files changed, 11 insertions(+), 9 deletions(-)
 create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/groovyTraitsWithFields/lib/build.gradle
 rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/groovyTraitsWithFields/{ => lib}/src/main/groovy/MyTrait.groovy (100%)
 rename libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/groovyTraitsWithFields/{ => lib}/src/main/groovy/MyTraitAccessor.groovy (100%)
 create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/groovyTraitsWithFields/settings.gradle

diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/groovyTraitsWithFields/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/groovyTraitsWithFields/build.gradle
index 18ecef3b403..44f5030c014 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/groovyTraitsWithFields/build.gradle
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/groovyTraitsWithFields/build.gradle
@@ -9,7 +9,6 @@ buildscript {
 }
 
 apply plugin: "kotlin"
-apply plugin: "groovy"
 apply plugin: "java"
 
 repositories {
@@ -19,14 +18,7 @@ repositories {
 
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    compile 'org.codehaus.groovy:groovy-all:2.5.3'
-}
-
-compileGroovy.dependsOn = compileGroovy.taskDependencies.values - 'compileJava'
-
-compileKotlin {
-    dependsOn compileGroovy
-    classpath += files(compileGroovy.destinationDir)
+    compile project(":lib")
 }
 
 compileKotlin {
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/groovyTraitsWithFields/lib/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/groovyTraitsWithFields/lib/build.gradle
new file mode 100644
index 00000000000..7c96c3e8bce
--- /dev/null
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/groovyTraitsWithFields/lib/build.gradle
@@ -0,0 +1,9 @@
+apply plugin: "groovy"
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    compile 'org.codehaus.groovy:groovy-all:2.5.3'
+}
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/groovyTraitsWithFields/src/main/groovy/MyTrait.groovy b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/groovyTraitsWithFields/lib/src/main/groovy/MyTrait.groovy
similarity index 100%
rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/groovyTraitsWithFields/src/main/groovy/MyTrait.groovy
rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/groovyTraitsWithFields/lib/src/main/groovy/MyTrait.groovy
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/groovyTraitsWithFields/src/main/groovy/MyTraitAccessor.groovy b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/groovyTraitsWithFields/lib/src/main/groovy/MyTraitAccessor.groovy
similarity index 100%
rename from libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/groovyTraitsWithFields/src/main/groovy/MyTraitAccessor.groovy
rename to libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/groovyTraitsWithFields/lib/src/main/groovy/MyTraitAccessor.groovy
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/groovyTraitsWithFields/settings.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/groovyTraitsWithFields/settings.gradle
new file mode 100644
index 00000000000..ea3dc068931
--- /dev/null
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/groovyTraitsWithFields/settings.gradle
@@ -0,0 +1 @@
+include ":lib"