[Gradle, JS] Move session file from project

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt

@@ -23,7 +23,6 @@ import org.jetbrains.kotlin.daemon.common.filterExtractProps
 import org.jetbrains.kotlin.gradle.dsl.KotlinJsProjectExtension
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 import org.jetbrains.kotlin.gradle.dsl.multiplatformExtensionOrNull
-import org.jetbrains.kotlin.gradle.logging.GradleErrorMessageCollector
 import org.jetbrains.kotlin.gradle.logging.kotlinDebug
 import org.jetbrains.kotlin.gradle.logging.kotlinInfo
 import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation
@@ -64,7 +63,7 @@ internal open class GradleCompilerRunner(
     internal val loggerProvider = taskProvider.logger.get()
     internal val buildDirProvider = taskProvider.buildDir.get().asFile
     internal val projectDirProvider = taskProvider.projectDir.get()
-    internal val projectRootDirProvider = taskProvider.rootDir.get()
+    internal val projectCacheDirProvider = taskProvider.projectCacheDir.get()
     internal val sessionDirProvider = taskProvider.sessionsDir.get()
     internal val projectNameProvider = taskProvider.projectName.get()
     internal val incrementalModuleInfoProvider = taskProvider.buildModulesInfo
@@ -190,7 +189,7 @@ internal open class GradleCompilerRunner(
                 projectDirProvider,
                 buildDirProvider,
                 projectNameProvider,
-                projectRootDirProvider,
+                projectCacheDirProvider,
                 sessionDirProvider
             ),
             compilerFullClasspath = environment.compilerFullClasspath(jdkToolsJar),
@@ -432,20 +431,20 @@ internal open class GradleCompilerRunner(
 
         // session files are deleted at org.jetbrains.kotlin.gradle.plugin.KotlinGradleBuildServices.buildFinished
         @Synchronized
-        internal fun getOrCreateSessionFlagFile(log: Logger, sessionsDir: File, projectRootDir: File): File {
+        internal fun getOrCreateSessionFlagFile(log: Logger, sessionsDir: File, projectCacheDirProvider: File): File {
             if (sessionFlagFile == null || !sessionFlagFile!!.exists()) {
                 val sessionFilesDir = sessionsDir.apply { mkdirs() }
                 sessionFlagFile = newTmpFile(prefix = "kotlin-compiler-", suffix = ".salive", directory = sessionFilesDir)
-                log.kotlinDebug { CREATED_SESSION_FILE_PREFIX + sessionFlagFile!!.relativeOrCanonical(projectRootDir) }
+                log.kotlinDebug { CREATED_SESSION_FILE_PREFIX + sessionFlagFile!!.relativeOrCanonical(projectCacheDirProvider) }
             } else {
-                log.kotlinDebug { EXISTING_SESSION_FILE_PREFIX + sessionFlagFile!!.relativeOrCanonical(projectRootDir) }
+                log.kotlinDebug { EXISTING_SESSION_FILE_PREFIX + sessionFlagFile!!.relativeOrCanonical(projectCacheDirProvider) }
             }
 
             return sessionFlagFile!!
         }
 
-        internal fun sessionsDir(rootProjectBuildDir: File): File =
+        internal fun sessionsDir(projectCacheDir: File): File =
-            File(File(rootProjectBuildDir, "kotlin"), "sessions")
+            File(File(projectCacheDir, "kotlin"), "sessions")
     }
 }
 

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerWork.kt

@@ -41,10 +41,10 @@ internal class ProjectFilesForCompilation(
     val buildDir: File
 ) : Serializable {
     //TODO
-    constructor(logger: Logger, projectDir:File, buildDir: File, prjectName: String, projectRootDir: File, sessionDir: File) : this(
+    constructor(logger: Logger, projectDir:File, buildDir: File, prjectName: String, projectCacheDirProvider: File, sessionDir: File) : this(
         projectRootFile = projectDir,
         clientIsAliveFlagFile = GradleCompilerRunner.getOrCreateClientFlagFile(logger, prjectName),
-        sessionFlagFile = GradleCompilerRunner.getOrCreateSessionFlagFile(logger, sessionDir, projectRootDir),
+        sessionFlagFile = GradleCompilerRunner.getOrCreateSessionFlagFile(logger, sessionDir, projectCacheDirProvider),
         buildDir = buildDir
     )
 

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinGradleBuildServices.kt

@@ -14,13 +14,13 @@ import org.gradle.api.services.BuildServiceParameters
 import org.jetbrains.kotlin.gradle.logging.kotlinDebug
 import org.jetbrains.kotlin.gradle.plugin.internal.state.TaskExecutionResults
 import org.jetbrains.kotlin.gradle.plugin.internal.state.TaskLoggers
+import org.jetbrains.kotlin.gradle.utils.projectCacheDir
 import java.io.File
 
 internal abstract class KotlinGradleBuildServices : BuildService<KotlinGradleBuildServices.Parameters>, AutoCloseable {
 
     interface Parameters : BuildServiceParameters {
-        var buildDir: File
+        var projectCacheDir: File
-        var rootDir: File
     }
 
     private val log = Logging.getLogger(this.javaClass)
@@ -63,7 +63,7 @@ internal abstract class KotlinGradleBuildServices : BuildService<KotlinGradleBui
     }
 
     override fun close() {
-        buildHandler.buildFinished(parameters.buildDir, parameters.rootDir)
+        buildHandler.buildFinished(parameters.projectCacheDir)
         log.kotlinDebug(DISPOSE_MESSAGE)
 
         TaskLoggers.clear()
@@ -80,8 +80,7 @@ internal abstract class KotlinGradleBuildServices : BuildService<KotlinGradleBui
                 "kotlin-build-service-${KotlinGradleBuildServices::class.java.canonicalName}_${KotlinGradleBuildServices::class.java.classLoader.hashCode()}",
                 KotlinGradleBuildServices::class.java
             ) { service ->
-                service.parameters.rootDir = gradle.rootProject.rootDir
+                service.parameters.projectCacheDir = gradle.projectCacheDir
-                service.parameters.buildDir = gradle.rootProject.buildDir
             }
 
     }

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinGradleFinishBuildHandler.kt

@@ -5,7 +5,6 @@
 
 package org.jetbrains.kotlin.gradle.plugin
 
-import org.gradle.api.invocation.Gradle
 import org.gradle.api.logging.Logging
 import org.jetbrains.kotlin.compilerRunner.DELETED_SESSION_FILE_PREFIX
 import org.jetbrains.kotlin.compilerRunner.GradleCompilerRunner
@@ -33,24 +32,24 @@ internal class KotlinGradleFinishBuildHandler {
         startMemory = getUsedMemoryKb()
     }
 
-    fun buildFinished(rootProjectBuildDir: File, rootProjectRootDir: File) {
+    fun buildFinished(projectCacheDir: File) {
         TaskLoggers.clear()
         TaskExecutionResults.clear()
 
         GradleCompilerRunner.clearBuildModulesInfo()
 
-        val sessionsDir = GradleCompilerRunner.sessionsDir(rootProjectBuildDir)
+        val sessionsDir = GradleCompilerRunner.sessionsDir(projectCacheDir)
         if (sessionsDir.exists()) {
             val sessionFiles = sessionsDir.listFiles()
 
             // it is expected that only one session file per build exists
             // afaik is is not possible to run multiple gradle builds in one project since gradle locks some dirs
             if (sessionFiles.size > 1) {
-                log.warn("w: Detected multiple Kotlin daemon sessions at ${sessionsDir.relativeOrCanonical(rootProjectRootDir)}")
+                log.warn("w: Detected multiple Kotlin daemon sessions at ${sessionsDir.relativeOrCanonical(projectCacheDir)}")
             }
             for (file in sessionFiles) {
                 file.delete()
-                log.kotlinDebug { DELETED_SESSION_FILE_PREFIX + file.relativeOrCanonical(rootProjectRootDir) }
+                log.kotlinDebug { DELETED_SESSION_FILE_PREFIX + file.relativeOrCanonical(projectCacheDir) }
             }
         }
 
@@ -64,11 +63,6 @@ internal class KotlinGradleFinishBuildHandler {
         }
     }
 
-    fun buildFinished(gradle: Gradle) {
-        buildFinished(gradle.rootProject.buildDir, gradle.rootProject.rootDir)
-        gradle.removeListener(this)
-    }
-
     internal fun getUsedMemoryKb(): Long? {
         if (!shouldReportMemoryUsage) return null
 

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt

@@ -72,6 +72,7 @@ import org.jetbrains.kotlin.statistics.metrics.BooleanMetrics
 import org.jetbrains.kotlin.utils.JsLibraryUtils
 import org.jetbrains.kotlin.utils.addToStdlib.cast
 import java.io.File
+import java.nio.file.Files.*
 import java.util.concurrent.ConcurrentHashMap
 import javax.inject.Inject
 
@@ -203,12 +204,12 @@ abstract class GradleCompileTaskProvider @Inject constructor(
         .property(project.rootProject.projectDir)
 
     @get:Internal
-    val rootDir: Provider<File> = objectFactory
+    val projectCacheDir: Provider<File> = objectFactory
-        .property(project.rootProject.rootDir)
+        .property(gradle.projectCacheDir)
 
     @get:Internal
     val sessionsDir: Provider<File> = objectFactory
-        .property(GradleCompilerRunner.sessionsDir(project.rootProject.buildDir))
+        .property(GradleCompilerRunner.sessionsDir(gradle.projectCacheDir))
 
     @get:Internal
     val projectName: Provider<String> = objectFactory

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/utils/gradleUtils.kt

@@ -0,0 +1,11 @@
+/*
+ * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.gradle.utils
+
+import org.gradle.api.invocation.Gradle
+
+val Gradle.projectCacheDir
+    get() = startParameter.projectCacheDir ?: this.rootProject.projectDir.resolve(".gradle")