diff options
| author | Zac Sweers <zac.sweers@gmail.com> | 2021-10-15 11:29:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-15 11:29:18 -0400 |
| commit | 43de7084390504c637f9d12c8beab51aa4c0e388 (patch) | |
| tree | 6fd413419842036510e77576dd0d30793fa6bab7 /interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet | |
| parent | aee95d06e32897c8edcbfecbb3d8758c72982abc (diff) | |
| download | kotlinpoet-43de7084390504c637f9d12c8beab51aa4c0e388.tar.gz | |
Ignore java deprecated annotations on synthetic methods for annotations (#1167)
Diffstat (limited to 'interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet')
3 files changed, 7 insertions, 0 deletions
diff --git a/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/classinspectors/ClassInspectorUtil.kt b/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/classinspectors/ClassInspectorUtil.kt index 7b935afd..7fb594b6 100644 --- a/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/classinspectors/ClassInspectorUtil.kt +++ b/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/classinspectors/ClassInspectorUtil.kt @@ -54,6 +54,7 @@ internal object ClassInspectorUtil { internal val JVM_FIELD_SPEC = AnnotationSpec.builder(JVM_FIELD).build() internal val JVM_SYNTHETIC = JvmSynthetic::class.asClassName() internal val JVM_SYNTHETIC_SPEC = AnnotationSpec.builder(JVM_SYNTHETIC).build() + internal val JAVA_DEPRECATED = java.lang.Deprecated::class.asClassName() private val JVM_TRANSIENT = Transient::class.asClassName() private val JVM_VOLATILE = Volatile::class.asClassName() private val IMPLICIT_FIELD_ANNOTATIONS = setOf( diff --git a/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/classinspectors/ElementsClassInspector.kt b/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/classinspectors/ElementsClassInspector.kt index 0cc9ce0c..3dbcaf2d 100644 --- a/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/classinspectors/ElementsClassInspector.kt +++ b/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/classinspectors/ElementsClassInspector.kt @@ -28,6 +28,7 @@ import com.squareup.kotlinpoet.TypeName import com.squareup.kotlinpoet.asClassName import com.squareup.kotlinpoet.asTypeName import com.squareup.kotlinpoet.metadata.KotlinPoetMetadataPreview +import com.squareup.kotlinpoet.metadata.classinspectors.ClassInspectorUtil.JAVA_DEPRECATED import com.squareup.kotlinpoet.metadata.classinspectors.ClassInspectorUtil.JVM_NAME import com.squareup.kotlinpoet.metadata.classinspectors.ClassInspectorUtil.filterOutNullabilityAnnotations import com.squareup.kotlinpoet.metadata.hasAnnotations @@ -421,6 +422,8 @@ public class ElementsClassInspector private constructor( val method = typeElement.lookupMethod(annotationsHolderSignature, ElementFilter::methodsIn) ?: return@let MethodData.SYNTHETIC annotations += method.annotationSpecs() + // Cover for https://github.com/square/kotlinpoet/issues/1046 + .filterNot { it.typeName == JAVA_DEPRECATED } } } diff --git a/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/classinspectors/ReflectiveClassInspector.kt b/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/classinspectors/ReflectiveClassInspector.kt index 39a2babb..15ccb007 100644 --- a/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/classinspectors/ReflectiveClassInspector.kt +++ b/interop/kotlinx-metadata/src/main/kotlin/com/squareup/kotlinpoet/metadata/classinspectors/ReflectiveClassInspector.kt @@ -22,6 +22,7 @@ import com.squareup.kotlinpoet.CodeBlock import com.squareup.kotlinpoet.TypeName import com.squareup.kotlinpoet.asTypeName import com.squareup.kotlinpoet.metadata.KotlinPoetMetadataPreview +import com.squareup.kotlinpoet.metadata.classinspectors.ClassInspectorUtil.JAVA_DEPRECATED import com.squareup.kotlinpoet.metadata.classinspectors.ClassInspectorUtil.filterOutNullabilityAnnotations import com.squareup.kotlinpoet.metadata.hasAnnotations import com.squareup.kotlinpoet.metadata.hasConstant @@ -415,6 +416,8 @@ public class ReflectiveClassInspector private constructor( " found in $targetClass." ) annotations += method.annotationSpecs() + // Cover for https://github.com/square/kotlinpoet/issues/1046 + .filterNot { it.typeName == JAVA_DEPRECATED } } } |