From 0104ffe5e89d768321395d2387a445d809237103 Mon Sep 17 00:00:00 2001 From: Lukas Rytz Date: Wed, 8 Jul 2020 11:28:35 +0200 Subject: [PATCH] Fix JavaUniverseForce --- src/reflect/scala/reflect/internal/Definitions.scala | 4 ++-- src/reflect/scala/reflect/runtime/JavaUniverseForce.scala | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/reflect/scala/reflect/internal/Definitions.scala b/src/reflect/scala/reflect/internal/Definitions.scala index 0a2402d55b74..2f3259f4b9ef 100644 --- a/src/reflect/scala/reflect/internal/Definitions.scala +++ b/src/reflect/scala/reflect/internal/Definitions.scala @@ -1280,8 +1280,8 @@ trait Definitions extends api.StandardDefinitions { lazy val uncheckedVarianceClass = requiredClass[scala.annotation.unchecked.uncheckedVariance] // Tasty Unpickling Helpers - only access when Scala 3 library is expected to be available - lazy val ChildAnnotationClass = getRequiredClass("scala.annotation.internal.Child") - lazy val RepeatedAnnotationClass = getRequiredClass("scala.annotation.internal.Repeated") + lazy val ChildAnnotationClass = getClassIfDefined("scala.annotation.internal.Child") + lazy val RepeatedAnnotationClass = getClassIfDefined("scala.annotation.internal.Repeated") lazy val BeanPropertyAttr = requiredClass[scala.beans.BeanProperty] lazy val BooleanBeanPropertyAttr = requiredClass[scala.beans.BooleanBeanProperty] diff --git a/src/reflect/scala/reflect/runtime/JavaUniverseForce.scala b/src/reflect/scala/reflect/runtime/JavaUniverseForce.scala index 3151acb716fc..cc3f98ef4d30 100644 --- a/src/reflect/scala/reflect/runtime/JavaUniverseForce.scala +++ b/src/reflect/scala/reflect/runtime/JavaUniverseForce.scala @@ -425,6 +425,8 @@ trait JavaUniverseForce { self: runtime.JavaUniverse => definitions.NowarnClass definitions.uncheckedStableClass definitions.uncheckedVarianceClass + definitions.ChildAnnotationClass + definitions.RepeatedAnnotationClass definitions.BeanPropertyAttr definitions.BooleanBeanPropertyAttr definitions.CompileTimeOnlyAttr