fix(config-cache): Resolve CLI path via ValueSource task input

SentryCliExecTask resolved the sentry-cli path inside its action by
calling getSentryCliPath() at execution time, so the path was never a
declared task input. Wire the existing SentryCliValueSource into a new
@input cliExecutable property via cliExecutableProvider(), so the path
is a config-cache-safe, lazily resolved task input.

The now-unused sentryProjectDir/sentryRootDir task properties (and the
duplicate getIsolatedRootProjectDir helper) are removed; the value
source resolves those from the project itself. buildDirectory stays,
since extraction from resources still needs it.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

Author: runningcode

plugin-build/src/main/kotlin/io/sentry/android/gradle/tasks/SentryCliExecTask.kt

@@ -37,9 +37,7 @@ abstract class SentryCliExecTask : Exec() {
 
   @get:Internal abstract val sentryTelemetryService: Property<SentryTelemetryService>
 
-  @get:Internal abstract val sentryProjectDir: DirectoryProperty
-
-  @get:Internal abstract val sentryRootDir: DirectoryProperty
+  @get:Input abstract val cliExecutable: Property<String>
 
   @get:Internal abstract val buildDirectory: DirectoryProperty
 
@@ -94,9 +92,7 @@ abstract class SentryCliExecTask : Exec() {
       args.add(1, "/c")
     }
 
-    val cliPath =
-      SentryCliProvider.getSentryCliPath(sentryProjectDir, buildDirectory, sentryRootDir)
-    args.add(SentryCliProvider.maybeExtractFromResources(buildDirectory, cliPath))
+    args.add(SentryCliProvider.maybeExtractFromResources(buildDirectory, cliExecutable.get()))
     args.addAll(preArgs())
 
     getArguments(args)

plugin-build/src/main/kotlin/io/sentry/android/gradle/util/SentryCliExec.kt

@@ -1,33 +1,23 @@
 package io.sentry.android.gradle.util
 
 import io.sentry.BuildConfig
+import io.sentry.android.gradle.cliExecutableProvider
 import io.sentry.android.gradle.tasks.SentryCliExecTask
 import io.sentry.android.gradle.util.CliFailureReason.OUTDATED
 import java.io.ByteArrayOutputStream
 import org.gradle.api.GradleException
-import org.gradle.api.Project
-import org.gradle.api.file.Directory
 import org.gradle.process.ExecSpec
 
 fun ExecSpec.setSentryPipelineEnv() {
   environment("SENTRY_PIPELINE", "sentry-gradle-plugin/${BuildConfig.Version}")
 }
 
-private fun Project.getIsolatedRootProjectDir(): Directory {
-  return if (GradleVersions.CURRENT >= GradleVersions.VERSION_8_8) {
-    isolated.rootProject.projectDirectory
-  } else {
-    rootProject.layout.projectDirectory
-  }
-}
-
 /**
  * An ext function for tasks that wrap sentry-cli, which provides common error handling. Must be
  * called at configuration phase (=when registering a task).
  */
 fun SentryCliExecTask.asSentryCliExec() {
-  sentryProjectDir.set(project.layout.projectDirectory)
-  sentryRootDir.set(project.getIsolatedRootProjectDir())
+  cliExecutable.set(project.cliExecutableProvider())
   buildDirectory.set(project.layout.buildDirectory)
 
   isIgnoreExitValue = true

plugin-build/src/test/kotlin/io/sentry/android/gradle/tasks/BundleSourcesTaskTest.kt

@@ -1,6 +1,7 @@
 package io.sentry.android.gradle.tasks
 
 import com.google.common.truth.Truth.assertThat
+import io.sentry.android.gradle.cliExecutableProvider
 import io.sentry.android.gradle.sourcecontext.BundleSourcesTask
 import io.sentry.android.gradle.sourcecontext.GenerateBundleIdTask.Companion.SENTRY_BUNDLE_ID_PROPERTY
 import java.io.File
@@ -242,8 +243,7 @@ class BundleSourcesTaskTest {
   }
 
   private fun SentryCliExecTask.configureCliPaths(project: Project) {
-    sentryProjectDir.set(project.layout.projectDirectory)
-    sentryRootDir.set(project.rootProject.layout.projectDirectory)
+    cliExecutable.set(project.cliExecutableProvider())
     buildDirectory.set(project.layout.buildDirectory)
   }
 

plugin-build/src/test/kotlin/io/sentry/android/gradle/tasks/SentryCliExecTaskTest.kt

@@ -1,6 +1,7 @@
 package io.sentry.android.gradle.tasks
 
 import io.sentry.android.gradle.SentryCliProvider
+import io.sentry.android.gradle.cliExecutableProvider
 import java.io.File
 import kotlin.test.assertEquals
 import kotlin.test.assertNull
@@ -139,8 +140,7 @@ class SentryCliExecTaskTest {
   }
 
   private fun SentryCliExecTask.configureCliPaths(project: Project) {
-    sentryProjectDir.set(project.layout.projectDirectory)
-    sentryRootDir.set(project.rootProject.layout.projectDirectory)
+    cliExecutable.set(project.cliExecutableProvider())
     buildDirectory.set(project.layout.buildDirectory)
   }
 

plugin-build/src/test/kotlin/io/sentry/android/gradle/tasks/SentryUploadAppArtifactTaskTest.kt

@@ -4,6 +4,7 @@ import com.google.common.truth.FailureMetadata
 import com.google.common.truth.Subject
 import com.google.common.truth.Truth.assertAbout
 import com.google.common.truth.Truth.assertThat
+import io.sentry.android.gradle.cliExecutableProvider
 import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
 import org.gradle.api.Project
@@ -314,8 +315,7 @@ class SentryUploadAppArtifactTaskTest {
   }
 
   private fun SentryCliExecTask.configureCliPaths(project: Project) {
-    sentryProjectDir.set(project.layout.projectDirectory)
-    sentryRootDir.set(project.rootProject.layout.projectDirectory)
+    cliExecutable.set(project.cliExecutableProvider())
     buildDirectory.set(project.layout.buildDirectory)
   }
 

plugin-build/src/test/kotlin/io/sentry/android/gradle/tasks/SentryUploadNativeSymbolsTaskTest.kt

@@ -1,5 +1,6 @@
 package io.sentry.android.gradle.tasks
 
+import io.sentry.android.gradle.cliExecutableProvider
 import java.io.File
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
@@ -179,8 +180,7 @@ class SentryUploadNativeSymbolsTaskTest {
   ): SentryUploadNativeSymbolsTask =
     project.tasks
       .register("testUploadNativeSymbols", SentryUploadNativeSymbolsTask::class.java) {
-        it.sentryProjectDir.set(project.layout.projectDirectory)
-        it.sentryRootDir.set(project.rootProject.layout.projectDirectory)
+        it.cliExecutable.set(project.cliExecutableProvider())
         it.buildDirectory.set(project.layout.buildDirectory)
         block(it)
       }

plugin-build/src/test/kotlin/io/sentry/android/gradle/tasks/SentryUploadProguardMappingTaskTest.kt

@@ -1,5 +1,6 @@
 package io.sentry.android.gradle.tasks
 
+import io.sentry.android.gradle.cliExecutableProvider
 import java.io.File
 import java.util.UUID
 import kotlin.test.assertEquals
@@ -324,8 +325,7 @@ class SentryUploadProguardMappingTaskTest {
   }
 
   private fun SentryCliExecTask.configureCliPaths(project: Project) {
-    sentryProjectDir.set(project.layout.projectDirectory)
-    sentryRootDir.set(project.rootProject.layout.projectDirectory)
+    cliExecutable.set(project.cliExecutableProvider())
     buildDirectory.set(project.layout.buildDirectory)
   }
 

plugin-build/src/test/kotlin/io/sentry/android/gradle/tasks/SentryUploadSnapshotsTaskTest.kt

@@ -1,6 +1,7 @@
 package io.sentry.android.gradle.tasks
 
 import com.google.common.truth.Truth.assertThat
+import io.sentry.android.gradle.cliExecutableProvider
 import java.io.File
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
@@ -219,8 +220,7 @@ class SentryUploadSnapshotsTaskTest {
   ): SentryUploadSnapshotsTask =
     project.tasks
       .register("testUploadSnapshots", SentryUploadSnapshotsTask::class.java) {
-        it.sentryProjectDir.set(project.layout.projectDirectory)
-        it.sentryRootDir.set(project.rootProject.layout.projectDirectory)
+        it.cliExecutable.set(project.cliExecutableProvider())
         it.buildDirectory.set(project.layout.buildDirectory)
         block(it)
       }

plugin-build/src/test/kotlin/io/sentry/android/gradle/tasks/UploadSourceBundleTaskTest.kt

@@ -1,5 +1,6 @@
 package io.sentry.android.gradle.tasks
 
+import io.sentry.android.gradle.cliExecutableProvider
 import io.sentry.android.gradle.sourcecontext.UploadSourceBundleTask
 import java.io.File
 import kotlin.test.assertEquals
@@ -197,8 +198,7 @@ class UploadSourceBundleTaskTest {
   }
 
   private fun SentryCliExecTask.configureCliPaths(project: Project) {
-    sentryProjectDir.set(project.layout.projectDirectory)
-    sentryRootDir.set(project.rootProject.layout.projectDirectory)
+    cliExecutable.set(project.cliExecutableProvider())
     buildDirectory.set(project.layout.buildDirectory)
   }
 }