From 941437a9a2ddd1eff78e6b133c8e70fba8575456 Mon Sep 17 00:00:00 2001
From: Alexey Tsvetkov <alexey.tsvetkov@jetbrains.com>
Date: Thu, 14 Jul 2016 16:43:32 +0300
Subject: [PATCH] Correct test case for KT-12776

After minifying test, it stopped failing without fix
---
 .../{lib-b => aaa}/build.gradle                            | 0
 .../{lib-b => aaa}/src/main/AndroidManifest.xml            | 0
 .../aaa/src/main/res/values/styles.xml                     | 4 ++++
 .../AndroidKaptChangingDependencies/app/build.gradle       | 2 +-
 .../app/src/main/AndroidManifest.xml                       | 5 ++++-
 .../app/src/main/res/values/styles.xml                     | 7 +++++++
 .../lib-a/src/main/res/values/styles.xml                   | 4 ++++
 .../AndroidKaptChangingDependencies/settings.gradle        | 2 +-
 8 files changed, 21 insertions(+), 3 deletions(-)
 rename libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidKaptChangingDependencies/{lib-b => aaa}/build.gradle (100%)
 rename libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidKaptChangingDependencies/{lib-b => aaa}/src/main/AndroidManifest.xml (100%)
 create mode 100644 libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidKaptChangingDependencies/aaa/src/main/res/values/styles.xml
 create mode 100644 libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidKaptChangingDependencies/app/src/main/res/values/styles.xml
 create mode 100644 libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidKaptChangingDependencies/lib-a/src/main/res/values/styles.xml

diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidKaptChangingDependencies/lib-b/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidKaptChangingDependencies/aaa/build.gradle
similarity index 100%
rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidKaptChangingDependencies/lib-b/build.gradle
rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidKaptChangingDependencies/aaa/build.gradle
diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidKaptChangingDependencies/lib-b/src/main/AndroidManifest.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidKaptChangingDependencies/aaa/src/main/AndroidManifest.xml
similarity index 100%
rename from libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidKaptChangingDependencies/lib-b/src/main/AndroidManifest.xml
rename to libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidKaptChangingDependencies/aaa/src/main/AndroidManifest.xml
diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidKaptChangingDependencies/aaa/src/main/res/values/styles.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidKaptChangingDependencies/aaa/src/main/res/values/styles.xml
new file mode 100644
index 00000000000..7660f81682e
--- /dev/null
+++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidKaptChangingDependencies/aaa/src/main/res/values/styles.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="Test.Inherited" />
+</resources>
diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidKaptChangingDependencies/app/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidKaptChangingDependencies/app/build.gradle
index 7c191b97468..d8db018fd59 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidKaptChangingDependencies/app/build.gradle
+++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidKaptChangingDependencies/app/build.gradle
@@ -19,7 +19,7 @@ android {
 }
 
 dependencies {
-    compile project(':lib-b')
+    compile project(':aaa')
     kapt "com.squareup.dagger:dagger-compiler:$dagger_version"
 }
 
diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidKaptChangingDependencies/app/src/main/AndroidManifest.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidKaptChangingDependencies/app/src/main/AndroidManifest.xml
index 7dc2669b3ce..819bc78947c 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidKaptChangingDependencies/app/src/main/AndroidManifest.xml
+++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidKaptChangingDependencies/app/src/main/AndroidManifest.xml
@@ -1,3 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.example.kapt">
-    <application />
+
+    <application
+            android:theme="@style/AppTheme">
+    </application>
 </manifest>
diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidKaptChangingDependencies/app/src/main/res/values/styles.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidKaptChangingDependencies/app/src/main/res/values/styles.xml
new file mode 100644
index 00000000000..37eb350b9b7
--- /dev/null
+++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidKaptChangingDependencies/app/src/main/res/values/styles.xml
@@ -0,0 +1,7 @@
+<resources>
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+    </style>
+
+    <style name="Test.Inherited.Twice" />
+</resources>
diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidKaptChangingDependencies/lib-a/src/main/res/values/styles.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidKaptChangingDependencies/lib-a/src/main/res/values/styles.xml
new file mode 100644
index 00000000000..c671b82499e
--- /dev/null
+++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidKaptChangingDependencies/lib-a/src/main/res/values/styles.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="Test" />
+</resources>
diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidKaptChangingDependencies/settings.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidKaptChangingDependencies/settings.gradle
index 6376f8c01c7..515d9ede3c0 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidKaptChangingDependencies/settings.gradle
+++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidKaptChangingDependencies/settings.gradle
@@ -1 +1 @@
-include ':app', ':lib-a', ':lib-b'
\ No newline at end of file
+include ':app', ':lib-a', ':aaa'
\ No newline at end of file