Make SentryUploadNativeSymbolsTask configuration-cache compatible (#747)

getsentry · Aug 5, 2024 · 4c54dc2 · 4c54dc2
1 parent e3f61e3
commit 4c54dc2
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Fixes
 
 - Fix plugin for spring-dependency-management 1.1.6 ([#741](https://github.com/getsentry/sentry-android-gradle-plugin/pull/741))
+- Make `SentryUploadNativeSymbolsTask` configuration-cache compatible ([#747](https://github.com/getsentry/sentry-android-gradle-plugin/pull/747))
 
 ### Dependencies
 

diff --git a/plugin-build/build.gradle.kts b/plugin-build/build.gradle.kts
@@ -94,7 +94,7 @@ dependencies {
     testImplementationAar(Libs.SQLITE)
     testImplementationAar(Libs.SQLITE_FRAMEWORK)
     testRuntimeOnly(files(androidSdkPath))
-    testImplementation(Libs.SENTRY_ANDROID)
+    testImplementationAar(Libs.SENTRY_ANDROID)
     testImplementationAar(Libs.SENTRY_ANDROID_OKHTTP)
     testImplementationAar(Libs.SENTRY_OKHTTP)
 

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
@@ -32,6 +32,8 @@ 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")
@@ -46,7 +48,7 @@ abstract class SentryUploadNativeSymbolsTask : SentryCliExecTask() {
         // where {variantName} could be debug/release...
         args.add(
             File(
-                project.buildDir,
+                buildDir.get(),
                 "intermediates${sep}merged_native_libs${sep}${variantName.get()}"
             ).absolutePath
         )

diff --git a/...rc/test/kotlin/io/sentry/android/gradle/integration/SentryPluginConfigurationCacheTest.kt b/...rc/test/kotlin/io/sentry/android/gradle/integration/SentryPluginConfigurationCacheTest.kt
@@ -234,4 +234,44 @@ class SentryPluginConfigurationCacheTest :
         val run = runner.build()
         assertTrue(run.output) { "BUILD SUCCESSFUL" in run.output }
     }
+
+    @Test
+    fun `native symbols upload task respects configuration cache`() {
+        assumeThat(
+            "SentryUploadNativeSymbolsTask only supports " +
+                "configuration cache from Gradle 7.5 onwards",
+            GradleVersions.CURRENT >= GradleVersions.VERSION_7_5,
+            `is`(true)
+        )
+        appBuildFile.writeText(
+            // language=Groovy
+            """
+            plugins {
+              id "com.android.application"
+              id "io.sentry.android.gradle"
+            }
+
+            android {
+              namespace 'com.example'
+            }
+
+            sentry {
+              includeNativeSources = true
+              uploadNativeSymbols = true
+              includeProguardMapping = false
+              autoUploadProguardMapping = false
+              autoInstallation.enabled = false
+              telemetry = false
+            }
+            """.trimIndent()
+        )
+        runner.appendArguments(":app:assembleRelease")
+            .appendArguments("--configuration-cache")
+
+        val output = runner.build().output
+        assertTrue { "Configuration cache entry stored." in output }
+
+        val outputWithConfigCache = runner.build().output
+        assertTrue { "Configuration cache entry reused." in outputWithConfigCache }
+    }
 }