From 79e7c5bd7b87011fc2ab4e5a388f1359698bd9d2 Mon Sep 17 00:00:00 2001
From: Nikita Skvortsov <nikita.skvortsov@jetbrains.com>
Date: Fri, 12 Jul 2013 18:16:43 +0400
Subject: [PATCH] test external annotations

---
 .../testProject/AndroidAlfaProject/AndroidAlfa/build.gradle  | 4 ++++
 .../kotlin/gradle/test/androidalfa/MainActivity2.kt          | 2 +-
 .../kotlinAnnotations/android/app/annotations.xml            | 5 +++++
 3 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/kotlinAnnotations/android/app/annotations.xml

diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/build.gradle
index c8ad63a7d80..ecaea3c8db6 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/build.gradle
+++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/build.gradle
@@ -21,6 +21,10 @@ android {
     compileSdkVersion 17
     buildToolsVersion "17.0.0"
 
+    kotlinOptions {
+        annotations = "kotlinAnnotations"
+    }
+
     defaultConfig {
         minSdkVersion 7
         targetSdkVersion 16
diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/kotlin/org/jetbrains/kotlin/gradle/test/androidalfa/MainActivity2.kt b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/kotlin/org/jetbrains/kotlin/gradle/test/androidalfa/MainActivity2.kt
index 34bfd66f5d9..06d9cb69f92 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/kotlin/org/jetbrains/kotlin/gradle/test/androidalfa/MainActivity2.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/AndroidAlfa/src/main/kotlin/org/jetbrains/kotlin/gradle/test/androidalfa/MainActivity2.kt
@@ -26,7 +26,7 @@ open class MainActivity2: Activity() {
 
     public override fun onCreateOptionsMenu(menu: Menu?): Boolean {
         // Inflate the menu; this adds items to the action bar if it is present.
-        getMenuInflater()?.inflate(R.menu.main_activity2, menu);
+        getMenuInflater().inflate(R.menu.main_activity2, menu);
         return true
     }
     
diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/kotlinAnnotations/android/app/annotations.xml b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/kotlinAnnotations/android/app/annotations.xml
new file mode 100644
index 00000000000..480db34155f
--- /dev/null
+++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/AndroidAlfaProject/kotlinAnnotations/android/app/annotations.xml
@@ -0,0 +1,5 @@
+<root>
+    <item name='android.app.Activity android.view.MenuInflater getMenuInflater()'>
+        <annotation name='org.jetbrains.annotations.NotNull'/>
+    </item>
+</root>