Skip to content

Commit 9705b1f

Browse files
committed
Remove kotlin-ide artifacts, indexation, and turn off completion that used them
Kotlin-ide artifacts are not published anymore since K2.
1 parent 1fd8b0e commit 9705b1f

28 files changed

+35
-1294
lines changed

build.gradle.kts

-24
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
66
import org.springframework.boot.gradle.tasks.bundling.BootJar
77

88
val kotlinVersion = rootProject.properties["systemProp.kotlinVersion"]
9-
val kotlinIdeVersion: String by System.getProperties()
10-
val kotlinIdeVersionSuffix: String by System.getProperties()
119
val policy: String by System.getProperties()
12-
val indexes: String by System.getProperties()
13-
val indexesJs: String by System.getProperties()
14-
val indexesWasm: String by System.getProperties()
1510

1611
group = "com.compiler.server"
1712
version = "$kotlinVersion-SNAPSHOT"
@@ -84,21 +79,14 @@ allprojects {
8479
gradlePluginPortal()
8580
maven("https://repo.spring.io/snapshot")
8681
maven("https://repo.spring.io/milestone")
87-
maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-ide")
8882
maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev")
89-
maven("https://cache-redirector.jetbrains.com/jetbrains.bintray.com/intellij-third-party-dependencies")
90-
maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-ide-plugin-dependencies")
9183
maven("https://www.myget.org/F/rd-snapshots/maven/")
92-
maven("https://kotlin.jetbrains.space/p/kotlin/packages/maven/kotlin-ide")
9384
maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/bootstrap")
9485
}
9586
afterEvaluate {
9687
dependencies {
9788
dependencies {
9889
implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.15.2")
99-
implementation("org.jetbrains.kotlin:idea:231-$kotlinIdeVersion-$kotlinIdeVersionSuffix") {
100-
isTransitive = false
101-
}
10290
}
10391
}
10492
}
@@ -126,18 +114,13 @@ dependencies {
126114
implementation("com.amazonaws.serverless:aws-serverless-java-container-springboot2:1.9.3")
127115
implementation("junit:junit:4.13.2")
128116
implementation("net.logstash.logback:logstash-logback-encoder:7.3")
129-
implementation("org.jetbrains.intellij.deps:trove4j:1.0.20221201")
130117
implementation("org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion")
131118
implementation("org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion")
132119
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion")
133120
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion")
134121
implementation("org.jetbrains.kotlin:kotlin-test:$kotlinVersion")
135122
implementation("org.jetbrains.kotlin:kotlin-compiler:$kotlinVersion")
136123
implementation("org.jetbrains.kotlin:kotlin-script-runtime:$kotlinVersion")
137-
implementation("org.jetbrains.kotlin:kotlin-compiler-for-ide:$kotlinIdeVersion"){
138-
isTransitive = false
139-
}
140-
implementation("org.jetbrains.kotlin:core:231-$kotlinIdeVersion-$kotlinIdeVersionSuffix")
141124
implementation(project(":executors", configuration = "default"))
142125
implementation(project(":common", configuration = "default"))
143126

@@ -159,9 +142,6 @@ fun generateProperties(prefix: String = "") = """
159142
# this file is autogenerated by build.gradle.kts
160143
kotlin.version=${kotlinVersion}
161144
policy.file=${prefix + policy}
162-
indexes.file=${prefix + indexes}
163-
indexesJs.file=${prefix + indexesJs}
164-
indexesWasm.file=${prefix + indexesWasm}
165145
libraries.folder.jvm=${prefix + libJVMFolder}
166146
libraries.folder.js=${prefix + libJSFolder}
167147
libraries.folder.wasm=${prefix + libWasmFolder}
@@ -185,7 +165,6 @@ tasks.withType<KotlinCompile> {
185165
dependsOn(copyJSDependencies)
186166
dependsOn(copyWasmDependencies)
187167
dependsOn(":executors:jar")
188-
dependsOn(":indexation:run")
189168
buildPropertyFile()
190169
}
191170
println("Using Kotlin compiler $kotlinVersion")
@@ -204,9 +183,6 @@ val buildLambda by tasks.creating(Zip::class) {
204183
}
205184
}
206185
from(policy)
207-
from(indexes)
208-
from(indexesJs)
209-
from(indexesWasm)
210186
from(libJSFolder) { into(libJSFolder) }
211187
from(libWasmFolder) { into(libWasmFolder) }
212188
from(libJVMFolder) { into(libJVMFolder) }

common/build.gradle.kts

-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
val kotlinVersion: String by System.getProperties()
2-
val kotlinIdeVersion: String by System.getProperties()
3-
val kotlinIdeVersionSuffix: String by System.getProperties()
42

53
plugins {
64
kotlin("jvm")
75
}
86

97
dependencies {
108
implementation("org.jetbrains.kotlin:kotlin-compiler:$kotlinVersion")
11-
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin-idea:$kotlinVersion")
12-
implementation("org.jetbrains.kotlin:base-fe10-analysis:231-$kotlinIdeVersion-$kotlinIdeVersionSuffix")
139
}
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,5 @@
11
package component
22

3-
import com.intellij.openapi.util.Disposer
4-
import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys
5-
import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments
6-
import org.jetbrains.kotlin.cli.common.arguments.parseCommandLineArguments
7-
import org.jetbrains.kotlin.cli.common.messages.MessageCollector
8-
import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
9-
import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
10-
import org.jetbrains.kotlin.cli.jvm.config.addJvmClasspathRoots
11-
import org.jetbrains.kotlin.cli.jvm.config.configureJdkClasspathRoots
12-
import org.jetbrains.kotlin.cli.jvm.configureAdvancedJvmOptions
13-
import org.jetbrains.kotlin.config.CommonConfigurationKeys
14-
import org.jetbrains.kotlin.config.CompilerConfiguration
15-
import org.jetbrains.kotlin.config.JVMConfigurationKeys
16-
import org.jetbrains.kotlin.config.languageVersionSettings
17-
import org.jetbrains.kotlin.js.config.JSConfigurationKeys
18-
import org.jetbrains.kotlin.serialization.js.JsModuleDescriptor
19-
import org.jetbrains.kotlin.serialization.js.KotlinJavascriptSerializationUtil
20-
import org.jetbrains.kotlin.serialization.js.ModuleKind
21-
import org.jetbrains.kotlin.utils.KotlinJavascriptMetadataUtils
223
import java.io.File
234

245
class KotlinEnvironment(
@@ -45,65 +26,7 @@ class KotlinEnvironment(
4526
)
4627
}
4728

48-
val JS_METADATA_CACHE =
49-
additionalJsClasspath.flatMap {
50-
KotlinJavascriptMetadataUtils.loadMetadata(it.absolutePath).map { metadata ->
51-
val parts = KotlinJavascriptSerializationUtil.readModuleAsProto(metadata.body, metadata.version)
52-
JsModuleDescriptor(metadata.moduleName, parts.kind, parts.importedModules, parts)
53-
}
54-
}
55-
5629
val JS_LIBRARIES = additionalJsClasspath.map { it.absolutePath }
5730
val WASM_LIBRARIES = additionalWasmClasspath.map { it.absolutePath }
5831

59-
@Synchronized
60-
fun <T> environment(f: (KotlinCoreEnvironment) -> T): T {
61-
return f(environment)
62-
}
63-
64-
private val configuration = createConfiguration()
65-
val jsConfiguration: CompilerConfiguration = configuration.copy().apply {
66-
put(CommonConfigurationKeys.MODULE_NAME, "moduleId")
67-
put(JSConfigurationKeys.MODULE_KIND, ModuleKind.PLAIN)
68-
put(JSConfigurationKeys.LIBRARIES, JS_LIBRARIES)
69-
}
70-
71-
val wasmConfiguration: CompilerConfiguration = configuration.copy().apply {
72-
put(CommonConfigurationKeys.MODULE_NAME, "moduleId")
73-
put(JSConfigurationKeys.LIBRARIES, WASM_LIBRARIES)
74-
put(JSConfigurationKeys.WASM_ENABLE_ARRAY_RANGE_CHECKS, false)
75-
put(JSConfigurationKeys.WASM_ENABLE_ASSERTS, false)
76-
}
77-
78-
private val environment = KotlinCoreEnvironment.createForProduction(
79-
parentDisposable = Disposer.newDisposable(),
80-
configuration = configuration.copy(),
81-
configFiles = EnvironmentConfigFiles.JVM_CONFIG_FILES
82-
)
83-
84-
private fun createConfiguration(): CompilerConfiguration {
85-
val arguments = K2JVMCompilerArguments()
86-
parseCommandLineArguments(additionalCompilerArguments, arguments)
87-
return CompilerConfiguration().apply {
88-
addJvmClasspathRoots(classpath.filter { it.exists() && it.isFile && it.extension == "jar" })
89-
val messageCollector = MessageCollector.NONE
90-
put(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY, messageCollector)
91-
put(CommonConfigurationKeys.MODULE_NAME, "web-module")
92-
put(JSConfigurationKeys.TYPED_ARRAYS_ENABLED, true)
93-
put(JSConfigurationKeys.PROPERTY_LAZY_INITIALIZATION, true)
94-
95-
languageVersionSettings = arguments.toLanguageVersionSettings(messageCollector)
96-
97-
// it uses languageVersionSettings that was set above
98-
configureAdvancedJvmOptions(arguments)
99-
put(JVMConfigurationKeys.DO_NOT_CLEAR_BINDING_CONTEXT, true)
100-
101-
configureJdkClasspathRoots()
102-
val jdkHome = get(JVMConfigurationKeys.JDK_HOME)
103-
if (jdkHome == null) {
104-
val javaHome = File(System.getProperty("java.home"))
105-
put(JVMConfigurationKeys.JDK_HOME, javaHome)
106-
}
107-
}
108-
}
10932
}

gradle.properties

-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,2 @@
11
systemProp.kotlinVersion=1.9.20
2-
systemProp.kotlinIdeVersion=1.9.20-RC2-494
3-
systemProp.kotlinIdeVersionSuffix=IJ8109.175
42
systemProp.policy=executor.policy
5-
systemProp.indexes=indexes.json
6-
systemProp.indexesJs=indexesJs.json
7-
systemProp.indexesWasm=indexesWasm.json

indexation/build.gradle.kts

-31
This file was deleted.

indexation/src/main/kotlin/DescriptorsUtils.kt

-99
This file was deleted.

indexation/src/main/kotlin/IndexationBuilder.kt

-14
This file was deleted.

indexation/src/main/kotlin/JvmIndexationBuilder.kt

-31
This file was deleted.

indexation/src/main/kotlin/KotlinEnvironmentConfiguration.kt

-23
This file was deleted.

0 commit comments

Comments
 (0)