|
19 | 19 | import org.gradle.api.Project; |
20 | 20 | import org.gradle.api.file.Directory; |
21 | 21 | import org.gradle.api.plugins.JavaPlugin; |
| 22 | +import org.gradle.api.provider.Provider; |
22 | 23 | import org.gradle.api.tasks.Copy; |
23 | 24 | import org.gradle.language.base.plugins.LifecycleBasePlugin; |
24 | 25 |
|
@@ -49,9 +50,9 @@ public void apply(Project project) { |
49 | 50 | Directory transportResources = project.getLayout().getProjectDirectory().dir("src/main/resources/" + resourceRoot); |
50 | 51 | spec.getParameters().getTransportResourcesDirectory().set(transportResources); |
51 | 52 | spec.getParameters().getRootDirectory().set(project.getLayout().getSettingsDirectory().getAsFile()); |
52 | | - Object upstreamRef = project.findProperty("org.elasticsearch.transport.upstreamRef"); |
53 | | - if (upstreamRef != null) { |
54 | | - spec.getParameters().getUpstreamRefOverride().set(upstreamRef.toString()); |
| 53 | + Provider<String> upstreamRef = project.getProviders().gradleProperty("org.elasticsearch.transport.upstreamRef"); |
| 54 | + if (upstreamRef.isPresent()) { |
| 55 | + spec.getParameters().getUpstreamRefOverride().set(upstreamRef.get()); |
55 | 56 | } |
56 | 57 | }); |
57 | 58 |
|
@@ -120,10 +121,7 @@ public void apply(Project project) { |
120 | 121 | } |
121 | 122 |
|
122 | 123 | private static String getResourceRoot(Project project) { |
123 | | - var resourceRoot = project.findProperty("org.elasticsearch.transport.resourceRoot"); |
124 | | - if (resourceRoot == null) { |
125 | | - resourceRoot = "transport"; |
126 | | - } |
127 | | - return resourceRoot.toString(); |
| 124 | + Provider<String> resourceRootProperty = project.getProviders().gradleProperty("org.elasticsearch.transport.resourceRoot"); |
| 125 | + return resourceRootProperty.isPresent() ? resourceRootProperty.get() : "transport"; |
128 | 126 | } |
129 | 127 | } |
0 commit comments