Skip to content

Commit fc91c32

Browse files
authored
Repace buildDir with layout.buildDirectory (#260)
1 parent 631312f commit fc91c32

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

src/main/kotlin/com/ioki/sentry/proguard/gradle/plugin/SentryProguardGradlePlugin.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ private fun Project.replaceSentryProguardUuidInAndroidManifest(
2525
sentryProguardExtension: SentryProguardExtension,
2626
) {
2727
val downloadSentryCliTask = tasks.registerDownloadSentryCliTask(
28-
objects.fileProperty().fileValue(buildDir.resolve(SENTRY_CLI_FILE_PATH))
28+
layout.buildDirectory.file(SENTRY_CLI_FILE_PATH),
2929
)
3030

3131
extension.onVariants { variant ->

src/main/kotlin/com/ioki/sentry/proguard/gradle/plugin/tasks/UploadUuidToSentryTask.kt

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,16 @@ package com.ioki.sentry.proguard.gradle.plugin.tasks
22

33
import com.ioki.sentry.proguard.gradle.plugin.SentryProguardExtension
44
import org.gradle.api.DefaultTask
5+
import org.gradle.api.file.RegularFile
56
import org.gradle.api.file.RegularFileProperty
67
import org.gradle.api.logging.LogLevel
78
import org.gradle.api.provider.Property
89
import org.gradle.api.provider.Provider
9-
import org.gradle.api.tasks.*
10+
import org.gradle.api.tasks.Input
11+
import org.gradle.api.tasks.InputFile
12+
import org.gradle.api.tasks.TaskAction
13+
import org.gradle.api.tasks.TaskContainer
14+
import org.gradle.api.tasks.TaskProvider
1015
import org.gradle.process.ExecOperations
1116
import javax.inject.Inject
1217

@@ -64,8 +69,8 @@ internal abstract class UploadUuidToSentryTask : DefaultTask() {
6469
@get:Inject
6570
abstract val execOperations: ExecOperations
6671

67-
private val mappingFilePath: Provider<String> = variantName.map {
68-
"${project.buildDir}/outputs/mapping/$it/mapping.txt"
72+
private val mappingFilePath: Provider<RegularFile> = variantName.flatMap {
73+
project.layout.buildDirectory.file("outputs/mapping/$it/mapping.txt")
6974
}
7075

7176
@TaskAction
@@ -76,7 +81,7 @@ internal abstract class UploadUuidToSentryTask : DefaultTask() {
7681
"upload-proguard",
7782
"--uuid",
7883
uuid.get(),
79-
mappingFilePath.get(),
84+
mappingFilePath.get().asFile.path,
8085
"--org",
8186
sentryOrg.get(),
8287
"--project",

0 commit comments

Comments
 (0)