File tree Expand file tree Collapse file tree 1 file changed +6
-6
lines changed
src/main/groovy/org/gradle/android/workarounds Expand file tree Collapse file tree 1 file changed +6
-6
lines changed Original file line number Diff line number Diff line change @@ -9,7 +9,6 @@ import org.gradle.api.file.ConfigurableFileCollection
9
9
import org.gradle.api.file.Directory
10
10
import org.gradle.api.file.DirectoryProperty
11
11
import org.gradle.api.file.DuplicatesStrategy
12
- import org.gradle.api.file.FileSystemOperations
13
12
import org.gradle.api.internal.file.FileOperations
14
13
import org.gradle.api.model.ObjectFactory
15
14
import org.gradle.api.provider.Provider
@@ -369,7 +368,8 @@ class RoomSchemaLocationWorkaround implements Workaround {
369
368
*/
370
369
static abstract class RoomSchemaLocationMergeTask extends DefaultTask {
371
370
372
- @Inject abstract FileSystemOperations getFileSystem ()
371
+ // Using older internal API to maintain compatibility with Gradle 5.x
372
+ @Inject abstract FileOperations getFileOperations ()
373
373
374
374
@Internal
375
375
MergeAssociations roomSchemaMergeLocations
@@ -378,10 +378,10 @@ class RoomSchemaLocationWorkaround implements Workaround {
378
378
void mergeSourcesToDestinations () {
379
379
roomSchemaMergeLocations. mergeAssociations. each { destination , source ->
380
380
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)
385
385
}
386
386
}
387
387
}
You can’t perform that action at this time.
0 commit comments