From 2c26b2b8b2b802c5567d29b3ddcb91c90d771d2a Mon Sep 17 00:00:00 2001
From: Markus Hintersteiner <markus.hintersteiner@sentry.io>
Date: Tue, 14 Mar 2023 08:59:42 +0100
Subject: [PATCH] Fix don't set build folder as input for upload symbols task

Fixes Gradle 8 "Task x uses this output of task y without declaring an
explicit or implicit dependency." error
---
 .../src/main/kotlin/io/sentry/android/gradle/AppConfig.kt    | 1 -
 .../android/gradle/tasks/SentryUploadNativeSymbolsTask.kt    | 5 +----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/plugin-build/src/main/kotlin/io/sentry/android/gradle/AppConfig.kt b/plugin-build/src/main/kotlin/io/sentry/android/gradle/AppConfig.kt
index 2ac00ce0..7c129220 100644
--- a/plugin-build/src/main/kotlin/io/sentry/android/gradle/AppConfig.kt
+++ b/plugin-build/src/main/kotlin/io/sentry/android/gradle/AppConfig.kt
@@ -180,7 +180,6 @@ private fun ApplicationVariant.configureNativeSymbolsTask(
             SentryUploadNativeSymbolsTask::class.java
         ) {
             it.workingDir(project.rootDir)
-            it.buildDir.set(project.buildDir)
             it.autoUploadNativeSymbol.set(extension.autoUploadNativeSymbols)
             it.cliExecutable.set(cliExecutable)
             it.sentryProperties.set(sentryProps?.let { file -> project.file(file) })
diff --git a/plugin-build/src/main/kotlin/io/sentry/android/gradle/tasks/SentryUploadNativeSymbolsTask.kt b/plugin-build/src/main/kotlin/io/sentry/android/gradle/tasks/SentryUploadNativeSymbolsTask.kt
index 77792cd2..4635c06e 100644
--- a/plugin-build/src/main/kotlin/io/sentry/android/gradle/tasks/SentryUploadNativeSymbolsTask.kt
+++ b/plugin-build/src/main/kotlin/io/sentry/android/gradle/tasks/SentryUploadNativeSymbolsTask.kt
@@ -20,9 +20,6 @@ abstract class SentryUploadNativeSymbolsTask : Exec() {
         description = "Uploads native symbols to Sentry"
     }
 
-    @get:InputDirectory
-    abstract val buildDir: DirectoryProperty
-
     @get:Input
     abstract val cliExecutable: Property<String>
 
@@ -91,7 +88,7 @@ abstract class SentryUploadNativeSymbolsTask : Exec() {
         // where {variantName} could be debug/release...
         args.add(
             File(
-                buildDir.asFile.get(),
+                project.buildDir,
                 "intermediates${sep}merged_native_libs${sep}${variantName.get()}"
             ).absolutePath
         )