From 1ba842d47f479386a1ad94929a77c04685bfa95d Mon Sep 17 00:00:00 2001
From: Nikita Skvortsov <nikita.skvortsov@jetbrains.com>
Date: Sat, 8 Mar 2014 16:44:48 +0400
Subject: [PATCH] fix test data

---
 .../com/google/common/base/annotations.xml          | 13 +++----------
 .../com/google/common/base/annotations.xml          | 13 +++----------
 .../com/google/common/base/annotations.xml          | 13 +++----------
 .../com/google/common/base/annotations.xml          | 13 +++----------
 4 files changed, 12 insertions(+), 40 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/alfa/externalAnnotations/com/google/common/base/annotations.xml b/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/alfa/externalAnnotations/com/google/common/base/annotations.xml
index be8ddab04a3..fd541a7e6e5 100644
--- a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/alfa/externalAnnotations/com/google/common/base/annotations.xml
+++ b/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/alfa/externalAnnotations/com/google/common/base/annotations.xml
@@ -1,18 +1,11 @@
 <root>
     <item name='com.google.common.base.Joiner com.google.common.base.Joiner on(java.lang.String)'>
-        <annotation name='jet.runtime.typeinfo.KotlinSignature'>
-            <val name="value" val="&quot;fun on(separator : String?) : Joiner&quot;"/>
-        </annotation>
+        <annotation name="org.jetbrains.annotations.NotNull" />
     </item>
     <item name='com.google.common.base.Joiner com.google.common.base.Joiner.MapJoiner withKeyValueSeparator(java.lang.String)'>
-        <annotation name='jet.runtime.typeinfo.KotlinSignature'>
-            <val name="value"
-                 val="&quot;fun withKeyValueSeparator(keyValueSeparator : String?) : Joiner.MapJoiner?&quot;"/>
-        </annotation>
+        <annotation name="org.jetbrains.annotations.NotNull" />
     </item>
     <item name='com.google.common.base.Joiner com.google.common.base.Joiner skipNulls()'>
-        <annotation name='jet.runtime.typeinfo.KotlinSignature'>
-            <val name="value" val="&quot;fun skipNulls() : Joiner&quot;"/>
-        </annotation>
+        <annotation name="org.jetbrains.annotations.NotNull" />
     </item>
 </root>
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/beta/externalAnnotations/com/google/common/base/annotations.xml b/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/beta/externalAnnotations/com/google/common/base/annotations.xml
index be8ddab04a3..fd541a7e6e5 100644
--- a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/beta/externalAnnotations/com/google/common/base/annotations.xml
+++ b/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/beta/externalAnnotations/com/google/common/base/annotations.xml
@@ -1,18 +1,11 @@
 <root>
     <item name='com.google.common.base.Joiner com.google.common.base.Joiner on(java.lang.String)'>
-        <annotation name='jet.runtime.typeinfo.KotlinSignature'>
-            <val name="value" val="&quot;fun on(separator : String?) : Joiner&quot;"/>
-        </annotation>
+        <annotation name="org.jetbrains.annotations.NotNull" />
     </item>
     <item name='com.google.common.base.Joiner com.google.common.base.Joiner.MapJoiner withKeyValueSeparator(java.lang.String)'>
-        <annotation name='jet.runtime.typeinfo.KotlinSignature'>
-            <val name="value"
-                 val="&quot;fun withKeyValueSeparator(keyValueSeparator : String?) : Joiner.MapJoiner?&quot;"/>
-        </annotation>
+        <annotation name="org.jetbrains.annotations.NotNull" />
     </item>
     <item name='com.google.common.base.Joiner com.google.common.base.Joiner skipNulls()'>
-        <annotation name='jet.runtime.typeinfo.KotlinSignature'>
-            <val name="value" val="&quot;fun skipNulls() : Joiner&quot;"/>
-        </annotation>
+        <annotation name="org.jetbrains.annotations.NotNull" />
     </item>
 </root>
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/delta/externalAnnotations/com/google/common/base/annotations.xml b/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/delta/externalAnnotations/com/google/common/base/annotations.xml
index be8ddab04a3..fd541a7e6e5 100644
--- a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/delta/externalAnnotations/com/google/common/base/annotations.xml
+++ b/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/delta/externalAnnotations/com/google/common/base/annotations.xml
@@ -1,18 +1,11 @@
 <root>
     <item name='com.google.common.base.Joiner com.google.common.base.Joiner on(java.lang.String)'>
-        <annotation name='jet.runtime.typeinfo.KotlinSignature'>
-            <val name="value" val="&quot;fun on(separator : String?) : Joiner&quot;"/>
-        </annotation>
+        <annotation name="org.jetbrains.annotations.NotNull" />
     </item>
     <item name='com.google.common.base.Joiner com.google.common.base.Joiner.MapJoiner withKeyValueSeparator(java.lang.String)'>
-        <annotation name='jet.runtime.typeinfo.KotlinSignature'>
-            <val name="value"
-                 val="&quot;fun withKeyValueSeparator(keyValueSeparator : String?) : Joiner.MapJoiner?&quot;"/>
-        </annotation>
+        <annotation name="org.jetbrains.annotations.NotNull" />
     </item>
     <item name='com.google.common.base.Joiner com.google.common.base.Joiner skipNulls()'>
-        <annotation name='jet.runtime.typeinfo.KotlinSignature'>
-            <val name="value" val="&quot;fun skipNulls() : Joiner&quot;"/>
-        </annotation>
+        <annotation name="org.jetbrains.annotations.NotNull" />
     </item>
 </root>
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/gamma/externalAnnotations/com/google/common/base/annotations.xml b/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/gamma/externalAnnotations/com/google/common/base/annotations.xml
index be8ddab04a3..fd541a7e6e5 100644
--- a/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/gamma/externalAnnotations/com/google/common/base/annotations.xml
+++ b/libraries/tools/kotlin-gradle-plugin-core/src/test/resources/testProject/gamma/externalAnnotations/com/google/common/base/annotations.xml
@@ -1,18 +1,11 @@
 <root>
     <item name='com.google.common.base.Joiner com.google.common.base.Joiner on(java.lang.String)'>
-        <annotation name='jet.runtime.typeinfo.KotlinSignature'>
-            <val name="value" val="&quot;fun on(separator : String?) : Joiner&quot;"/>
-        </annotation>
+        <annotation name="org.jetbrains.annotations.NotNull" />
     </item>
     <item name='com.google.common.base.Joiner com.google.common.base.Joiner.MapJoiner withKeyValueSeparator(java.lang.String)'>
-        <annotation name='jet.runtime.typeinfo.KotlinSignature'>
-            <val name="value"
-                 val="&quot;fun withKeyValueSeparator(keyValueSeparator : String?) : Joiner.MapJoiner?&quot;"/>
-        </annotation>
+        <annotation name="org.jetbrains.annotations.NotNull" />
     </item>
     <item name='com.google.common.base.Joiner com.google.common.base.Joiner skipNulls()'>
-        <annotation name='jet.runtime.typeinfo.KotlinSignature'>
-            <val name="value" val="&quot;fun skipNulls() : Joiner&quot;"/>
-        </annotation>
+        <annotation name="org.jetbrains.annotations.NotNull" />
     </item>
 </root>
\ No newline at end of file