diff --git a/src/main/groovy/com/netflix/gradle/plugins/packaging/ProjectPackagingExtension.groovy b/src/main/groovy/com/netflix/gradle/plugins/packaging/ProjectPackagingExtension.groovy index 36734726..d95cce8d 100644 --- a/src/main/groovy/com/netflix/gradle/plugins/packaging/ProjectPackagingExtension.groovy +++ b/src/main/groovy/com/netflix/gradle/plugins/packaging/ProjectPackagingExtension.groovy @@ -17,6 +17,7 @@ import org.gradle.api.internal.file.copy.CopySpecInternal import org.gradle.api.internal.file.copy.DefaultCopySpec import org.gradle.api.internal.project.ProjectInternal import org.gradle.api.internal.provider.DefaultPropertyFactory +import org.gradle.api.internal.provider.PropertyFactory import org.gradle.api.internal.provider.PropertyHost import org.gradle.api.specs.Spec import org.gradle.api.tasks.util.PatternSet @@ -46,11 +47,12 @@ class ProjectPackagingExtension extends SystemPackagingExtension { public ProjectPackagingExtension(Project project) { FileResolver resolver = ((ProjectInternal) project).getFileResolver(); Instantiator instantiator = ((ProjectInternal) project).getServices().get(Instantiator.class); - if (GradleVersion.current().baseVersion >= GradleVersion.version("8.13-rc-1")) { - FileCollectionFactory fileCollectionFactory = ((ProjectInternal) project).getServices().get(FileCollectionFactory.class); + if (GradleVersion.current().baseVersion >= GradleVersion.version("8.13") || GradleVersion.current().version.startsWith('8.13')) { + FileCollectionFactory fileCollectionFactory = ((ProjectInternal) project).getServices().get(FileCollectionFactory.class) + PropertyFactory propertyFactory = ((ProjectInternal) project).getServices().get(PropertyFactory.class) Factory patternSetFactory = new PatternSets.PatternSetFactory(PatternSpecFactory.INSTANCE) - delegateCopySpec = new DefaultCopySpec(fileCollectionFactory, new DefaultPropertyFactory(PropertyHost.NO_OP), instantiator, patternSetFactory); - } else if (GradleVersion.current().baseVersion >= GradleVersion.version("8.3") || GradleVersion.current().version.startsWith('8.3')) { + delegateCopySpec = new DefaultCopySpec(fileCollectionFactory, propertyFactory, instantiator, patternSetFactory) + } else if (GradleVersion.current().baseVersion >= GradleVersion.version("8.3") || GradleVersion.current().version.startsWith('8.3')) { FileCollectionFactory fileCollectionFactory = ((ProjectInternal) project).getServices().get(FileCollectionFactory.class); Factory patternSetFactory = new PatternSets.PatternSetFactory(PatternSpecFactory.INSTANCE) delegateCopySpec = new DefaultCopySpec(fileCollectionFactory, project.objects, instantiator, patternSetFactory);