Skip to content

Commit beffdda

Browse files
authored
Merge pull request #84 from avaruus1/forked-shadow-plugins
Support shadow plugin forks
2 parents bee3af7 + c7afa6b commit beffdda

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

plugin-development/src/main/java/org/spongepowered/gradle/common/Constants.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@
2424
*/
2525
package org.spongepowered.gradle.common;
2626

27+
import java.util.Arrays;
28+
import java.util.Collections;
29+
import java.util.List;
30+
2731
public final class Constants {
2832

2933
public static final String NAME = "SpongeGradle";
@@ -48,7 +52,10 @@ private Dependencies() {
4852
}
4953

5054
public static final class Plugins {
51-
public static final String SHADOW_PLUGIN_ID = "com.github.johnrengelman.shadow";
55+
public static final List<String> SHADOW_PLUGIN_IDS = Collections.unmodifiableList(Arrays.asList(
56+
"com.github.johnrengelman.shadow",
57+
"io.github.goooler.shadow"
58+
));
5259
public static final String SHADOW_JAR_TASK_NAME = "shadowJar";
5360

5461
private Plugins() {

plugin-development/src/main/java/org/spongepowered/gradle/plugin/SpongePluginGradle.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,15 @@ public void execute(final Task a) {
279279

280280
this.project.afterEvaluate(p -> {
281281
final TaskProvider<AbstractArchiveTask> archiveTask;
282-
if (p.getPlugins().hasPlugin(Constants.Plugins.SHADOW_PLUGIN_ID)) {
282+
283+
boolean hasShadow = false;
284+
for (String id : Constants.Plugins.SHADOW_PLUGIN_IDS) {
285+
if (p.getPlugins().hasPlugin(id)) {
286+
hasShadow = true;
287+
break;
288+
}
289+
}
290+
if (hasShadow) {
283291
archiveTask = p.getTasks().named(Constants.Plugins.SHADOW_JAR_TASK_NAME, AbstractArchiveTask.class);
284292
} else {
285293
archiveTask = p.getTasks().named(JavaPlugin.JAR_TASK_NAME, AbstractArchiveTask.class);

0 commit comments

Comments
 (0)