Revert "Revert 'revert ivy change'"

Dieser Commit ist enthalten in:
Jesse Boyd 2019-08-26 06:03:58 +01:00
Ursprung edb626a961
Commit aa4c443358
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 59F1DE6293AF6E1F
4 geänderte Dateien mit 7 neuen und 7 gelöschten Zeilen

Datei anzeigen

@ -16,7 +16,7 @@ fun Project.applyCommonConfiguration() {
maven { url = uri("https://ci.athion.net/job/FAWE-Piston/ws/") }
ivy { url = uri("https://ci.athion.net/job")
patternLayout {
artifact("/[organisation]/[module]/artifact/[revision].[ext]")
artifact("/[organisation]/[revision]/artifact/[module].[ext]")
}}
}
configurations.all {

Datei anzeigen

@ -42,7 +42,7 @@ public class CFICommand extends CommandProcessor<Object, Object> {
}
@Override
public int process(InjectedValueAccess context, List<String> args, int result) {
public Object process(InjectedValueAccess context, List<String> args, Object result) {
return result;
}

Datei anzeigen

@ -67,13 +67,13 @@ public abstract class CommandProcessor<I, O> implements CommandManager {
}
@Override
public final int execute(InjectedValueAccess context, List<String> args) {
public final Object execute(InjectedValueAccess context, List<String> args) {
args = preprocess(context, args);
if (args != null) {
int result = parent.execute(context, args);
Object result = parent.execute(context, args);
return process(context, args, result); // TODO NOT IMPLEMENTED (recompile piston)
} else {
return 0;
return null;
}
}
@ -89,5 +89,5 @@ public abstract class CommandProcessor<I, O> implements CommandManager {
public abstract List<String> preprocess(InjectedValueAccess context, List<String> args);
public abstract int process(InjectedValueAccess context, List<String> args, int result);
public abstract Object process(InjectedValueAccess context, List<String> args, Object result);
}

Datei anzeigen

@ -61,7 +61,7 @@ public class DelegateCommandManager implements CommandManager {
}
@Override
public int execute(InjectedValueAccess context, List<String> args) {
public Object execute(InjectedValueAccess context, List<String> args) {
return parent.execute(context, args);
}