Skip to content

Repace buildDir with layout.buildDirectory #260

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
StefMa merged 1 commit into from
Jan 5, 2026
Merged

Repace buildDir with layout.buildDirectory #260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/kotlin/com/ioki/sentry/proguard/gradle/plugin/SentryProguardGradlePlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ private fun Project.replaceSentryProguardUuidInAndroidManifest(
sentryProguardExtension: SentryProguardExtension,
) {
val downloadSentryCliTask = tasks.registerDownloadSentryCliTask(
objects.fileProperty().fileValue(buildDir.resolve(SENTRY_CLI_FILE_PATH))
layout.buildDirectory.file(SENTRY_CLI_FILE_PATH),
)

extension.onVariants { variant ->
Expand Down
13 changes: 9 additions & 4 deletions src/main/kotlin/com/ioki/sentry/proguard/gradle/plugin/tasks/UploadUuidToSentryTask.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,16 @@ package com.ioki.sentry.proguard.gradle.plugin.tasks

import com.ioki.sentry.proguard.gradle.plugin.SentryProguardExtension
import org.gradle.api.DefaultTask
import org.gradle.api.file.RegularFile
import org.gradle.api.file.RegularFileProperty
import org.gradle.api.logging.LogLevel
import org.gradle.api.provider.Property
import org.gradle.api.provider.Provider
import org.gradle.api.tasks.*
import org.gradle.api.tasks.Input
import org.gradle.api.tasks.InputFile
import org.gradle.api.tasks.TaskAction
import org.gradle.api.tasks.TaskContainer
import org.gradle.api.tasks.TaskProvider
import org.gradle.process.ExecOperations
import javax.inject.Inject

Expand Down Expand Up @@ -64,8 +69,8 @@ internal abstract class UploadUuidToSentryTask : DefaultTask() {
@get:Inject
abstract val execOperations: ExecOperations

private val mappingFilePath: Provider<String> = variantName.map {
"${project.buildDir}/outputs/mapping/$it/mapping.txt"
private val mappingFilePath: Provider<RegularFile> = variantName.flatMap {
project.layout.buildDirectory.file("outputs/mapping/$it/mapping.txt")
}

@TaskAction
Expand All @@ -76,7 +81,7 @@ internal abstract class UploadUuidToSentryTask : DefaultTask() {
"upload-proguard",
"--uuid",
uuid.get(),
mappingFilePath.get(),
mappingFilePath.get().asFile.path,
"--org",
sentryOrg.get(),
"--project",
Expand Down