From 1224d28deb3b33726eec129cc47d6b565467c881 Mon Sep 17 00:00:00 2001
From: Victor Petukhov <victor.petukhov@jetbrains.com>
Date: Fri, 9 Jul 2021 10:50:06 +0300
Subject: [PATCH] Move java type enhancement stuff to :core:compiler.common.jvm

---
 compiler/fir/tree/build.gradle.kts                              | 2 +-
 .../kotlin/load/java/JavaNullabilityAnnotationSettings.kt       | 2 --
 .../kotlin/load/java/JavaNullabilityAnnotationsStatus.kt        | 0
 .../org/jetbrains/kotlin/load/java/JavaTypeEnhancementState.kt  | 0
 .../src/org/jetbrains/kotlin/load/java/Jsr305Settings.kt        | 0
 .../src/org/jetbrains/kotlin/load/java/ReportLevel.kt           | 0
 6 files changed, 1 insertion(+), 3 deletions(-)
 rename core/{descriptors.jvm => compiler.common.jvm}/src/org/jetbrains/kotlin/load/java/JavaNullabilityAnnotationSettings.kt (97%)
 rename core/{descriptors.jvm => compiler.common.jvm}/src/org/jetbrains/kotlin/load/java/JavaNullabilityAnnotationsStatus.kt (100%)
 rename core/{descriptors.jvm => compiler.common.jvm}/src/org/jetbrains/kotlin/load/java/JavaTypeEnhancementState.kt (100%)
 rename core/{descriptors.jvm => compiler.common.jvm}/src/org/jetbrains/kotlin/load/java/Jsr305Settings.kt (100%)
 rename core/{descriptors.jvm => compiler.common.jvm}/src/org/jetbrains/kotlin/load/java/ReportLevel.kt (100%)

diff --git a/compiler/fir/tree/build.gradle.kts b/compiler/fir/tree/build.gradle.kts
index 713bdb7d320..2785ddccadb 100644
--- a/compiler/fir/tree/build.gradle.kts
+++ b/compiler/fir/tree/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 }
 
 dependencies {
-    api(project(":core:descriptors.jvm"))
+    api(project(":core:compiler.common.jvm"))
     api(project(":compiler:frontend.common"))
     api(project(":compiler:fir:cones"))
 
diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/JavaNullabilityAnnotationSettings.kt b/core/compiler.common.jvm/src/org/jetbrains/kotlin/load/java/JavaNullabilityAnnotationSettings.kt
similarity index 97%
rename from core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/JavaNullabilityAnnotationSettings.kt
rename to core/compiler.common.jvm/src/org/jetbrains/kotlin/load/java/JavaNullabilityAnnotationSettings.kt
index 96d510f4e43..5262126964f 100644
--- a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/JavaNullabilityAnnotationSettings.kt
+++ b/core/compiler.common.jvm/src/org/jetbrains/kotlin/load/java/JavaNullabilityAnnotationSettings.kt
@@ -8,8 +8,6 @@ package org.jetbrains.kotlin.load.java
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.findValueForMostSpecificFqname
 import org.jetbrains.kotlin.storage.LockBasedStorageManager
-import org.jetbrains.kotlin.storage.MemoizedFunctionToNullable
-import org.jetbrains.kotlin.storage.StorageManager
 
 val JSPECIFY_ANNOTATIONS_PACKAGE = FqName("org.jspecify.nullness")
 val CHECKER_FRAMEWORK_COMPATQUAL_ANNOTATIONS_PACKAGE = FqName("org.checkerframework.checker.nullness.compatqual")
diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/JavaNullabilityAnnotationsStatus.kt b/core/compiler.common.jvm/src/org/jetbrains/kotlin/load/java/JavaNullabilityAnnotationsStatus.kt
similarity index 100%
rename from core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/JavaNullabilityAnnotationsStatus.kt
rename to core/compiler.common.jvm/src/org/jetbrains/kotlin/load/java/JavaNullabilityAnnotationsStatus.kt
diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/JavaTypeEnhancementState.kt b/core/compiler.common.jvm/src/org/jetbrains/kotlin/load/java/JavaTypeEnhancementState.kt
similarity index 100%
rename from core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/JavaTypeEnhancementState.kt
rename to core/compiler.common.jvm/src/org/jetbrains/kotlin/load/java/JavaTypeEnhancementState.kt
diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/Jsr305Settings.kt b/core/compiler.common.jvm/src/org/jetbrains/kotlin/load/java/Jsr305Settings.kt
similarity index 100%
rename from core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/Jsr305Settings.kt
rename to core/compiler.common.jvm/src/org/jetbrains/kotlin/load/java/Jsr305Settings.kt
diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/ReportLevel.kt b/core/compiler.common.jvm/src/org/jetbrains/kotlin/load/java/ReportLevel.kt
similarity index 100%
rename from core/descriptors.jvm/src/org/jetbrains/kotlin/load/java/ReportLevel.kt
rename to core/compiler.common.jvm/src/org/jetbrains/kotlin/load/java/ReportLevel.kt