From 2e393e8fb75a338b096979ba0326f63cce188682 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Tue, 2 May 2023 16:35:03 +0200 Subject: [PATCH] Stop publishing obsolete kotlin-script-util #KT-58366 fixed --- build.gradle.kts | 1 - compiler/build.gradle.kts | 1 - gradle/jps.gradle.kts | 1 - .../script/examples/jvm/resolve/maven/scriptDef.kt | 2 +- libraries/tools/kotlin-bom/pom.xml | 5 ----- libraries/tools/kotlin-main-kts/main-kts.pro | 3 --- libraries/tools/kotlin-maven-plugin-test/pom.xml | 1 - .../test-executeKotlinScriptWithTemplate/pom.xml | 14 ++------------ .../script.kts | 2 +- .../tools/kotlin-script-util/build.gradle.kts | 2 -- 10 files changed, 4 insertions(+), 28 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index e0219501a7b..ac6e70ff8d6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -313,7 +313,6 @@ extra["compilerArtifactsForIde"] = listOfNotNull( ":prepare:ide-plugin-dependencies:kotlin-compiler-fir-for-ide", ":prepare:kotlin-jps-plugin", ":kotlin-script-runtime", - ":kotlin-script-util", ":kotlin-scripting-common", ":kotlin-scripting-jvm", ":kotlin-scripting-compiler", diff --git a/compiler/build.gradle.kts b/compiler/build.gradle.kts index c3d05833f41..d8c37381327 100644 --- a/compiler/build.gradle.kts +++ b/compiler/build.gradle.kts @@ -28,7 +28,6 @@ dependencies { testApi(project(":compiler:ir.ir2cfg")) testApi(project(":compiler:ir.tree")) // used for deepCopyWithSymbols call that is removed by proguard from the compiler TODO: make it more straightforward testApi(project(":kotlin-scripting-compiler")) - testApi(project(":kotlin-script-util")) otherCompilerModules.forEach { testCompileOnly(project(it)) diff --git a/gradle/jps.gradle.kts b/gradle/jps.gradle.kts index dedbc5b75d7..a065350b693 100644 --- a/gradle/jps.gradle.kts +++ b/gradle/jps.gradle.kts @@ -54,7 +54,6 @@ fun updateCompilerXml() { "libraries/tools/kotlin-prepush-hook", "libraries/tools/kotlin-project-model", "libraries/tools/kotlin-sam-with-receiver", - "libraries/tools/kotlin-script-util", "libraries/tools/kotlin-serialization", "libraries/tools/kotlin-serialization-unshaded", "libraries/tools/kotlin-stdlib-docs", diff --git a/libraries/examples/scripting/jvm-maven-deps/script/src/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/scriptDef.kt b/libraries/examples/scripting/jvm-maven-deps/script/src/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/scriptDef.kt index b467bff433e..6c021e02c1a 100644 --- a/libraries/examples/scripting/jvm-maven-deps/script/src/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/scriptDef.kt +++ b/libraries/examples/scripting/jvm-maven-deps/script/src/org/jetbrains/kotlin/script/examples/jvm/resolve/maven/scriptDef.kt @@ -26,7 +26,7 @@ object ScriptWithMavenDepsConfiguration : ScriptCompilationConfiguration( jvm { dependenciesFromCurrentContext( "scripting-jvm-maven-deps", // script library jar name - "kotlin-scripting-dependencies" // DependsOn annotation is taken from script-util + "kotlin-scripting-dependencies" // DependsOn annotation is taken from it ) } refineConfiguration { diff --git a/libraries/tools/kotlin-bom/pom.xml b/libraries/tools/kotlin-bom/pom.xml index 4a507178a77..eb232455f9d 100644 --- a/libraries/tools/kotlin-bom/pom.xml +++ b/libraries/tools/kotlin-bom/pom.xml @@ -139,11 +139,6 @@ kotlin-script-runtime ${kotlin.version} - - ${project.groupId} - kotlin-script-util - ${kotlin.version} - ${project.groupId} kotlin-scripting-common diff --git a/libraries/tools/kotlin-main-kts/main-kts.pro b/libraries/tools/kotlin-main-kts/main-kts.pro index 17f9d475ecc..87489a94616 100644 --- a/libraries/tools/kotlin-main-kts/main-kts.pro +++ b/libraries/tools/kotlin-main-kts/main-kts.pro @@ -20,7 +20,6 @@ -keep class org.jetbrains.kotlin.mainKts.** { *; } -keep class kotlin.script.experimental.** { *; } --keep class org.jetbrains.kotlin.script.util.impl.PathUtilKt { *; } -keep class org.apache.ivy.plugins.** { *; } -keep class org.eclipse.sisu.** { *; } @@ -29,8 +28,6 @@ -keep class com.google.inject.** { *; } -keep class org.jetbrains.kotlin.com.google.inject.** { *; } --keep class org.jetbrains.kotlin.script.util.impl.PathUtilKt { *; } - -keep class com.google.common.** { *; } -keep class org.jetbrains.kotlin.com.google.common.** { *; } diff --git a/libraries/tools/kotlin-maven-plugin-test/pom.xml b/libraries/tools/kotlin-maven-plugin-test/pom.xml index 85344f53dae..d36178ebd37 100644 --- a/libraries/tools/kotlin-maven-plugin-test/pom.xml +++ b/libraries/tools/kotlin-maven-plugin-test/pom.xml @@ -137,7 +137,6 @@ org.jetbrains.kotlin:kotlin-test-junit5:${project.version} org.jetbrains.kotlin:kotlin-test-testng:${project.version} org.jetbrains.kotlin:kotlin-test-js:${project.version} - org.jetbrains.kotlin:kotlin-script-util:${project.version} org.jetbrains.kotlin:kotlin-bom:${project.version}:pom true diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptWithTemplate/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptWithTemplate/pom.xml index c381f93988d..43c01c5ad37 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptWithTemplate/pom.xml +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptWithTemplate/pom.xml @@ -19,16 +19,11 @@ kotlin-compiler ${kotlin.version} - - org.jetbrains.kotlin - kotlin-script-util - ${kotlin.version} - - org.jetbrains.kotlin.script.util.templates.StandardArgsScriptTemplateWithLocalResolving - ${org.jetbrains.kotlin:kotlin-script-util:jar} + kotlin.script.templates.standard.ScriptTemplateWithArgs + ${org.jetbrains.kotlin:kotlin-script-runtime:jar} @@ -56,11 +51,6 @@ kotlin-stdlib ${kotlin.version} - - org.jetbrains.kotlin - kotlin-script-util - ${kotlin.version} - diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptWithTemplate/script.kts b/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptWithTemplate/script.kts index c5ef6d668d5..826ed56ca58 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptWithTemplate/script.kts +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-executeKotlinScriptWithTemplate/script.kts @@ -3,7 +3,7 @@ import java.lang.Exception if (!args.isEmpty()) println("some args passed") -if (this !is org.jetbrains.kotlin.script.util.templates.StandardArgsScriptTemplateWithLocalResolving) +if (this !is kotlin.script.templates.standard.ScriptTemplateWithArgs) throw Exception("Unexpected script base class") println("Hello from Kotlin script file!") \ No newline at end of file diff --git a/libraries/tools/kotlin-script-util/build.gradle.kts b/libraries/tools/kotlin-script-util/build.gradle.kts index 6ad458537c6..c34a5f16062 100644 --- a/libraries/tools/kotlin-script-util/build.gradle.kts +++ b/libraries/tools/kotlin-script-util/build.gradle.kts @@ -35,8 +35,6 @@ projectTest { workingDir = rootDir } -publish() - runtimeJar() sourcesJar() javadocJar()