azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unneeded dependency of util on deserialization & reflect

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
compiler/config.jvm/src/org/jetbrains/kotlin/config/JvmAnalysisFlags.kt
+2 -2
View File
@@ -13,7 +13,7 @@ object JvmAnalysisFlags {
val strictMetadataVersionSemantics by AnalysisFlag.Delegates.Boolean val strictMetadataVersionSemantics by AnalysisFlag.Delegates.Boolean
@JvmStatic @JvmStatic
val javaTypeEnhancementState by AnalysisFlag.Delegates.JavaTypeEnhancementStateWarnByDefault val javaTypeEnhancementState by Delegates.JavaTypeEnhancementStateWarnByDefault
@JvmStatic @JvmStatic
val jvmDefaultMode by Delegates.JvmDefaultModeDisabledByDefault val jvmDefaultMode by Delegates.JvmDefaultModeDisabledByDefault
@@ -34,7 +34,7 @@ object JvmAnalysisFlags {
val disableUltraLightClasses by AnalysisFlag.Delegates.Boolean val disableUltraLightClasses by AnalysisFlag.Delegates.Boolean
private object Delegates { private object Delegates {
object Jsr305StateWarnByDefault { object JavaTypeEnhancementStateWarnByDefault {
operator fun provideDelegate(instance: Any?, property: KProperty<*>): AnalysisFlag.Delegate<JavaTypeEnhancementState> = operator fun provideDelegate(instance: Any?, property: KProperty<*>): AnalysisFlag.Delegate<JavaTypeEnhancementState> =
AnalysisFlag.Delegate(property.name, JavaTypeEnhancementState.DEFAULT) AnalysisFlag.Delegate(property.name, JavaTypeEnhancementState.DEFAULT)
} }
compiler/util/build.gradle.kts
-2
View File
@@ -6,8 +6,6 @@ plugins {
dependencies { dependencies {
api(kotlinStdlib()) api(kotlinStdlib())
api(project(":compiler:compiler.version")) api(project(":compiler:compiler.version"))
compile(project(":core:deserialization"))
compileOnly(project(":kotlin-reflect-api"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") } compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) } compileOnly(intellijDep()) { includeIntellijCoreJarDependencies(project) }
compiler/util/src/org/jetbrains/kotlin/config/AnalysisFlag.kt
-9
View File
@@ -5,7 +5,6 @@
package org.jetbrains.kotlin.config package org.jetbrains.kotlin.config
import org.jetbrains.kotlin.utils.JavaTypeEnhancementState
import kotlin.properties.ReadOnlyProperty import kotlin.properties.ReadOnlyProperty
import kotlin.reflect.KProperty 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) 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 { object ListOfStrings {
operator fun provideDelegate(instance: Any?, property: KProperty<*>) = Delegate(property.name, emptyList<String>()) operator fun provideDelegate(instance: Any?, property: KProperty<*>) = Delegate(property.name, emptyList<String>())
} }