Skip to content

Commit 19aa615

Browse files
committed
Using internal FileOperations API to maintain compatibility with Gradle 5.x
1 parent 21f990e commit 19aa615

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/main/groovy/org/gradle/android/workarounds/RoomSchemaLocationWorkaround.groovy

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import org.gradle.api.file.ConfigurableFileCollection
99
import org.gradle.api.file.Directory
1010
import org.gradle.api.file.DirectoryProperty
1111
import org.gradle.api.file.DuplicatesStrategy
12-
import org.gradle.api.file.FileSystemOperations
1312
import org.gradle.api.internal.file.FileOperations
1413
import org.gradle.api.model.ObjectFactory
1514
import org.gradle.api.provider.Provider
@@ -369,7 +368,8 @@ class RoomSchemaLocationWorkaround implements Workaround {
369368
*/
370369
static abstract class RoomSchemaLocationMergeTask extends DefaultTask {
371370

372-
@Inject abstract FileSystemOperations getFileSystem()
371+
// Using older internal API to maintain compatibility with Gradle 5.x
372+
@Inject abstract FileOperations getFileOperations()
373373

374374
@Internal
375375
MergeAssociations roomSchemaMergeLocations
@@ -378,10 +378,10 @@ class RoomSchemaLocationWorkaround implements Workaround {
378378
void mergeSourcesToDestinations() {
379379
roomSchemaMergeLocations.mergeAssociations.each { destination, source ->
380380
println "Merging schemas to ${destination.get().asFile}"
381-
fileSystem.copy {
382-
duplicatesStrategy = DuplicatesStrategy.INCLUDE
383-
into(destination)
384-
from(source)
381+
fileOperations.copy {
382+
it.duplicatesStrategy = DuplicatesStrategy.INCLUDE
383+
it.into(destination)
384+
it.from(source)
385385
}
386386
}
387387
}

0 commit comments

Comments
 (0)