diff options
| author | Liam Miller-Cushon <cushon@google.com> | 2018-09-28 19:56:16 -0700 |
|---|---|---|
| committer | Liam Miller-Cushon <cushon@google.com> | 2018-10-01 11:45:14 -0700 |
| commit | 8020b107ba4441370ccd5ed6f6cbbd2ff262ce97 (patch) | |
| tree | 0b27ecf18339da7ca2b9a3c67c98d007182d9e42 /compiler/src/main/kotlin/android/databinding | |
| parent | d1bd820344c2bd5d4c5e7a1900d192aa711c09f1 (diff) | |
| download | data-binding-8020b107ba4441370ccd5ed6f6cbbd2ff262ce97.tar.gz | |
Avoid static references to @javax.annotation.Generated
In JDK 9, javax.annotation.Generated is no longer available by default,
see: https://bugs.openjdk.java.net/browse/JDK-8175013.
The replacement for Java 9 and up is:
https://docs.oracle.com/javase/9/docs/api/javax/annotation/processing/Generated.html
Bug: 115943858
Test: existing
Change-Id: I9997a2fa4cd5c1f89946daceddf490a5cbfcf335
Diffstat (limited to 'compiler/src/main/kotlin/android/databinding')
| -rw-r--r-- | compiler/src/main/kotlin/android/databinding/tool/writer/BRWriter.kt | 4 | ||||
| -rw-r--r-- | compiler/src/main/kotlin/android/databinding/tool/writer/BindingMapperWriterV2.kt | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/compiler/src/main/kotlin/android/databinding/tool/writer/BRWriter.kt b/compiler/src/main/kotlin/android/databinding/tool/writer/BRWriter.kt index bc1bfa66..cae0efb1 100644 --- a/compiler/src/main/kotlin/android/databinding/tool/writer/BRWriter.kt +++ b/compiler/src/main/kotlin/android/databinding/tool/writer/BRWriter.kt @@ -23,9 +23,9 @@ import android.databinding.tool.reflection.ModelAnalyzer import com.squareup.javapoet.AnnotationSpec import com.squareup.javapoet.FieldSpec import com.squareup.javapoet.JavaFile +import com.squareup.javapoet.ClassName import com.squareup.javapoet.TypeName import com.squareup.javapoet.TypeSpec -import javax.annotation.Generated import javax.lang.model.element.Modifier class BRWriter(private val useFinal : Boolean) { @@ -33,7 +33,7 @@ class BRWriter(private val useFinal : Boolean) { val spec = TypeSpec.classBuilder("BR").apply { addModifiers(Modifier.PUBLIC) if (ModelAnalyzer.getInstance().hasGeneratedAnnotation()) { - addAnnotation(AnnotationSpec.builder(Generated::class.java) + addAnnotation(AnnotationSpec.builder(ClassName.get("javax.annotation", "Generated")) .addMember("value", S,"Android Data Binding").build()) } values.props.forEach { diff --git a/compiler/src/main/kotlin/android/databinding/tool/writer/BindingMapperWriterV2.kt b/compiler/src/main/kotlin/android/databinding/tool/writer/BindingMapperWriterV2.kt index d61d03ca..6089e65a 100644 --- a/compiler/src/main/kotlin/android/databinding/tool/writer/BindingMapperWriterV2.kt +++ b/compiler/src/main/kotlin/android/databinding/tool/writer/BindingMapperWriterV2.kt @@ -37,7 +37,6 @@ import com.squareup.javapoet.TypeName import com.squareup.javapoet.TypeSpec import java.util.HashMap import java.util.Locale -import javax.annotation.Generated import javax.lang.model.element.Modifier class BindingMapperWriterV2(genClassInfoLog: GenClassInfoLog, @@ -163,9 +162,8 @@ class BindingMapperWriterV2(genClassInfoLog: GenClassInfoLog, superclass(dataBinderMapper) addModifiers(Modifier.PUBLIC) if (ModelAnalyzer.getInstance().hasGeneratedAnnotation()) { - addAnnotation(AnnotationSpec.builder(Generated::class.java).apply { - addMember("value", S, "Android Data Binding") - }.build()) + addAnnotation(AnnotationSpec.builder(ClassName.get("javax.annotation", "Generated")) + .addMember("value", S, "Android Data Binding").build()) } addMethods(generateGetViewDataBinder()) addMethod(generateGetViewArrayDataBinder()) |