Remove unneeded dependency of util on deserialization & reflect

This is probably a result of a somewhat incorrectly merged
6c37574fce.
This commit is contained in:
Alexander Udalov
2020-10-28 20:24:34 +01:00
parent 0d1bb9acaf
commit 8be23df668
3 changed files with 2 additions and 13 deletions
@@ -13,7 +13,7 @@ object JvmAnalysisFlags {
val strictMetadataVersionSemantics by AnalysisFlag.Delegates.Boolean
@JvmStatic
val javaTypeEnhancementState by AnalysisFlag.Delegates.JavaTypeEnhancementStateWarnByDefault
val javaTypeEnhancementState by Delegates.JavaTypeEnhancementStateWarnByDefault
@JvmStatic
val jvmDefaultMode by Delegates.JvmDefaultModeDisabledByDefault
@@ -34,7 +34,7 @@ object JvmAnalysisFlags {
val disableUltraLightClasses by AnalysisFlag.Delegates.Boolean
private object Delegates {
object Jsr305StateWarnByDefault {
object JavaTypeEnhancementStateWarnByDefault {
operator fun provideDelegate(instance: Any?, property: KProperty<*>): AnalysisFlag.Delegate<JavaTypeEnhancementState> =
AnalysisFlag.Delegate(property.name, JavaTypeEnhancementState.DEFAULT)
}
-2
View File
@@ -6,8 +6,6 @@ plugins {
dependencies {
api(kotlinStdlib())
api(project(":compiler:compiler.version"))
compile(project(":core:deserialization"))
compileOnly(project(":kotlin-reflect-api"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) }
@@ -5,7 +5,6 @@
package org.jetbrains.kotlin.config
import org.jetbrains.kotlin.utils.JavaTypeEnhancementState
import kotlin.properties.ReadOnlyProperty
import kotlin.reflect.KProperty
@@ -34,14 +33,6 @@ class AnalysisFlag<out T> internal constructor(
operator fun provideDelegate(instance: Any?, property: KProperty<*>) = Delegate(property.name, ExplicitApiMode.DISABLED)
}
object JavaTypeEnhancementStateWarnByDefault {
operator fun provideDelegate(instance: Any?, property: KProperty<*>) = Delegate(property.name, JavaTypeEnhancementState.DEFAULT)
}
object JvmDefaultModeDisabledByDefault {
operator fun provideDelegate(instance: Any?, property: KProperty<*>) = Delegate(property.name, JvmDefaultMode.DISABLE)
}
object ListOfStrings {
operator fun provideDelegate(instance: Any?, property: KProperty<*>) = Delegate(property.name, emptyList<String>())
}