Skip to content

Commit 50cc733

Browse files
committed
fix: remove Task.project usage in rust tasks
1 parent 6b30300 commit 50cc733

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

src/main/kotlin/dev/matrix/agp/rust/RustBuildTask.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import dev.matrix.agp.rust.utils.RustBinaries
66
import dev.matrix.agp.rust.utils.SemanticVersion
77
import org.gradle.api.DefaultTask
88
import org.gradle.api.file.DirectoryProperty
9+
import org.gradle.api.file.FileSystemOperations
910
import org.gradle.api.provider.Property
1011
import org.gradle.api.tasks.Input
1112
import org.gradle.api.tasks.InputDirectory
@@ -19,6 +20,9 @@ internal abstract class RustBuildTask : DefaultTask() {
1920
@get:Inject
2021
abstract val execOperations: ExecOperations
2122

23+
@get:Inject
24+
abstract val fileSystemOperations: FileSystemOperations
25+
2226
@get:Input
2327
abstract val rustBinaries: Property<RustBinaries>
2428

@@ -96,7 +100,7 @@ internal abstract class RustBuildTask : DefaultTask() {
96100
}
97101
}.assertNormalExitValue()
98102

99-
project.copy {
103+
fileSystemOperations.copy {
100104
val dir = when (rustProfile == "dev") {
101105
true -> "debug"
102106
else -> rustProfile

src/main/kotlin/dev/matrix/agp/rust/RustCleanTask.kt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,24 @@
11
package dev.matrix.agp.rust
22

33
import org.gradle.api.DefaultTask
4+
import org.gradle.api.file.FileSystemOperations
45
import org.gradle.api.file.DirectoryProperty
56
import org.gradle.api.tasks.OutputDirectory
67
import org.gradle.api.tasks.TaskAction
8+
import javax.inject.Inject
79

810
internal abstract class RustCleanTask : DefaultTask() {
11+
@get:Inject
12+
abstract val fileSystemOperations: FileSystemOperations
13+
914
@get:OutputDirectory
1015
abstract val variantJniLibsDirectory: DirectoryProperty
1116

1217
@TaskAction
1318
fun taskAction() {
1419
val variantJniLibsDirectory = variantJniLibsDirectory.get()
1520

16-
project.delete {
21+
fileSystemOperations.delete {
1722
delete(variantJniLibsDirectory)
1823
}
1924
}

0 commit comments

Comments
 (0)