azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Kapt: Always use raw types for annotation parameter types (KT-30346)"

Browse Source 
This reverts commit 66754e62
This commit is contained in:
Yan Zhulanow
2019-04-22 16:15:43 +03:00
parent 9a5bbcb00b
commit a0778ad703
10 changed files with 11 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/kapt3/kapt3-compiler/testData/converter/annotations.txt
Vendored
+2 -2
View File
@@ -28,9 +28,9 @@ public abstract @interface Anno2 {
public abstract Colors[] colors() default {Colors.BLACK, Colors.WHITE};
public abstract java.lang.Class clazz();
public abstract java.lang.Class<?> clazz();
public abstract java.lang.Class[] classes();
public abstract java.lang.Class<?>[] classes();
}
////////////////////
plugins/kapt3/kapt3-compiler/testData/converter/errorLocationMapping.txt
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ import kotlin.reflect.KClass;
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
public abstract @interface Anno {
public abstract java.lang.Class a();
public abstract java.lang.Class<java.lang.Object> a();
}
////////////////////
plugins/kapt3/kapt3-compiler/testData/converter/nestedClasses2.txt
Vendored
+1 -1
View File
@@ -159,7 +159,7 @@ public abstract interface IFoo {
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
public static abstract @interface Anno {
public abstract java.lang.Class[] value();
public abstract java.lang.Class<?>[] value();
}
@kotlin.Metadata()
plugins/kapt3/kapt3-compiler/testData/converter/nestedClassesNonRootPackage.txt
Vendored
+1 -1
View File
@@ -164,7 +164,7 @@ public abstract interface IFoo {
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
public static abstract @interface Anno {
public abstract java.lang.Class[] value();
public abstract java.lang.Class<?>[] value();
}
@kotlin.Metadata()
plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassTypesConversion.txt
Vendored
+4 -4
View File
@@ -5,13 +5,13 @@ import kotlin.reflect.KClass;
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
public abstract @interface Anno {
public abstract java.lang.Class a();
public abstract java.lang.Class<?> a();
public abstract java.lang.Class[] b();
public abstract java.lang.Class<?>[] b();
public abstract java.lang.Class[] c();
public abstract java.lang.Class<?>[] c();
public abstract java.lang.Class[] d();
public abstract java.lang.Class<?>[] d();
}
////////////////////
plugins/kapt3/kapt3-compiler/testData/converter/outProjection.kt
Vendored
-10
View File
@@ -1,10 +0,0 @@
import kotlin.reflect.KClass;
annotation class Anno(val baseClass: KClass<out Intf<*, *, *>>)
interface Intf<S, R, A>
abstract class Base<S, R, A> : Intf<S, R, A>
@Anno(baseClass = Base::class)
interface Impl
plugins/kapt3/kapt3-compiler/testData/converter/outProjection.txt
Vendored
-40
View File
@@ -1,40 +0,0 @@
import java.lang.System;
@kotlin.Metadata()
@java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME)
public abstract @interface Anno {
public abstract java.lang.Class baseClass();
}
////////////////////
import java.lang.System;
@kotlin.Metadata()
public abstract class Base<S extends java.lang.Object, R extends java.lang.Object, A extends java.lang.Object> implements Intf<S, R, A> {
public Base() {
super();
}
}
////////////////////
import java.lang.System;
@kotlin.Metadata()
@Anno(baseClass = Base.class)
public abstract interface Impl {
}
////////////////////
import java.lang.System;
@kotlin.Metadata()
public abstract interface Intf<S extends java.lang.Object, R extends java.lang.Object, A extends java.lang.Object> {
}
plugins/kapt3/kapt3-compiler/testData/converter/repeatableAnnotations.txt
Vendored
+1 -1
View File
@@ -48,7 +48,7 @@ public abstract @interface AnnoClass {
public abstract int x();
public abstract java.lang.Class c();
public abstract java.lang.Class<Color> c();
}
////////////////////