From 0b10d3a0e9dfd9ad18ad24fc99f17086743e8b63 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 12 Feb 2024 15:00:06 +0100 Subject: [PATCH] Minor, move JavaModuleResolver from frontend.java to frontend.common.jvm To be reused in the K2 checker (KT-60797). --- .../cli/jvm/modules/CliJavaModuleResolver.kt | 1 - .../resolve/jvm/modules/JavaModuleResolver.kt | 15 ++------------- 2 files changed, 2 insertions(+), 14 deletions(-) rename compiler/{frontend.java => frontend.common.jvm}/src/org/jetbrains/kotlin/resolve/jvm/modules/JavaModuleResolver.kt (60%) diff --git a/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/modules/CliJavaModuleResolver.kt b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/modules/CliJavaModuleResolver.kt index 1922e872c02..f65c778763b 100644 --- a/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/modules/CliJavaModuleResolver.kt +++ b/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/modules/CliJavaModuleResolver.kt @@ -29,7 +29,6 @@ import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.resolve.jvm.modules.JavaModule import org.jetbrains.kotlin.resolve.jvm.modules.JavaModuleResolver -import java.util.concurrent.ConcurrentHashMap class CliJavaModuleResolver( private val moduleGraph: JavaModuleGraph, diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/modules/JavaModuleResolver.kt b/compiler/frontend.common.jvm/src/org/jetbrains/kotlin/resolve/jvm/modules/JavaModuleResolver.kt similarity index 60% rename from compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/modules/JavaModuleResolver.kt rename to compiler/frontend.common.jvm/src/org/jetbrains/kotlin/resolve/jvm/modules/JavaModuleResolver.kt index ce280d5ca03..cab175c5fc4 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/modules/JavaModuleResolver.kt +++ b/compiler/frontend.common.jvm/src/org/jetbrains/kotlin/resolve/jvm/modules/JavaModuleResolver.kt @@ -1,17 +1,6 @@ /* - * Copyright 2010-2017 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2010-2024 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ package org.jetbrains.kotlin.resolve.jvm.modules