Skip to content

Commit 9e12565

Browse files
committed
Fix Gradle Deprecation warning
Declaring an is- property with a Boolean type has been deprecated.
1 parent 144ac8b commit 9e12565

File tree

35 files changed

+48
-48
lines changed

35 files changed

+48
-48
lines changed

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/BaseInternalPluginBuildPlugin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public void apply(Project project) {
3939
project.getPluginManager().apply(JarHellPrecommitPlugin.class);
4040
project.getPluginManager().apply(ElasticsearchJavaPlugin.class);
4141
project.getPluginManager().apply(ClusterFeaturesMetadataPlugin.class);
42-
boolean isCi = project.getRootProject().getExtensions().getByType(BuildParameterExtension.class).isCi();
42+
boolean isCi = project.getRootProject().getExtensions().getByType(BuildParameterExtension.class).getCi();
4343
// Clear default dependencies added by public PluginBuildPlugin as we add our
4444
// own project dependencies for internal builds
4545
// TODO remove once we removed default dependencies from PluginBuildPlugin

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/ElasticsearchJavaBasePlugin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ public void configureCompile(Project project) {
161161
compileTask.getConventionMapping().map("sourceCompatibility", () -> java.getSourceCompatibility().toString());
162162
compileTask.getConventionMapping().map("targetCompatibility", () -> java.getTargetCompatibility().toString());
163163
compileOptions.getRelease().set(releaseVersionProviderFromCompileTask(project, compileTask));
164-
compileOptions.setIncremental(buildParams.isCi() == false);
164+
compileOptions.setIncremental(buildParams.getCi() == false);
165165
});
166166
// also apply release flag to groovy, which is used in build-tools
167167
project.getTasks().withType(GroovyCompile.class).configureEach(compileTask -> {

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionBwcSetupPlugin.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public void apply(Project project) {
7373
project.getPlugins().apply(JvmToolchainsPlugin.class);
7474
toolChainService = project.getExtensions().getByType(JavaToolchainService.class);
7575
var buildParams = loadBuildParams(project).get();
76-
Boolean isCi = buildParams.isCi();
76+
Boolean isCi = buildParams.getCi();
7777
buildParams.getBwcVersions().forPreviousUnreleased((BwcVersions.UnreleasedVersionInfo unreleasedVersion) -> {
7878
configureBwcProject(
7979
project.project(unreleasedVersion.gradleProjectPath()),
@@ -364,7 +364,7 @@ static void createBuildBwcTask(
364364
} else {
365365
c.getOutputs().files(expectedOutputFile);
366366
}
367-
c.getOutputs().doNotCacheIf("BWC distribution caching is disabled for local builds", task -> buildParams.isCi() == false);
367+
c.getOutputs().doNotCacheIf("BWC distribution caching is disabled for local builds", task -> buildParams.getCi() == false);
368368
c.getArgs().add("-p");
369369
c.getArgs().add(projectPath);
370370
c.getArgs().add(assembleTaskName);

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalTestClustersPlugin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public void apply(Project project) {
3030
TestClustersPlugin testClustersPlugin = project.getPlugins().apply(TestClustersPlugin.class);
3131
testClustersPlugin.setRuntimeJava(buildParams.getRuntimeJavaHome());
3232
testClustersPlugin.setIsReleasedVersion(
33-
version -> (version.equals(VersionProperties.getElasticsearchVersion()) && buildParams.isSnapshotBuild() == false)
33+
version -> (version.equals(VersionProperties.getElasticsearchVersion()) && buildParams.getSnapshotBuild() == false)
3434
|| buildParams.getBwcVersions().unreleasedInfo(version) == null
3535
);
3636

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/docker/DockerSupportPlugin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public void apply(Project project) {
4040
.getSharedServices()
4141
.registerIfAbsent(DOCKER_SUPPORT_SERVICE_NAME, DockerSupportService.class, spec -> spec.parameters(params -> {
4242
params.setExclusionsFile(new File(project.getRootDir(), DOCKER_ON_LINUX_EXCLUSIONS_FILE));
43-
params.getIsCI().set(buildParams.isCi());
43+
params.getIsCI().set(buildParams.getCi());
4444
}));
4545

4646
// Ensure that if we are trying to run any DockerBuildTask tasks, we assert an available Docker installation exists

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/info/BuildParameterExtension.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,17 +54,17 @@ public interface BuildParameterExtension {
5454

5555
String getTestSeed();
5656

57-
Boolean isCi();
57+
Boolean getCi();
5858

5959
Integer getDefaultParallel();
6060

61-
Boolean isSnapshotBuild();
61+
Boolean getSnapshotBuild();
6262

6363
BwcVersions getBwcVersions();
6464

6565
Provider<BwcVersions> getBwcVersionsProvider();
6666

6767
Random getRandom();
6868

69-
Boolean isGraalVmRuntime();
69+
Boolean getGraalVmRuntime();
7070
}

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/info/DefaultBuildParameterExtension.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public abstract class DefaultBuildParameterExtension implements BuildParameterEx
4242
private final String testSeed;
4343
private final Boolean isCi;
4444
private final Integer defaultParallel;
45-
private final Boolean isSnapshotBuild;
45+
private final Boolean snapshotBuild;
4646

4747
// not final for testing
4848
private Provider<BwcVersions> bwcVersions;
@@ -81,7 +81,7 @@ public DefaultBuildParameterExtension(
8181
this.testSeed = testSeed;
8282
this.isCi = isCi;
8383
this.defaultParallel = defaultParallel;
84-
this.isSnapshotBuild = isSnapshotBuild;
84+
this.snapshotBuild = isSnapshotBuild;
8585
this.bwcVersions = cache(providers, bwcVersions);
8686
this.gitOrigin = gitOrigin;
8787
}
@@ -183,7 +183,7 @@ public String getTestSeed() {
183183
}
184184

185185
@Override
186-
public Boolean isCi() {
186+
public Boolean getCi() {
187187
return isCi;
188188
}
189189

@@ -193,8 +193,8 @@ public Integer getDefaultParallel() {
193193
}
194194

195195
@Override
196-
public Boolean isSnapshotBuild() {
197-
return isSnapshotBuild;
196+
public Boolean getSnapshotBuild() {
197+
return snapshotBuild;
198198
}
199199

200200
@Override
@@ -208,7 +208,7 @@ public Random getRandom() {
208208
}
209209

210210
@Override
211-
public Boolean isGraalVmRuntime() {
211+
public Boolean getGraalVmRuntime() {
212212
return runtimeJavaDetails.get().toLowerCase().contains("graalvm");
213213
}
214214

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/MutedTestPlugin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public void apply(Project project) {
5151
}
5252

5353
// Don't fail when all tests are ignored when running in CI
54-
filter.setFailOnNoMatchingTests(buildParams.isCi() == false);
54+
filter.setFailOnNoMatchingTests(buildParams.getCi() == false);
5555
});
5656
});
5757
}

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/testfixtures/TestFixturesDeployPlugin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public void apply(Project project) {
3333
var buildParams = loadBuildParams(project).get();
3434
NamedDomainObjectContainer<TestFixtureDeployment> fixtures = project.container(TestFixtureDeployment.class);
3535
project.getExtensions().add("dockerFixtures", fixtures);
36-
registerDeployTaskPerFixture(project, fixtures, buildParams.isCi());
36+
registerDeployTaskPerFixture(project, fixtures, buildParams.getCi());
3737
project.getTasks().register(DEPLOY_FIXTURE_TASK_NAME, task -> task.dependsOn(project.getTasks().withType(DockerBuildTask.class)));
3838
}
3939

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/testfixtures/TestFixturesPlugin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ public void apply(Project project) {
131131

132132
tasks.withType(ComposeUp.class).named("composeUp").configure(t -> {
133133
// Avoid running docker-compose tasks in parallel in CI due to some issues on certain Linux distributions
134-
if (buildParams.isCi()) {
134+
if (buildParams.getCi()) {
135135
t.usesService(dockerComposeThrottle);
136136
t.usesService(dockerSupport);
137137
}

0 commit comments

Comments
 (0)