Skip to content

Commit 9c5155f

Browse files
Excavator: Upgrade gradle wrapper to the latest version (#836)
1 parent 3f844ac commit 9c5155f

File tree

7 files changed

+21
-10
lines changed

7 files changed

+21
-10
lines changed
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
type: fix
2+
fix:
3+
description: Support Gradle 8.12
4+
links:
5+
- https://github.com/palantir/gradle-docker/pull/836

gradle/wrapper/gradle-wrapper.jar

130 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/main/groovy/com/palantir/gradle/docker/DockerComponent.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package com.palantir.gradle.docker;
1818

1919
// CHECKSTYLE:OFF
20+
2021
import java.util.Collections;
2122
import java.util.LinkedHashSet;
2223
import java.util.Set;
@@ -28,8 +29,8 @@
2829
import org.gradle.api.attributes.AttributeContainer;
2930
import org.gradle.api.attributes.Usage;
3031
import org.gradle.api.capabilities.Capability;
32+
import org.gradle.api.internal.attributes.AttributesFactory;
3133
import org.gradle.api.internal.attributes.ImmutableAttributes;
32-
import org.gradle.api.internal.attributes.ImmutableAttributesFactory;
3334
import org.gradle.api.internal.component.SoftwareComponentInternal;
3435
import org.gradle.api.internal.component.UsageContext;
3536
import org.gradle.api.model.ObjectFactory;
@@ -44,7 +45,7 @@ public DockerComponent(
4445
PublishArtifact dockerArtifact,
4546
DependencySet runtimeDependencies,
4647
ObjectFactory objectFactory,
47-
ImmutableAttributesFactory attributesFactory) {
48+
AttributesFactory attributesFactory) {
4849
artifacts.add(dockerArtifact);
4950
this.runtimeDependencies = runtimeDependencies;
5051
Usage usage = objectFactory.named(Usage.class, Usage.JAVA_RUNTIME);

src/main/groovy/com/palantir/gradle/docker/PalantirDockerPlugin.groovy

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,13 @@
1515
*/
1616
package com.palantir.gradle.docker
1717

18-
import java.util.regex.Pattern
19-
import javax.inject.Inject
2018
import org.gradle.api.GradleException
2119
import org.gradle.api.Plugin
2220
import org.gradle.api.Project
2321
import org.gradle.api.Task
2422
import org.gradle.api.artifacts.Configuration
2523
import org.gradle.api.artifacts.PublishArtifact
26-
import org.gradle.api.internal.attributes.ImmutableAttributesFactory
24+
import org.gradle.api.internal.attributes.AttributesFactory
2725
import org.gradle.api.logging.LogLevel
2826
import org.gradle.api.logging.Logger
2927
import org.gradle.api.logging.Logging
@@ -33,16 +31,19 @@ import org.gradle.api.tasks.Delete
3331
import org.gradle.api.tasks.Exec
3432
import org.gradle.api.tasks.bundling.Zip
3533

34+
import javax.inject.Inject
35+
import java.util.regex.Pattern
36+
3637
class PalantirDockerPlugin implements Plugin<Project> {
3738

3839
private static final Logger log = Logging.getLogger(PalantirDockerPlugin.class)
3940
private static final Pattern LABEL_KEY_PATTERN = Pattern.compile('^[a-z0-9.-]*$')
4041

4142
private final ObjectFactory objectFactory
42-
private final ImmutableAttributesFactory attributesFactory
43+
private final AttributesFactory attributesFactory
4344

4445
@Inject
45-
PalantirDockerPlugin(ObjectFactory objectFactory, ImmutableAttributesFactory attributesFactory) {
46+
PalantirDockerPlugin(ObjectFactory objectFactory, AttributesFactory attributesFactory) {
4647
this.objectFactory = objectFactory
4748
this.attributesFactory = attributesFactory
4849
}

0 commit comments

Comments
 (0)