No need docker in local case

Author: ilgonmic

cache-maker/Dockerfile

@@ -1,9 +1,30 @@
 FROM amazoncorretto:17
 
 ARG BASE_DIR
+ARG KOTLIN_VERSION
+
+RUN if [ -z "$KOTLIN_VERSION" ]; then \
+        echo "Error: KOTLIN_VERSION argument is not set. Use docker-build-incremental-cache.sh to build the image." >&2; \
+        exit 1; \
+    fi
+
+ENV KOTLIN_LIB=$KOTLIN_VERSION
+ENV KOTLIN_LIB_JS=${KOTLIN_VERSION}-js
+ENV KOTLIN_LIB_WASM=${KOTLIN_VERSION}-wasm
+ENV KOTLIN_LIB_COMPOSE_WASM=${KOTLIN_VERSION}-compose-wasm
+ENV KOTLIN_COMPOSE_WASM_COMPILER_PLUGINS=${KOTLIN_VERSION}-compose-wasm-compiler-plugins
+ENV KOTLIN_CACHES_COMPOSE_WASM=${KOTLIN_VERSION}-caches-compose-wasm
 
 RUN mkdir -p $BASE_DIR
 WORKDIR $BASE_DIR
 ADD . $BASE_DIR
 
+RUN rm -rf $KOTLIN_LIB
+RUN rm -rf $KOTLIN_LIB_JS
+RUN rm -rf $KOTLIN_LIB_WASM
+RUN rm -rf $KOTLIN_LIB_COMPOSE_WASM
+RUN rm -rf $KOTLIN_COMPOSE_WASM_COMPILER_PLUGINS
+RUN rm -rf $KOTLIN_CACHES_COMPOSE_WASM
+RUN ./gradlew clean
+
 RUN ./gradlew :cache-maker:run

cache-maker/build.gradle.kts

@@ -11,7 +11,7 @@ application {
     mainClass.set("cache.MainKt")
 }
 
-tasks.withType<JavaExec> {
+val runTask = tasks.named<JavaExec>("run") {
     dependsOn(":dependencies:copyDependencies")
     dependsOn(":dependencies:copyWasmDependencies")
     dependsOn(":dependencies:copyComposeWasmCompilerPlugins")
@@ -39,15 +39,6 @@ tasks.withType<JavaExec> {
 }
 
 val outputLocalCacheDir = rootDir.resolve(cachesComposeWasm)
-val buildCacheLocal by tasks.registering(Exec::class) {
-    workingDir = rootDir
-    executable = "${project.name}/docker-build-incremental-cache.sh"
-    outputs.dir(outputLocalCacheDir)
-    args = listOf(
-        rootDir.normalize().absolutePath, // baseDir
-        rootDir.normalize().absolutePath // targetDir
-    )
-}
 
 val outputLambdaCacheDir: Provider<Directory> = layout.buildDirectory.dir("incremental-cache")
 val buildCacheForLambda by tasks.registering(Exec::class) {
@@ -91,7 +82,7 @@ val kotlinComposeWasmIcLambdaCache: Configuration by configurations.creating {
 }
 
 artifacts.add(kotlinComposeWasmIcLocalCache.name, outputLocalCacheDir) {
-    builtBy(buildCacheLocal)
+    builtBy(runTask)
 }
 
 artifacts.add(kotlinComposeWasmIcLambdaCache.name, outputLambdaCacheDir) {

cache-maker/docker-build-incremental-cache.sh

@@ -11,7 +11,7 @@ echo "Target directory: $targetDir"
 
 image_tag=my-image-name:$(date +%s)
 
-docker build . --file cache-maker/Dockerfile --tag $image_tag --build-arg BASE_DIR=$baseDir
+docker build . --file cache-maker/Dockerfile --tag $image_tag --build-arg BASE_DIR=$baseDir --build-arg KOTLIN_VERSION=$kotlinVersion
 
 container=$(docker create $image_tag)
 

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-kotlin = "2.1.0-Beta2"
+kotlin = "2.1.20-dev-3031"
 kotlinIdeVersion = "1.9.20-506"
 kotlinIdeVersionWithSuffix = "231-1.9.20-506-IJ8109.175"
 spring-boot = "2.7.10"

src/main/kotlin/com/compiler/server/compiler/components/KotlinToJSTranslator.kt

@@ -203,15 +203,10 @@ class KotlinToJSTranslator(
           a = cacheDir?.let { dir ->
             usingTempDirectory { tmpDir ->
               val cachesDir = tmpDir.resolve("caches").normalize()
-              val originalCachesDirExists = dir.exists()
-              if (originalCachesDirExists) {
+              if (dir.exists()) {
                 dir.copyRecursively(cachesDir.toFile())
               }
-              val result = compileAction(cachesDir)
-              if (!originalCachesDirExists) {
-                cachesDir.toFile().copyRecursively(dir)
-              }
-              result
+              compileAction(cachesDir)
             }
           } ?: compileAction(null)
         }