Merge "Add temporary access to XProcessingEnv from XConverters." into androidx-main am: b593167a76
Original change: https://android-review.googlesource.com/c/platform/frameworks/support/+/2115535
Change-Id: Ia7eed0853ced80286dd806d07b61a10028812e37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/room/room-compiler-processing/src/main/java/androidx/room/compiler/processing/compat/XConverters.kt b/room/room-compiler-processing/src/main/java/androidx/room/compiler/processing/compat/XConverters.kt
index 9e18a57..0231e95 100644
--- a/room/room-compiler-processing/src/main/java/androidx/room/compiler/processing/compat/XConverters.kt
+++ b/room/room-compiler-processing/src/main/java/androidx/room/compiler/processing/compat/XConverters.kt
@@ -144,4 +144,24 @@
@JvmStatic
fun TypeMirror.toXProcessing(env: XProcessingEnv): XType =
(env as JavacProcessingEnv).wrap(this, null, null)
+
+ @Deprecated("This will be removed in a future version of XProcessing.")
+ @JvmStatic
+ fun XType.getProcessingEnv(): XProcessingEnv = (this as JavacType).env
+
+ @Deprecated("This will be removed in a future version of XProcessing.")
+ @JvmStatic
+ fun XElement.getProcessingEnv(): XProcessingEnv = (this as JavacElement).env
+
+ @Deprecated("This will be removed in a future version of XProcessing.")
+ @JvmStatic
+ fun XAnnotation.getProcessingEnv(): XProcessingEnv = (this as JavacAnnotation).env
+
+ @Deprecated("This will be removed in a future version of XProcessing.")
+ @JvmStatic
+ fun XAnnotationValue.getProcessingEnv(): XProcessingEnv = (this as JavacAnnotationValue).env
+
+ @Deprecated("This will be removed in a future version of XProcessing.")
+ @JvmStatic
+ fun XExecutableType.getProcessingEnv(): XProcessingEnv = (this as JavacExecutableType).env
}
\ No newline at end of file
diff --git a/room/room-compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacElement.kt b/room/room-compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacElement.kt
index 0d847a7..ff96b7e 100644
--- a/room/room-compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacElement.kt
+++ b/room/room-compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacElement.kt
@@ -31,7 +31,7 @@
@Suppress("UnstableApiUsage")
internal abstract class JavacElement(
- protected val env: JavacProcessingEnv,
+ internal val env: JavacProcessingEnv,
open val element: Element
) : XElement, XEquality, InternalXAnnotated {
override fun <T : Annotation> getAnnotations(
diff --git a/room/room-compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacType.kt b/room/room-compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacType.kt
index 5a9ae9e..3526dc96 100644
--- a/room/room-compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacType.kt
+++ b/room/room-compiler-processing/src/main/java/androidx/room/compiler/processing/javac/JavacType.kt
@@ -31,7 +31,7 @@
import kotlin.reflect.KClass
internal abstract class JavacType(
- protected val env: JavacProcessingEnv,
+ internal val env: JavacProcessingEnv,
open val typeMirror: TypeMirror,
private val maybeNullability: XNullability?,
) : XType, XEquality {
