Revert "feat: ir ic (JetBrains#604)"

This reverts commit dc4983e

Author: ilgonmic

Dockerfile

@@ -2,7 +2,6 @@ FROM openjdk:11.0.16-jdk as build
 
 ENV KOTLIN_LIB=1.8.20-RC
 ENV KOTLIN_LIB_JS=1.8.20-RC-js
-ENV KOTLIN_CACHES_JS=1.8.20-RC-js-caches
 
 RUN mkdir -p /kotlin-compiler-server
 WORKDIR /kotlin-compiler-server
@@ -21,7 +20,6 @@ COPY --from=build /build/libs/META-INF /kotlin-compiler-server/META-INF
 COPY --from=build /build/libs/BOOT-INF/classes /kotlin-compiler-server
 COPY --from=build /kotlin-compiler-server/${KOTLIN_LIB} /kotlin-compiler-server/${KOTLIN_LIB}
 COPY --from=build /kotlin-compiler-server/${KOTLIN_LIB_JS} /kotlin-compiler-server/${KOTLIN_LIB_JS}
-COPY --from=build /kotlin-compiler-server/${KOTLIN_CACHES_JS} /kotlin-compiler-server/${KOTLIN_CACHES_JS}
 COPY --from=build /kotlin-compiler-server/executor.policy /kotlin-compiler-server/
 COPY --from=build /kotlin-compiler-server/indexes.json /kotlin-compiler-server/
 

build.gradle.kts

@@ -29,27 +29,7 @@ val kotlinJsDependency: Configuration by configurations.creating {
         )
     }
 }
-
-val kotlinJsIcCache: Configuration by configurations.creating {
-    isTransitive = false
-    attributes {
-        attribute(
-            KotlinPlatformType.attribute,
-            KotlinPlatformType.js
-        )
-        attribute(
-            KotlinJsCompilerAttribute.jsCompilerAttribute,
-            KotlinJsCompilerAttribute.ir
-        )
-        attribute(
-            LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE,
-            objects.named(LibraryElements::class.java, "js-ir-cache")
-        )
-    }
-}
-
 val libJSFolder = "$kotlinVersion-js"
-val libJSCachesFolder = "$kotlinVersion-js-caches"
 val libJVMFolder = kotlinVersion
 val propertyFile = "application.properties"
 val jacksonVersionKotlinDependencyJar = "2.14.0" // don't forget to update version in `executor.policy` file.
@@ -63,11 +43,6 @@ val copyJSDependencies by tasks.creating(Copy::class) {
     into(libJSFolder)
 }
 
-val copyJSCaches by tasks.creating(Copy::class) {
-    from(kotlinJsIcCache)
-    into(libJSCachesFolder)
-}
-
 plugins {
     id("org.springframework.boot") version "2.7.8"
     id("io.spring.dependency-management") version "1.1.0"
@@ -112,8 +87,6 @@ dependencies {
     kotlinDependency("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4")
     kotlinJsDependency("org.jetbrains.kotlin:kotlin-stdlib-js:$kotlinVersion")
 
-    kotlinJsIcCache(project(":cache-preparator"))
-
     annotationProcessor("org.springframework:spring-context-indexer")
     implementation("org.springframework.boot:spring-boot-starter-web")
     implementation("com.amazonaws.serverless:aws-serverless-java-container-springboot2:1.9.1")
@@ -158,10 +131,7 @@ fun generateProperties(prefix: String = "") = """
     indexesJs.file=${prefix + indexesJs}
     libraries.folder.jvm=${prefix + libJVMFolder}
     libraries.folder.js=${prefix + libJSFolder}
-    caches.folder.js=${prefix + libJSCachesFolder}
     spring.mvc.pathmatch.matching-strategy=ant_path_matcher
-    server.compression.enabled=true
-    server.compression.mime-types=application/json
 """.trimIndent()
 
 tasks.withType<KotlinCompile> {
@@ -171,7 +141,6 @@ tasks.withType<KotlinCompile> {
     }
     dependsOn(copyDependencies)
     dependsOn(copyJSDependencies)
-    dependsOn(copyJSCaches)
     dependsOn(":executors:jar")
     dependsOn(":indexation:run")
     buildPropertyFile()

cache-preparator/build.gradle.kts

@@ -28,8 +28,7 @@ import java.io.File
 
 class KotlinEnvironment(
   val classpath: List<File>,
-  additionalJsClasspath: List<File>,
-  val cachesJsDir: File
+  additionalJsClasspath: List<File>
 ) {
   companion object {
     /**

cache-preparator/src/jsMain/kotlin/File.kt

@@ -7,7 +7,6 @@ class KotlinEnvironmentConfiguration(fileName: String) {
   val kotlinEnvironment = run {
     val jvmFile = File(fileName)
     val jsFile = File("$fileName-js")
-    val cachesJsDir = File("$fileName-js-caches")
     val classPath =
       listOfNotNull(jvmFile)
         .flatMap {
@@ -16,6 +15,6 @@ class KotlinEnvironmentConfiguration(fileName: String) {
         }
 
     val additionalJsClasspath = listOfNotNull(jsFile)
-    KotlinEnvironment(classPath, additionalJsClasspath, cachesJsDir)
+    KotlinEnvironment(classPath, additionalJsClasspath)
   }
 }

common/src/main/kotlin/component/KotlinEnvironment.kt

@@ -1,5 +1,4 @@
 rootProject.name = "kotlin-compiler-server"
 include(":executors")
 include(":indexation")
-include(":common")
-include(":cache-preparator")
+include(":common")

indexation/src/main/kotlin/KotlinEnvironmentConfiguration.kt

@@ -1,16 +1,12 @@
 package com.compiler.server.compiler.components
 
-import com.compiler.server.model.bean.CachesFile
 import com.compiler.server.model.bean.LibrariesFile
 import component.KotlinEnvironment
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 
 @Configuration
-class KotlinEnvironmentConfiguration(
-  val librariesFile: LibrariesFile,
-  val cachesFiles: CachesFile
-) {
+class KotlinEnvironmentConfiguration(val librariesFile: LibrariesFile) {
   @Bean
   fun kotlinEnvironment(): KotlinEnvironment {
     val classPath =
@@ -21,6 +17,6 @@ class KotlinEnvironmentConfiguration(
         }
 
     val additionalJsClasspath = listOfNotNull(librariesFile.js)
-    return KotlinEnvironment(classPath, additionalJsClasspath, cachesFiles.js)
+    return KotlinEnvironment(classPath, additionalJsClasspath)
   }
 }