Skip to content

Commit afbf2fe

Browse files
authored
Update Gradle wrapper to 7.3 (#80633)
1 parent c5baf47 commit afbf2fe

File tree

5 files changed

+14
-17
lines changed

5 files changed

+14
-17
lines changed

build-conventions/src/main/java/org/elasticsearch/gradle/internal/conventions/VersionPropertiesPlugin.java

+9-10
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,23 @@
1111
import org.gradle.api.Plugin;
1212
import org.gradle.api.Project;
1313
import org.gradle.api.provider.Provider;
14-
import org.gradle.initialization.layout.BuildLayout;
1514

16-
import javax.inject.Inject;
1715
import java.io.File;
1816

1917
public class VersionPropertiesPlugin implements Plugin<Project> {
2018

21-
private BuildLayout buildLayout;
22-
23-
@Inject
24-
VersionPropertiesPlugin(BuildLayout buildLayout) {
25-
this.buildLayout = buildLayout;
26-
}
27-
2819
@Override
2920
public void apply(Project project) {
21+
File workspaceDir;
22+
if (project.getGradle().getIncludedBuilds().isEmpty()) {
23+
// This is an included build, use the parent directory as workspace root
24+
workspaceDir = project.getRootDir().getParentFile();
25+
} else {
26+
workspaceDir = project.getRootDir();
27+
}
28+
3029
// Register the service if not done yet
31-
File infoPath = new File(buildLayout.getRootDirectory(), "build-tools-internal");
30+
File infoPath = new File(workspaceDir, "build-tools-internal");
3231
Provider<VersionPropertiesBuildService> serviceProvider = project.getGradle().getSharedServices()
3332
.registerIfAbsent("versions", VersionPropertiesBuildService.class, spec -> {
3433
spec.getParameters().getInfoPath().set(infoPath);
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-7.2-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionSha256Sum=a8da5b02437a60819cad23e10fc7e9cf32bcb57029d9cb277e26eeff76ce014b
6+
distributionSha256Sum=00b273629df4ce46e68df232161d5a7c4e495b9a029ce6e0420f071e21316867

build-tools-internal/settings.gradle

-2
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.2
1+
7.3
+2-2
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-7.2-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionSha256Sum=a8da5b02437a60819cad23e10fc7e9cf32bcb57029d9cb277e26eeff76ce014b
6+
distributionSha256Sum=00b273629df4ce46e68df232161d5a7c4e495b9a029ce6e0420f071e21316867

0 commit comments

Comments
 (0)