SandboxAware: inherit sandbox directory from producer

JetBrains · May 22, 2024 · aeb0303 · aeb0303
1 parent 37c6b92
commit aeb0303
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,7 @@
 - Fixed custom tasks suffixing
 - Fixed: Task `:test` uses this output of task `:prepareSandbox` without declaring an explicit or implicit dependency [#1609](../../issues/1609)
 - ExtractorTransformer: Exclude only `Applications` symlink
+- SandboxAware: inherit sandbox directory from producer
 
 ## [2.0.0-beta3] - 2024-05-18
 

diff --git a/src/main/kotlin/org/jetbrains/intellij/platform/gradle/tasks/tasks.kt b/src/main/kotlin/org/jetbrains/intellij/platform/gradle/tasks/tasks.kt
@@ -39,7 +39,6 @@ import org.jetbrains.intellij.platform.gradle.tasks.aware.SplitModeAware.SplitMo
 import org.jetbrains.intellij.platform.gradle.toIntelliJPlatformType
 import org.jetbrains.intellij.platform.gradle.utils.*
 import kotlin.io.path.absolute
-import kotlin.io.path.createDirectories
 
 /**
  * Registers a task of type [T] with the given names
@@ -259,9 +258,7 @@ internal fun <T : Task> Project.preconfigureTask(task: T) {
              */
             sandboxSuffix.convention(suffix)
             sandboxDirectory.convention(extension.sandboxContainer.map { container ->
-                container
-                    .dir("${productInfo.productCode}-${productInfo.version}")
-                    .apply { asPath.createDirectories() }
+                container.dir("${productInfo.productCode}-${productInfo.version}")
             })
             sandboxConfigDirectory.configureSandbox(sandboxDirectory, sandboxSuffix, Sandbox.CONFIG)
             sandboxPluginsDirectory.configureSandbox(sandboxDirectory, sandboxSuffix, Sandbox.PLUGINS)
@@ -290,6 +287,7 @@ internal fun <T : Task> Project.preconfigureTask(task: T) {
                         val taskSubjectSuffix = "-$taskSubject".lowercase().trimEnd('-') + suffix
                         task.sandboxSuffix.convention(taskSubjectSuffix)
                         sandboxSuffix.convention(taskSubjectSuffix)
+                        sandboxDirectory.convention(task.sandboxDirectory)
 
                         if (this is CustomIntelliJPlatformVersionAware) {
                             task.disabledPlugins = the<IntelliJPlatformPluginsExtension>().disabled
@@ -319,7 +317,6 @@ internal fun <T : Task> Project.preconfigureTask(task: T) {
                  * However, tasks like [RunnableIdeAware] or [TestableAware] should not share the same sandboxes.
                  * The same applies to the customized tasks – a custom suffix is added to the task name.
                  */
-
                 when {
                     this is SplitModeAware -> {
                         val backendTask = createTask(SplitModeTarget.BACKEND)
@@ -493,7 +490,7 @@ internal fun DirectoryProperty.configureSandbox(
     name: String,
 ) {
     convention(sandboxContainer.zip(suffixProvider) { container, suffix ->
-        container.dir(name + suffix.orEmpty()).apply { asPath.createDirectories() }
+        container.dir(name + suffix)
     })
 }