From 9783a31779e660d050dec7f1ba1544d5644d4592 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Thu, 13 Apr 2017 22:21:51 +0300 Subject: [PATCH] Remove kotlin-reflect.jar dependency from util module and move reflectionUtil.kt closer to "clients" Main goal is get rid of kotlin-reflect.jar from modules what required for minimal compiler.jar which can compile Kotlin only to JS to make it smaller. --- compiler/cli/cli-common/cli-common.iml | 1 + .../cli/common/repl/KotlinJsr223JvmInvocableScriptEngine.kt | 4 ++-- .../kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.kt | 4 ++-- .../src/org/jetbrains/kotlin/script}/reflectionUtil.kt | 4 ++-- .../kotlin/script/scriptAnnotationsPreprocessing.kt | 1 - .../org/jetbrains/kotlin/scripts/ScriptTemplateTest.kt | 4 ++-- compiler/tests/org/jetbrains/kotlin/scripts/ScriptTest.kt | 4 ++-- .../org/jetbrains/kotlin/util/ArgsToParamsMatchingTest.kt | 6 +++--- compiler/util/util.iml | 1 - .../org/jetbrains/kotlin/maven/ExecuteKotlinScriptMojo.java | 4 ++-- .../source-sections-compiler/source-sections-compiler.iml | 1 + .../jetbrains/kotlin/sourceSections/SourceSectionsTest.kt | 2 +- 12 files changed, 18 insertions(+), 18 deletions(-) rename compiler/{util/src/org/jetbrains/kotlin/utils => frontend.script/src/org/jetbrains/kotlin/script}/reflectionUtil.kt (99%) diff --git a/compiler/cli/cli-common/cli-common.iml b/compiler/cli/cli-common/cli-common.iml index a1c5121d684..ff47b07bca9 100644 --- a/compiler/cli/cli-common/cli-common.iml +++ b/compiler/cli/cli-common/cli-common.iml @@ -12,5 +12,6 @@ + \ No newline at end of file diff --git a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/repl/KotlinJsr223JvmInvocableScriptEngine.kt b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/repl/KotlinJsr223JvmInvocableScriptEngine.kt index 75a934ceff4..727e47ce520 100644 --- a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/repl/KotlinJsr223JvmInvocableScriptEngine.kt +++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/repl/KotlinJsr223JvmInvocableScriptEngine.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2016 JetBrains s.r.o. + * 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. @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.cli.common.repl -import org.jetbrains.kotlin.utils.tryCreateCallableMapping +import org.jetbrains.kotlin.script.tryCreateCallableMapping import java.lang.reflect.Proxy import javax.script.Invocable import javax.script.ScriptException diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.kt index a73086fdeb4..32236e75146 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2016 JetBrains s.r.o. + * 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. @@ -62,7 +62,7 @@ import org.jetbrains.kotlin.util.PerformanceCounter import org.jetbrains.kotlin.utils.KotlinPaths import org.jetbrains.kotlin.utils.PathUtil import org.jetbrains.kotlin.utils.newLinkedHashMapWithExpectedSize -import org.jetbrains.kotlin.utils.tryConstructClassFromStringArgs +import org.jetbrains.kotlin.script.tryConstructClassFromStringArgs import java.io.File import java.io.IOException import java.lang.reflect.InvocationTargetException diff --git a/compiler/util/src/org/jetbrains/kotlin/utils/reflectionUtil.kt b/compiler/frontend.script/src/org/jetbrains/kotlin/script/reflectionUtil.kt similarity index 99% rename from compiler/util/src/org/jetbrains/kotlin/utils/reflectionUtil.kt rename to compiler/frontend.script/src/org/jetbrains/kotlin/script/reflectionUtil.kt index 8c255b38c3e..a496bab472f 100644 --- a/compiler/util/src/org/jetbrains/kotlin/utils/reflectionUtil.kt +++ b/compiler/frontend.script/src/org/jetbrains/kotlin/script/reflectionUtil.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2016 JetBrains s.r.o. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.utils +package org.jetbrains.kotlin.script import org.jetbrains.kotlin.utils.addToStdlib.firstNotNullResult import kotlin.reflect.* diff --git a/compiler/frontend.script/src/org/jetbrains/kotlin/script/scriptAnnotationsPreprocessing.kt b/compiler/frontend.script/src/org/jetbrains/kotlin/script/scriptAnnotationsPreprocessing.kt index 41d445a76eb..fe57e2eef9a 100644 --- a/compiler/frontend.script/src/org/jetbrains/kotlin/script/scriptAnnotationsPreprocessing.kt +++ b/compiler/frontend.script/src/org/jetbrains/kotlin/script/scriptAnnotationsPreprocessing.kt @@ -23,7 +23,6 @@ import org.jetbrains.kotlin.psi.KtUserType import org.jetbrains.kotlin.resolve.BindingTraceContext import org.jetbrains.kotlin.resolve.constants.evaluate.ConstantExpressionEvaluator import org.jetbrains.kotlin.types.TypeUtils -import org.jetbrains.kotlin.utils.tryCreateCallableMappingFromNamedArgs import kotlin.reflect.KClass import kotlin.reflect.KParameter import kotlin.reflect.full.primaryConstructor diff --git a/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTemplateTest.kt b/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTemplateTest.kt index 4b47687f857..14015444cda 100644 --- a/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTemplateTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTemplateTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2016 JetBrains s.r.o. + * 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. @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.scripts import com.intellij.openapi.util.Disposer import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys import org.jetbrains.kotlin.cli.common.messages.* -import org.jetbrains.kotlin.utils.tryConstructClassFromStringArgs +import org.jetbrains.kotlin.script.tryConstructClassFromStringArgs import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment import org.jetbrains.kotlin.cli.jvm.compiler.KotlinToJVMBytecodeCompiler diff --git a/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTest.kt b/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTest.kt index 0b0c81b2504..2ad485d56d0 100644 --- a/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2016 JetBrains s.r.o. + * 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. @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.scripts import com.intellij.openapi.util.Disposer import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys import org.jetbrains.kotlin.cli.common.messages.* -import org.jetbrains.kotlin.utils.tryConstructClassFromStringArgs +import org.jetbrains.kotlin.script.tryConstructClassFromStringArgs import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment import org.jetbrains.kotlin.cli.jvm.compiler.KotlinToJVMBytecodeCompiler diff --git a/compiler/tests/org/jetbrains/kotlin/util/ArgsToParamsMatchingTest.kt b/compiler/tests/org/jetbrains/kotlin/util/ArgsToParamsMatchingTest.kt index fbd248cff87..de13befd5cb 100644 --- a/compiler/tests/org/jetbrains/kotlin/util/ArgsToParamsMatchingTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/util/ArgsToParamsMatchingTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2016 JetBrains s.r.o. + * 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. @@ -18,8 +18,8 @@ package org.jetbrains.kotlin.util -import org.jetbrains.kotlin.utils.tryCreateCallableMappingFromNamedArgs -import org.jetbrains.kotlin.utils.tryCreateCallableMappingFromStringArgs +import org.jetbrains.kotlin.script.tryCreateCallableMappingFromNamedArgs +import org.jetbrains.kotlin.script.tryCreateCallableMappingFromStringArgs import org.junit.Assert import org.junit.Test import kotlin.reflect.KParameter diff --git a/compiler/util/util.iml b/compiler/util/util.iml index f9656a0d7ae..583f37f69eb 100644 --- a/compiler/util/util.iml +++ b/compiler/util/util.iml @@ -9,7 +9,6 @@ - diff --git a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/ExecuteKotlinScriptMojo.java b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/ExecuteKotlinScriptMojo.java index 1738772a417..e70cfd9da37 100644 --- a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/ExecuteKotlinScriptMojo.java +++ b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/ExecuteKotlinScriptMojo.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2016 JetBrains s.r.o. + * 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. @@ -35,7 +35,7 @@ import org.apache.maven.plugins.annotations.ResolutionScope; import org.apache.maven.project.MavenProject; import org.codehaus.plexus.component.repository.ComponentDependency; import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys; -import org.jetbrains.kotlin.utils.ReflectionUtilKt; +import org.jetbrains.kotlin.script.ReflectionUtilKt; import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler; import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment; diff --git a/plugins/source-sections/source-sections-compiler/source-sections-compiler.iml b/plugins/source-sections/source-sections-compiler/source-sections-compiler.iml index 438a541ddcf..eac84a8ad03 100644 --- a/plugins/source-sections/source-sections-compiler/source-sections-compiler.iml +++ b/plugins/source-sections/source-sections-compiler/source-sections-compiler.iml @@ -19,5 +19,6 @@ + \ No newline at end of file diff --git a/plugins/source-sections/source-sections-compiler/tests/org/jetbrains/kotlin/sourceSections/SourceSectionsTest.kt b/plugins/source-sections/source-sections-compiler/tests/org/jetbrains/kotlin/sourceSections/SourceSectionsTest.kt index b22846f2cbd..ffa662ccbab 100644 --- a/plugins/source-sections/source-sections-compiler/tests/org/jetbrains/kotlin/sourceSections/SourceSectionsTest.kt +++ b/plugins/source-sections/source-sections-compiler/tests/org/jetbrains/kotlin/sourceSections/SourceSectionsTest.kt @@ -32,13 +32,13 @@ import org.jetbrains.kotlin.daemon.client.DaemonReportingTargets import org.jetbrains.kotlin.daemon.client.KotlinCompilerClient import org.jetbrains.kotlin.daemon.common.* import org.jetbrains.kotlin.script.StandardScriptDefinition +import org.jetbrains.kotlin.script.tryConstructClassFromStringArgs import org.jetbrains.kotlin.test.ConfigurationKind import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.TestCaseWithTmpdir import org.jetbrains.kotlin.test.TestJdkKind import org.jetbrains.kotlin.utils.KotlinPaths import org.jetbrains.kotlin.utils.PathUtil -import org.jetbrains.kotlin.utils.tryConstructClassFromStringArgs import java.io.* import java.lang.management.ManagementFactory import java.net.URLClassLoader