fix(config-cache): Resolve CLI path via ValueSource task input (GRADLE-70) (#1264)

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

The sentry-cli path was memoized in a static field on SentryCliProvider.
That field survives across builds in the Gradle daemon and is not
invalidated when switching branches, so a stale path pointing at a
sentry-cli temp file from a previous checkout could be reused, causing
"No such file or directory" failures when configuration caching is on.

Remove the static memoization and stop threading the cli path through
the configure() call chain. Each SentryCliExecTask now resolves the path
itself in asSentryCliExec() via the existing cliExecutableProvider()
ValueSource, which is properly invalidated on branch switches, and wires
its own buildDirectory input.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

* docs(changelog): Add entry for CLI path task-input fix (GRADLE-70)

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>

Author: runningcode

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## Unreleased
+
+### Fixes
+
+- Resolve the sentry-cli path as a task input instead of memoizing it in a static field, fixing stale-path build failures when switching branches with the configuration cache enabled ([#1264](https://github.com/getsentry/sentry-android-gradle-plugin/pull/1264))
+  - This fixed the issue where sentry-cli could not be found (`A problem occurred starting process 'command  ../sentry-cliXXX.exe'`)
+
 ## 6.10.0
 
 ### Features

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

@@ -77,7 +77,7 @@ fun ApplicationAndroidComponentsExtension.configure(
     }
 
     if (extension.snapshots.enabled.get()) {
-      variant.configureSnapshotsTasks(project, extension, cliExecutable, sentryOrg, sentryProject)
+      variant.configureSnapshotsTasks(project, extension, sentryOrg, sentryProject)
     }
 
     if (isVariantAllowed(extension, variant.name, variant.flavorName, variant.buildType)) {
@@ -106,7 +106,6 @@ fun ApplicationAndroidComponentsExtension.configure(
           sentryTelemetryProvider,
           paths,
           sourceFiles,
-          cliExecutable,
           sentryOrg,
           sentryProject,
         )
@@ -118,7 +117,6 @@ fun ApplicationAndroidComponentsExtension.configure(
           extension,
           sentryTelemetryProvider,
           paths,
-          cliExecutable,
           sentryOrg,
           sentryProject,
         )
@@ -139,7 +137,6 @@ fun ApplicationAndroidComponentsExtension.configure(
         project,
         extension,
         sentryTelemetryProvider,
-        cliExecutable,
         sentryOrg,
         sentryProject,
       )
@@ -257,7 +254,6 @@ fun ApplicationAndroidComponentsExtension.configure(
           project,
           extension,
           sentryTelemetryProvider,
-          cliExecutable,
           sentryOrg,
           sentryProject,
         )
@@ -297,7 +293,6 @@ private fun Variant.configureSourceBundleTasks(
   sentryTelemetryProvider: Provider<SentryTelemetryService>,
   paths: OutputPaths,
   sourceFiles: Provider<out Collection<Directory>>?,
-  cliExecutable: Provider<String>,
   sentryOrg: String?,
   sentryProject: String?,
 ): SourceContext.SourceContextTasks? {
@@ -313,7 +308,6 @@ private fun Variant.configureSourceBundleTasks(
         variant,
         paths,
         sourceFiles,
-        cliExecutable,
         sentryOrg,
         sentryProject,
         taskSuffix,
@@ -354,7 +348,6 @@ private fun ApplicationVariant.configureProguardMappingsTasks(
   extension: SentryPluginExtension,
   sentryTelemetryProvider: Provider<SentryTelemetryService>,
   paths: OutputPaths,
-  cliExecutable: Provider<String>,
   sentryOrg: String?,
   sentryProject: String?,
 ): TaskProvider<SentryGenerateProguardUuidTask>? {
@@ -386,7 +379,6 @@ private fun ApplicationVariant.configureProguardMappingsTasks(
         extension,
         sentryTelemetryProvider,
         debug = extension.debug,
-        cliExecutable = cliExecutable,
         generateUuidTask = generateUuidTask,
         sentryProperties = sentryProps,
         mappingFiles = mappings,
@@ -460,7 +452,6 @@ private fun ApplicationVariant.configureDistributionPropertiesTask(
 private fun ApplicationVariant.configureSnapshotsTasks(
   project: Project,
   extension: SentryPluginExtension,
-  cliExecutable: Provider<String>,
   sentryOrg: String?,
   sentryProject: String?,
 ) {
@@ -478,7 +469,6 @@ private fun ApplicationVariant.configureSnapshotsTasks(
       project = project,
       extension = extension,
       sentryTelemetryProvider = null,
-      cliExecutable = cliExecutable,
       sentryOrgOverride = sentryOrg,
       sentryProjectOverride = sentryProject,
       applicationId = applicationId,
@@ -557,7 +547,6 @@ fun Variant.configureUploadAppTasks(
   project: Project,
   extension: SentryPluginExtension,
   sentryTelemetryProvider: Provider<SentryTelemetryService>,
-  cliExecutable: Provider<String>,
   sentryOrg: String?,
   sentryProject: String?,
 ): Pair<TaskProvider<SentryUploadAppArtifactTask>, TaskProvider<SentryUploadAppArtifactTask>> {
@@ -570,7 +559,6 @@ fun Variant.configureUploadAppTasks(
       extension,
       sentryTelemetryProvider,
       debug = extension.debug,
-      cliExecutable = cliExecutable,
       appBundle = variant.bundle,
       apk = variant.apk,
       sentryOrg = sentryOrg?.let { project.provider { it } } ?: extension.org,

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

@@ -24,8 +24,6 @@ import org.gradle.api.tasks.Input
 
 internal object SentryCliProvider {
 
-  @field:Volatile private var memoizedCliPath: String? = null
-
   /**
    * Return the correct sentry-cli executable path to use for the given project. This will look for
    * a sentry-cli executable in a local node_modules in case it was put there by sentry-react-native
@@ -34,40 +32,26 @@ internal object SentryCliProvider {
    * without actually extracting it.
    */
   @JvmStatic
-  @Synchronized
   fun getSentryCliPath(
     projectDir: DirectoryProperty,
     projectBuildDir: DirectoryProperty,
     rootDir: DirectoryProperty,
   ): String {
-    val cliPath = memoizedCliPath
-    if (!cliPath.isNullOrEmpty() && File(cliPath).exists()) {
-      logger.info { "Using memoized cli path: $cliPath" }
-      return cliPath
-    }
-    // If a path is provided explicitly use that first.
     logger.info { "Searching cli from sentry.properties file..." }
 
     searchCliInPropertiesFile(projectDir, rootDir)?.let {
       logger.info { "cli Found: $it" }
-      memoizedCliPath = it
       return@getSentryCliPath it
     } ?: logger.info { "sentry-cli not found in sentry.properties file" }
 
-    // next up try a packaged version of sentry-cli
     val cliResLocation = getCliLocationInResources()
     if (!cliResLocation.isNullOrBlank()) {
       logger.info { "cli present in resources: $cliResLocation" }
-      // just provide the target extraction path
-      // actual extraction will be done prior to task execution
-      val extractedResourcePath =
-        getCliResourcesExtractionPath(projectBuildDir).get().asFile.absolutePath
-      memoizedCliPath = extractedResourcePath
-      return extractedResourcePath
+      return getCliResourcesExtractionPath(projectBuildDir).get().asFile.absolutePath
     }
 
     logger.error { "Falling back to invoking `sentry-cli` from shell" }
-    return "sentry-cli".also { memoizedCliPath = it }
+    return "sentry-cli"
   }
 
   private fun getCliLocationInResources(): String? {

plugin-build/src/main/kotlin/io/sentry/android/gradle/sourcecontext/BundleSourcesTask.kt

@@ -77,7 +77,6 @@ abstract class BundleSourcesTask : SentryCliExecTask() {
       collectSourcesTask: TaskProvider<CollectSourcesTask>,
       output: Provider<Directory>,
       debug: Property<Boolean>,
-      cliExecutable: Provider<String>,
       sentryOrg: Provider<String>,
       sentryProject: Provider<String>,
       sentryAuthToken: Property<String>,
@@ -95,7 +94,6 @@ abstract class BundleSourcesTask : SentryCliExecTask() {
         task.sentryAuthToken.set(sentryAuthToken)
         task.sentryUrl.set(sentryUrl)
         task.sourceDir.set(collectSourcesTask.flatMap { it.output })
-        task.cliExecutable.set(cliExecutable)
         SentryPropertiesFileProvider.getPropertiesFilePath(project, variant)?.let {
           task.sentryProperties.set(File(it))
         }

plugin-build/src/main/kotlin/io/sentry/android/gradle/sourcecontext/SourceContext.kt

@@ -17,7 +17,6 @@ class SourceContext {
       variant: SentryVariant,
       paths: OutputPaths,
       sourceFiles: Provider<out Collection<Directory>>?,
-      cliExecutable: Provider<String>,
       sentryOrg: String?,
       sentryProject: String?,
       taskSuffix: String,
@@ -54,7 +53,6 @@ class SourceContext {
           collectSourcesTask,
           output = paths.bundleDir,
           extension.debug,
-          cliExecutable,
           sentryOrg?.let { project.provider { it } } ?: extension.org,
           sentryProject?.let { project.provider { it } } ?: extension.projectName,
           extension.authToken,
@@ -71,7 +69,6 @@ class SourceContext {
           variant,
           bundleSourcesTask,
           extension.debug,
-          cliExecutable,
           extension.autoUploadSourceContext,
           sentryOrg?.let { project.provider { it } } ?: extension.org,
           sentryProject?.let { project.provider { it } } ?: extension.projectName,

plugin-build/src/main/kotlin/io/sentry/android/gradle/sourcecontext/UploadSourceBundleTask.kt

@@ -68,7 +68,6 @@ abstract class UploadSourceBundleTask : SentryCliExecTask() {
       variant: SentryVariant,
       bundleSourcesTask: TaskProvider<BundleSourcesTask>,
       debug: Property<Boolean>,
-      cliExecutable: Provider<String>,
       autoUploadSourceContext: Property<Boolean>,
       sentryOrg: Provider<String>,
       sentryProject: Provider<String>,
@@ -87,7 +86,6 @@ abstract class UploadSourceBundleTask : SentryCliExecTask() {
         task.sentryAuthToken.set(sentryAuthToken)
         task.sentryUrl.set(sentryUrl)
         task.sourceBundleDir.set(bundleSourcesTask.flatMap { it.output })
-        task.cliExecutable.set(cliExecutable)
         task.autoUploadSourceContext.set(autoUploadSourceContext)
         SentryPropertiesFileProvider.getPropertiesFilePath(project, variant)?.let {
           task.sentryProperties.set(File(it))

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

@@ -22,8 +22,6 @@ abstract class SentryCliExecTask : Exec() {
 
   @get:Input @get:Optional abstract val debug: Property<Boolean>
 
-  @get:Input abstract val cliExecutable: Property<String>
-
   @get:InputFile
   @get:Optional
   @get:PathSensitive(PathSensitivity.RELATIVE)
@@ -39,7 +37,9 @@ abstract class SentryCliExecTask : Exec() {
 
   @get:Internal abstract val sentryTelemetryService: Property<SentryTelemetryService>
 
-  private val buildDirectory: DirectoryProperty = project.layout.buildDirectory
+  @get:Input abstract val cliExecutable: Property<String>
+
+  @get:Internal abstract val buildDirectory: DirectoryProperty
 
   override fun exec() {
     computeCommandLineArgs().let {
@@ -92,8 +92,7 @@ abstract class SentryCliExecTask : Exec() {
       args.add(1, "/c")
     }
 
-    val cliPath = SentryCliProvider.maybeExtractFromResources(buildDirectory, cliExecutable.get())
-    args.add(cliPath)
+    args.add(SentryCliProvider.maybeExtractFromResources(buildDirectory, cliExecutable.get()))
     args.addAll(preArgs())
 
     getArguments(args)

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

@@ -101,7 +101,6 @@ abstract class SentryUploadAppArtifactTask @Inject constructor(objectFactory: Ob
       debug: Property<Boolean>,
       appBundle: Provider<RegularFile>,
       apk: Provider<Directory>,
-      cliExecutable: Provider<String>,
       sentryProperties: String?,
       sentryOrg: Provider<String>,
       sentryProject: Provider<String>,
@@ -118,7 +117,7 @@ abstract class SentryUploadAppArtifactTask @Inject constructor(objectFactory: Ob
         ) { task ->
           task.workingDir(project.rootDir)
           task.debug.set(debug)
-          task.cliExecutable.set(cliExecutable)
+
           task.sentryProperties.set(sentryProperties?.let { file -> project.file(file) })
           task.bundle.set(appBundle)
           task.sentryOrganization.set(sentryOrg)
@@ -148,7 +147,7 @@ abstract class SentryUploadAppArtifactTask @Inject constructor(objectFactory: Ob
         ) { task ->
           task.workingDir(project.rootDir)
           task.debug.set(debug)
-          task.cliExecutable.set(cliExecutable)
+
           task.sentryProperties.set(sentryProperties?.let { file -> project.file(file) })
           task.apk.set(apk)
           task.sentryOrganization.set(sentryOrg)

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

@@ -31,8 +31,6 @@ abstract class SentryUploadNativeSymbolsTask : SentryCliExecTask() {
 
   @get:Internal abstract val variantName: Property<String>
 
-  private val buildDir: Provider<File> = project.layout.buildDirectory.asFile
-
   override fun getArguments(args: MutableList<String>) {
     args.add("debug-files")
     args.add("upload")
@@ -44,7 +42,8 @@ abstract class SentryUploadNativeSymbolsTask : SentryCliExecTask() {
     // eg absoluteProjectFolderPath/build/intermediates/merged_native_libs/{variantName}
     // where {variantName} could be debug/release...
     args.add(
-      File(buildDir.get(), "intermediates/merged_native_libs/${variantName.get()}").absolutePath
+      File(buildDirectory.get().asFile, "intermediates/merged_native_libs/${variantName.get()}")
+        .absolutePath
     )
 
     // Only include sources if includeNativeSources is enabled, as this is opt-in feature
@@ -60,7 +59,6 @@ abstract class SentryUploadNativeSymbolsTask : SentryCliExecTask() {
       sentryTelemetryProvider: Provider<SentryTelemetryService>,
       variantName: String,
       debug: Property<Boolean>,
-      cliExecutable: Provider<String>,
       sentryProperties: String?,
       sentryOrg: Provider<String>,
       sentryProject: Provider<String>,
@@ -78,7 +76,6 @@ abstract class SentryUploadNativeSymbolsTask : SentryCliExecTask() {
           task.workingDir(project.rootDir)
           task.debug.set(debug)
           task.autoUploadNativeSymbol.set(autoUploadNativeSymbols)
-          task.cliExecutable.set(cliExecutable)
           task.sentryProperties.set(sentryProperties?.let { file -> project.file(file) })
           task.includeNativeSources.set(includeNativeSources)
           task.variantName.set(variantName)
@@ -99,7 +96,6 @@ fun SentryVariant.configureNativeSymbolsTask(
   project: Project,
   extension: SentryPluginExtension,
   sentryTelemetryProvider: Provider<SentryTelemetryService>,
-  cliExecutable: Provider<String>,
   sentryOrg: String?,
   sentryProject: String?,
 ) {
@@ -113,7 +109,6 @@ fun SentryVariant.configureNativeSymbolsTask(
         sentryTelemetryProvider = sentryTelemetryProvider,
         variantName = name,
         debug = extension.debug,
-        cliExecutable = cliExecutable,
         sentryProperties = sentryProps,
         autoUploadNativeSymbols = extension.autoUploadNativeSymbols,
         includeNativeSources = extension.includeNativeSources,

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

@@ -89,7 +89,6 @@ abstract class SentryUploadProguardMappingsTask : SentryCliExecTask() {
       extension: SentryPluginExtension,
       sentryTelemetryProvider: Provider<SentryTelemetryService>?,
       debug: Property<Boolean>,
-      cliExecutable: Provider<String>,
       sentryProperties: String?,
       generateUuidTask: Provider<SentryGenerateProguardUuidTask>,
       mappingFiles: Provider<FileCollection>,
@@ -108,7 +107,6 @@ abstract class SentryUploadProguardMappingsTask : SentryCliExecTask() {
           task.dependsOn(generateUuidTask)
           task.workingDir(project.rootDir)
           task.debug.set(debug)
-          task.cliExecutable.set(cliExecutable)
           task.sentryProperties.set(sentryProperties?.let { file -> project.file(file) })
           task.uuidFile.set(generateUuidTask.flatMap { it.outputFile })
           task.mappingsFiles = mappingFiles