Stop publishing obsolete kotlin-script-util
#KT-58366 fixed
This commit is contained in:
committed by
Space Team
parent
17dded2f2a
commit
2e393e8fb7
@@ -313,7 +313,6 @@ extra["compilerArtifactsForIde"] = listOfNotNull(
|
|||||||
":prepare:ide-plugin-dependencies:kotlin-compiler-fir-for-ide",
|
":prepare:ide-plugin-dependencies:kotlin-compiler-fir-for-ide",
|
||||||
":prepare:kotlin-jps-plugin",
|
":prepare:kotlin-jps-plugin",
|
||||||
":kotlin-script-runtime",
|
":kotlin-script-runtime",
|
||||||
":kotlin-script-util",
|
|
||||||
":kotlin-scripting-common",
|
":kotlin-scripting-common",
|
||||||
":kotlin-scripting-jvm",
|
":kotlin-scripting-jvm",
|
||||||
":kotlin-scripting-compiler",
|
":kotlin-scripting-compiler",
|
||||||
|
|||||||
@@ -28,7 +28,6 @@ dependencies {
|
|||||||
testApi(project(":compiler:ir.ir2cfg"))
|
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(":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-scripting-compiler"))
|
||||||
testApi(project(":kotlin-script-util"))
|
|
||||||
|
|
||||||
otherCompilerModules.forEach {
|
otherCompilerModules.forEach {
|
||||||
testCompileOnly(project(it))
|
testCompileOnly(project(it))
|
||||||
|
|||||||
@@ -54,7 +54,6 @@ fun updateCompilerXml() {
|
|||||||
"libraries/tools/kotlin-prepush-hook",
|
"libraries/tools/kotlin-prepush-hook",
|
||||||
"libraries/tools/kotlin-project-model",
|
"libraries/tools/kotlin-project-model",
|
||||||
"libraries/tools/kotlin-sam-with-receiver",
|
"libraries/tools/kotlin-sam-with-receiver",
|
||||||
"libraries/tools/kotlin-script-util",
|
|
||||||
"libraries/tools/kotlin-serialization",
|
"libraries/tools/kotlin-serialization",
|
||||||
"libraries/tools/kotlin-serialization-unshaded",
|
"libraries/tools/kotlin-serialization-unshaded",
|
||||||
"libraries/tools/kotlin-stdlib-docs",
|
"libraries/tools/kotlin-stdlib-docs",
|
||||||
|
|||||||
+1
-1
@@ -26,7 +26,7 @@ object ScriptWithMavenDepsConfiguration : ScriptCompilationConfiguration(
|
|||||||
jvm {
|
jvm {
|
||||||
dependenciesFromCurrentContext(
|
dependenciesFromCurrentContext(
|
||||||
"scripting-jvm-maven-deps", // script library jar name
|
"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 {
|
refineConfiguration {
|
||||||
|
|||||||
@@ -139,11 +139,6 @@
|
|||||||
<artifactId>kotlin-script-runtime</artifactId>
|
<artifactId>kotlin-script-runtime</artifactId>
|
||||||
<version>${kotlin.version}</version>
|
<version>${kotlin.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
|
||||||
<groupId>${project.groupId}</groupId>
|
|
||||||
<artifactId>kotlin-script-util</artifactId>
|
|
||||||
<version>${kotlin.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>${project.groupId}</groupId>
|
<groupId>${project.groupId}</groupId>
|
||||||
<artifactId>kotlin-scripting-common</artifactId>
|
<artifactId>kotlin-scripting-common</artifactId>
|
||||||
|
|||||||
@@ -20,7 +20,6 @@
|
|||||||
|
|
||||||
-keep class org.jetbrains.kotlin.mainKts.** { *; }
|
-keep class org.jetbrains.kotlin.mainKts.** { *; }
|
||||||
-keep class kotlin.script.experimental.** { *; }
|
-keep class kotlin.script.experimental.** { *; }
|
||||||
-keep class org.jetbrains.kotlin.script.util.impl.PathUtilKt { *; }
|
|
||||||
-keep class org.apache.ivy.plugins.** { *; }
|
-keep class org.apache.ivy.plugins.** { *; }
|
||||||
|
|
||||||
-keep class org.eclipse.sisu.** { *; }
|
-keep class org.eclipse.sisu.** { *; }
|
||||||
@@ -29,8 +28,6 @@
|
|||||||
-keep class com.google.inject.** { *; }
|
-keep class com.google.inject.** { *; }
|
||||||
-keep class org.jetbrains.kotlin.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 com.google.common.** { *; }
|
||||||
-keep class org.jetbrains.kotlin.com.google.common.** { *; }
|
-keep class org.jetbrains.kotlin.com.google.common.** { *; }
|
||||||
|
|
||||||
|
|||||||
@@ -137,7 +137,6 @@
|
|||||||
<artifact>org.jetbrains.kotlin:kotlin-test-junit5:${project.version}</artifact>
|
<artifact>org.jetbrains.kotlin:kotlin-test-junit5:${project.version}</artifact>
|
||||||
<artifact>org.jetbrains.kotlin:kotlin-test-testng:${project.version}</artifact>
|
<artifact>org.jetbrains.kotlin:kotlin-test-testng:${project.version}</artifact>
|
||||||
<artifact>org.jetbrains.kotlin:kotlin-test-js:${project.version}</artifact>
|
<artifact>org.jetbrains.kotlin:kotlin-test-js:${project.version}</artifact>
|
||||||
<artifact>org.jetbrains.kotlin:kotlin-script-util:${project.version}</artifact>
|
|
||||||
<artifact>org.jetbrains.kotlin:kotlin-bom:${project.version}:pom</artifact>
|
<artifact>org.jetbrains.kotlin:kotlin-bom:${project.version}:pom</artifact>
|
||||||
</extraArtifacts>
|
</extraArtifacts>
|
||||||
<showErrors>true</showErrors>
|
<showErrors>true</showErrors>
|
||||||
|
|||||||
+2
-12
@@ -19,16 +19,11 @@
|
|||||||
<artifactId>kotlin-compiler</artifactId>
|
<artifactId>kotlin-compiler</artifactId>
|
||||||
<version>${kotlin.version}</version>
|
<version>${kotlin.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
|
||||||
<groupId>org.jetbrains.kotlin</groupId>
|
|
||||||
<artifactId>kotlin-script-util</artifactId>
|
|
||||||
<version>${kotlin.version}</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<kotlin.compiler.scriptTemplates>org.jetbrains.kotlin.script.util.templates.StandardArgsScriptTemplateWithLocalResolving</kotlin.compiler.scriptTemplates>
|
<kotlin.compiler.scriptTemplates>kotlin.script.templates.standard.ScriptTemplateWithArgs</kotlin.compiler.scriptTemplates>
|
||||||
<kotlin.compiler.scriptClasspath>${org.jetbrains.kotlin:kotlin-script-util:jar}</kotlin.compiler.scriptClasspath>
|
<kotlin.compiler.scriptClasspath>${org.jetbrains.kotlin:kotlin-script-runtime:jar}</kotlin.compiler.scriptClasspath>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
@@ -56,11 +51,6 @@
|
|||||||
<artifactId>kotlin-stdlib</artifactId>
|
<artifactId>kotlin-stdlib</artifactId>
|
||||||
<version>${kotlin.version}</version>
|
<version>${kotlin.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
|
||||||
<groupId>org.jetbrains.kotlin</groupId>
|
|
||||||
<artifactId>kotlin-script-util</artifactId>
|
|
||||||
<version>${kotlin.version}</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
|
|||||||
+1
-1
@@ -3,7 +3,7 @@ import java.lang.Exception
|
|||||||
if (!args.isEmpty())
|
if (!args.isEmpty())
|
||||||
println("some args passed")
|
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")
|
throw Exception("Unexpected script base class")
|
||||||
|
|
||||||
println("Hello from Kotlin script file!")
|
println("Hello from Kotlin script file!")
|
||||||
@@ -35,8 +35,6 @@ projectTest {
|
|||||||
workingDir = rootDir
|
workingDir = rootDir
|
||||||
}
|
}
|
||||||
|
|
||||||
publish()
|
|
||||||
|
|
||||||
runtimeJar()
|
runtimeJar()
|
||||||
sourcesJar()
|
sourcesJar()
|
||||||
javadocJar()
|
javadocJar()
|
||||||
|
|||||||
Reference in New Issue
Block a user