Skip to content

Commit 33b8e48

Browse files
committed
Gradle 8.13-rc-1
1 parent 38f94df commit 33b8e48

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=f22cfbc3bd7e2e762910ed22926614b11af5af23456cec8730cde390b3e6da58
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-milestone-3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-rc-1-bin.zip
54
networkTimeout=10000
65
validateDistributionUrl=true
76
zipStoreBase=GRADLE_USER_HOME

src/main/groovy/com/netflix/gradle/plugins/packaging/ProjectPackagingExtension.groovy

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ import org.gradle.api.internal.file.FileResolver
1616
import org.gradle.api.internal.file.copy.CopySpecInternal
1717
import org.gradle.api.internal.file.copy.DefaultCopySpec
1818
import org.gradle.api.internal.project.ProjectInternal
19+
import org.gradle.api.internal.provider.DefaultPropertyFactory
20+
import org.gradle.api.internal.provider.PropertyHost
1921
import org.gradle.api.specs.Spec
2022
import org.gradle.api.tasks.util.PatternSet
2123
import org.gradle.api.tasks.util.internal.PatternSets
@@ -44,7 +46,11 @@ class ProjectPackagingExtension extends SystemPackagingExtension {
4446
public ProjectPackagingExtension(Project project) {
4547
FileResolver resolver = ((ProjectInternal) project).getFileResolver();
4648
Instantiator instantiator = ((ProjectInternal) project).getServices().get(Instantiator.class);
47-
if (GradleVersion.current().baseVersion >= GradleVersion.version("8.3") || GradleVersion.current().version.startsWith('8.3')) {
49+
if (GradleVersion.current().baseVersion >= GradleVersion.version("8.13-rc-1")) {
50+
FileCollectionFactory fileCollectionFactory = ((ProjectInternal) project).getServices().get(FileCollectionFactory.class);
51+
Factory<PatternSet> patternSetFactory = new PatternSets.PatternSetFactory(PatternSpecFactory.INSTANCE)
52+
delegateCopySpec = new DefaultCopySpec(fileCollectionFactory, new DefaultPropertyFactory(PropertyHost.NO_OP), instantiator, patternSetFactory);
53+
} else if (GradleVersion.current().baseVersion >= GradleVersion.version("8.3") || GradleVersion.current().version.startsWith('8.3')) {
4854
FileCollectionFactory fileCollectionFactory = ((ProjectInternal) project).getServices().get(FileCollectionFactory.class);
4955
Factory<PatternSet> patternSetFactory = new PatternSets.PatternSetFactory(PatternSpecFactory.INSTANCE)
5056
delegateCopySpec = new DefaultCopySpec(fileCollectionFactory, project.objects, instantiator, patternSetFactory);

0 commit comments

Comments
 (0)