Skip to content

Commit 87687bf

Browse files
Fix Gradle Plugin
Fix IncludeCheckRemotePlugin to add the default tasks even without defining the extension properties Issue gh-9846
1 parent d5c953b commit 87687bf

File tree

2 files changed

+18
-7
lines changed

2 files changed

+18
-7
lines changed

buildSrc/src/main/groovy/io/spring/gradle/convention/IncludeCheckRemotePlugin.groovy

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ class IncludeCheckRemotePlugin implements Plugin<Project> {
3333
void apply(Project project) {
3434
IncludeCheckRemoteExtension extension = project.extensions.create('includeCheckRemote', IncludeCheckRemoteExtension)
3535
TaskProvider<IncludeRepoTask> includeRepoTask = project.tasks.register('includeRepo', IncludeRepoTask) { IncludeRepoTask it ->
36-
it.repository = extension.repository.get()
37-
it.ref = extension.ref.get()
36+
it.repository = extension.repository
37+
it.ref = extension.ref
3838
}
3939
project.tasks.register('checkRemote', GradleBuild) {
4040
it.dependsOn 'includeRepo'
@@ -44,22 +44,22 @@ class IncludeCheckRemotePlugin implements Plugin<Project> {
4444
}
4545

4646
abstract static class IncludeCheckRemoteExtension {
47+
4748
/**
4849
* Git repository to clone
4950
*/
50-
abstract Property<String> getRepository();
51+
String repository;
52+
5153
/**
5254
* Git ref to checkout
5355
*/
54-
abstract Property<String> getRef();
56+
String ref
57+
5558
/**
5659
* Task to run in the repository
5760
*/
5861
List<String> tasks = ['check']
5962

60-
void setTask(List<String> tasks) {
61-
this.tasks = tasks
62-
}
6363
}
6464

6565
}

buildSrc/src/test/java/io/spring/gradle/convention/IncludeCheckRemotePluginTest.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,4 +97,15 @@ void applyWhenRegisterTasksThenCheckRemoteDirSameAsIncludeRepoOutputDir() {
9797
GradleBuild checkRemote = (GradleBuild) this.rootProject.getTasks().named("checkRemote").get();
9898
assertThat(checkRemote.getDir()).isEqualTo(includeRepo.getOutputDirectory());
9999
}
100+
101+
@Test
102+
void applyWhenNoExtensionPropertiesThenRegisterTasks() {
103+
this.rootProject = ProjectBuilder.builder().build();
104+
this.rootProject.getPluginManager().apply(IncludeCheckRemotePlugin.class);
105+
IncludeRepoTask includeRepo = (IncludeRepoTask) this.rootProject.getTasks().named("includeRepo").get();
106+
GradleBuild checkRemote = (GradleBuild) this.rootProject.getTasks().named("checkRemote").get();
107+
assertThat(includeRepo).isNotNull();
108+
assertThat(checkRemote).isNotNull();
109+
}
110+
100111
}

0 commit comments

Comments
 (0)