Skip to content

Commit d3d716a

Browse files
committed
Properly wire generate uuid task with mapping files
1 parent 27eab36 commit d3d716a

2 files changed

Lines changed: 10 additions & 7 deletions

File tree

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,7 @@ data class AndroidVariant74(private val variant: Variant) : SentryVariant {
4848
val artifacts = variant.artifacts
4949

5050
override fun mappingFileProvider(project: Project): Provider<FileCollection> =
51-
project.provider {
52-
project.files(variant.artifacts.get(SingleArtifact.OBFUSCATION_MAPPING_FILE))
53-
}
51+
variant.artifacts.get(SingleArtifact.OBFUSCATION_MAPPING_FILE).map { project.files(it) }
5452

5553
override fun sources(
5654
project: Project,

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@ import org.gradle.api.file.Directory
1212
import org.gradle.api.file.FileCollection
1313
import org.gradle.api.file.RegularFile
1414
import org.gradle.api.provider.Provider
15+
import org.gradle.api.tasks.InputFiles
1516
import org.gradle.api.tasks.Internal
17+
import org.gradle.api.tasks.PathSensitive
18+
import org.gradle.api.tasks.PathSensitivity
1619
import org.gradle.api.tasks.TaskAction
1720
import org.gradle.api.tasks.TaskProvider
1821
import org.gradle.work.DisableCachingByDefault
@@ -29,7 +32,9 @@ abstract class SentryGenerateProguardUuidTask : PropertiesFileOutputTask() {
2932
override val outputFile: Provider<RegularFile>
3033
get() = output.file(SENTRY_UUID_OUTPUT)
3134

32-
@get:Internal abstract val proguardMappingFiles: ConfigurableFileCollection
35+
@get:InputFiles
36+
@get:PathSensitive(PathSensitivity.RELATIVE)
37+
abstract val proguardMappingFiles: ConfigurableFileCollection
3338

3439
@TaskAction
3540
fun generateProperties() {
@@ -40,9 +45,9 @@ abstract class SentryGenerateProguardUuidTask : PropertiesFileOutputTask() {
4045
// no point for this task to go through all of them.
4146
// TODO: we'd have to change our SDK in order to support multiple proguard uuids at a time.
4247
val mappingFile = proguardMappingFiles.files.firstOrNull { it.exists() }
43-
val uuid = mappingFile?.let {
44-
UUID.nameUUIDFromBytes(it.contentHash().toByteArray())
45-
} ?: UUID.randomUUID()
48+
val uuid =
49+
mappingFile?.let { UUID.nameUUIDFromBytes(it.contentHash().toByteArray()) }
50+
?: UUID.randomUUID()
4651
outputFile.get().asFile.writer().use { writer ->
4752
writer.appendLine("$SENTRY_PROGUARD_MAPPING_UUID_PROPERTY=$uuid")
4853
}

0 commit comments

Comments
 (0)