Skip to content

Commit 148c96e

Browse files
committed
Move rootProject action registration to build listener
It will allow us to auto disable the plugin upon conflicts.
1 parent 9e15b8e commit 148c96e

File tree

3 files changed

+3
-6
lines changed

3 files changed

+3
-6
lines changed

src/main/java/dev/nokee/init/NokeeInitPlugin.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ protected NokeeInitPlugin() {
2929
public void apply(Gradle gradle) {
3030
if (MINIMUM_GRADLE_SUPPORTED.compareTo(gradleVersionProvider.get()) <= 0) {
3131
gradle.addBuildListener(new NokeeInitBuildListener());
32-
gradle.rootProject(new RegisterNokeeTaskAction());
33-
gradle.rootProject(new RegisterWrapperTaskEnhancementAction());
3432
}
3533
}
3634
}

src/main/java/dev/nokee/init/internal/NokeeInitBuildListener.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package dev.nokee.init.internal;
22

33
import dev.nokee.init.NokeeInitPlugin;
4+
import dev.nokee.init.internal.wrapper.RegisterWrapperTaskEnhancementAction;
45
import lombok.val;
56
import org.gradle.BuildAdapter;
67
import org.gradle.api.Action;
@@ -30,6 +31,8 @@ public void beforeSettings(Settings settings) {
3031
settings.getGradle().getStartParameter().getAllInitScripts().forEach(this::warnIfNokeeInitScriptUsingBintray);
3132
val extension = registerExtension(settings);
3233
settings.pluginManagement(configurePluginResolution(extension));
34+
settings.getGradle().rootProject(new RegisterNokeeTaskAction());
35+
settings.getGradle().rootProject(new RegisterWrapperTaskEnhancementAction());
3336
}
3437

3538
private static final Logger LOGGER = Logging.getLogger(NokeeInitPlugin.class);

src/test/groovy/dev/nokee/init/NokeeInitPluginTest.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package dev.nokee.init;
22

33
import dev.nokee.init.internal.NokeeInitBuildListener;
4-
import dev.nokee.init.internal.RegisterNokeeTaskAction;
5-
import dev.nokee.init.internal.wrapper.RegisterWrapperTaskEnhancementAction;
64
import org.gradle.api.invocation.Gradle;
75
import org.gradle.util.GradleVersion;
86
import org.junit.jupiter.api.Test;
@@ -25,7 +23,5 @@ void doNothingOnUnsupportedVersion() {
2523
void configuresGradleOnSupportedVersion() {
2624
new NokeeInitPlugin(() -> GradleVersion.version("6.3")).apply(gradle);
2725
verify(gradle).addBuildListener(isA(NokeeInitBuildListener.class));
28-
verify(gradle).rootProject(isA(RegisterNokeeTaskAction.class));
29-
verify(gradle).rootProject(isA(RegisterWrapperTaskEnhancementAction.class));
3026
}
3127
}

0 commit comments

Comments
 (0)