mirror of
https://github.com/Eaglercraft-TeaVM-Fork/eagler-teavm.git
synced 2025-01-03 05:44:10 -08:00
gradle: replace all Closure<Void> occurrences with Closure<?> to avoid Groovy warning in IDE
This commit is contained in:
parent
19c0492c33
commit
528a39247e
|
@ -123,7 +123,7 @@ class TeaVMBaseExtensionImpl implements TeaVMBaseExtension {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void tests(Closure<Void> config) {
|
public void tests(Closure<?> config) {
|
||||||
config.rehydrate(getTests(), config.getOwner(), config.getThisObject()).call();
|
config.rehydrate(getTests(), config.getOwner(), config.getThisObject()).call();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -119,7 +119,7 @@ class TeaVMExtensionImpl extends TeaVMBaseExtensionImpl implements TeaVMExtensio
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void js(Closure<Void> action) {
|
public void js(Closure<?> action) {
|
||||||
action.rehydrate(getJs(), action.getOwner(), action.getThisObject()).call();
|
action.rehydrate(getJs(), action.getOwner(), action.getThisObject()).call();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -134,7 +134,7 @@ class TeaVMExtensionImpl extends TeaVMBaseExtensionImpl implements TeaVMExtensio
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void wasm(Closure<Void> action) {
|
public void wasm(Closure<?> action) {
|
||||||
action.rehydrate(getWasm(), action.getOwner(), action.getThisObject()).call();
|
action.rehydrate(getWasm(), action.getOwner(), action.getThisObject()).call();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -149,7 +149,7 @@ class TeaVMExtensionImpl extends TeaVMBaseExtensionImpl implements TeaVMExtensio
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void wasi(Closure<Void> action) {
|
public void wasi(Closure<?> action) {
|
||||||
action.rehydrate(getWasi(), action.getOwner(), action.getThisObject()).call();
|
action.rehydrate(getWasi(), action.getOwner(), action.getThisObject()).call();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -164,7 +164,7 @@ class TeaVMExtensionImpl extends TeaVMBaseExtensionImpl implements TeaVMExtensio
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void c(Closure<Void> action) {
|
public void c(Closure<?> action) {
|
||||||
action.rehydrate(getC(), action.getOwner(), action.getThisObject()).call();
|
action.rehydrate(getC(), action.getOwner(), action.getThisObject()).call();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -179,7 +179,7 @@ class TeaVMExtensionImpl extends TeaVMBaseExtensionImpl implements TeaVMExtensio
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void all(Closure<Void> action) {
|
public void all(Closure<?> action) {
|
||||||
action.rehydrate(getAll(), action.getOwner(), action.getThisObject()).call();
|
action.rehydrate(getAll(), action.getOwner(), action.getThisObject()).call();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -187,14 +187,6 @@ public class TeaVMPlugin implements Plugin<Project> {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private static String joinPath(String first, String second) {
|
|
||||||
if (first.endsWith("/") || first.isEmpty()) {
|
|
||||||
return first + second;
|
|
||||||
} else {
|
|
||||||
return first + "/" + second;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void applyToTask(TeaVMConfiguration configuration, TeaVMTask task, Configuration toolsConfiguration) {
|
private void applyToTask(TeaVMConfiguration configuration, TeaVMTask task, Configuration toolsConfiguration) {
|
||||||
task.getMainClass().convention(configuration.getMainClass());
|
task.getMainClass().convention(configuration.getMainClass());
|
||||||
task.getClasspath().from(task.getProject().getConfigurations().getByName(CLASSPATH_CONFIGURATION_NAME));
|
task.getClasspath().from(task.getProject().getConfigurations().getByName(CLASSPATH_CONFIGURATION_NAME));
|
||||||
|
|
|
@ -42,7 +42,7 @@ class TeaVMTestsImpl implements TeaVMTests {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void js(Closure<Void> config) {
|
public void js(Closure<?> config) {
|
||||||
config.rehydrate(getJs(), config.getOwner(), config.getThisObject()).call();
|
config.rehydrate(getJs(), config.getOwner(), config.getThisObject()).call();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -57,7 +57,7 @@ class TeaVMTestsImpl implements TeaVMTests {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void wasm(Closure<Void> config) {
|
public void wasm(Closure<?> config) {
|
||||||
config.rehydrate(getWasm(), config.getOwner(), config.getThisObject()).call();
|
config.rehydrate(getWasm(), config.getOwner(), config.getThisObject()).call();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -29,5 +29,5 @@ public interface TeaVMBaseExtension {
|
||||||
|
|
||||||
void tests(Action<TeaVMTests> config);
|
void tests(Action<TeaVMTests> config);
|
||||||
|
|
||||||
void tests(@DelegatesTo(TeaVMTests.class) Closure<Void> config);
|
void tests(@DelegatesTo(TeaVMTests.class) Closure<?> config);
|
||||||
}
|
}
|
||||||
|
|
|
@ -24,29 +24,29 @@ public interface TeaVMExtension extends TeaVMBaseExtension {
|
||||||
|
|
||||||
void js(Action<TeaVMJSConfiguration> action);
|
void js(Action<TeaVMJSConfiguration> action);
|
||||||
|
|
||||||
void js(@DelegatesTo(TeaVMJSConfiguration.class) Closure<Void> action);
|
void js(@DelegatesTo(TeaVMJSConfiguration.class) Closure<?> action);
|
||||||
|
|
||||||
TeaVMWasmConfiguration getWasm();
|
TeaVMWasmConfiguration getWasm();
|
||||||
|
|
||||||
void wasm(Action<TeaVMWasmConfiguration> action);
|
void wasm(Action<TeaVMWasmConfiguration> action);
|
||||||
|
|
||||||
void wasm(@DelegatesTo(TeaVMWasmConfiguration.class) Closure<Void> action);
|
void wasm(@DelegatesTo(TeaVMWasmConfiguration.class) Closure<?> action);
|
||||||
|
|
||||||
TeaVMWasiConfiguration getWasi();
|
TeaVMWasiConfiguration getWasi();
|
||||||
|
|
||||||
void wasi(Action<TeaVMWasiConfiguration> action);
|
void wasi(Action<TeaVMWasiConfiguration> action);
|
||||||
|
|
||||||
void wasi(@DelegatesTo(TeaVMWasiConfiguration.class) Closure<Void> action);
|
void wasi(@DelegatesTo(TeaVMWasiConfiguration.class) Closure<?> action);
|
||||||
|
|
||||||
TeaVMCConfiguration getC();
|
TeaVMCConfiguration getC();
|
||||||
|
|
||||||
void c(Action<TeaVMCConfiguration> action);
|
void c(Action<TeaVMCConfiguration> action);
|
||||||
|
|
||||||
void c(@DelegatesTo(TeaVMCConfiguration.class) Closure<Void> action);
|
void c(@DelegatesTo(TeaVMCConfiguration.class) Closure<?> action);
|
||||||
|
|
||||||
TeaVMCommonConfiguration getAll();
|
TeaVMCommonConfiguration getAll();
|
||||||
|
|
||||||
void all(Action<TeaVMCommonConfiguration> action);
|
void all(Action<TeaVMCommonConfiguration> action);
|
||||||
|
|
||||||
void all(@DelegatesTo(TeaVMCommonConfiguration.class) Closure<Void> action);
|
void all(@DelegatesTo(TeaVMCommonConfiguration.class) Closure<?> action);
|
||||||
}
|
}
|
||||||
|
|
|
@ -24,11 +24,11 @@ public interface TeaVMTests {
|
||||||
|
|
||||||
void js(Action<TeaVMJSTests> config);
|
void js(Action<TeaVMJSTests> config);
|
||||||
|
|
||||||
void js(@DelegatesTo(TeaVMJSTests.class) Closure<Void> config);
|
void js(@DelegatesTo(TeaVMJSTests.class) Closure<?> config);
|
||||||
|
|
||||||
TeaVMWasmTests getWasm();
|
TeaVMWasmTests getWasm();
|
||||||
|
|
||||||
void wasm(Action<TeaVMWasmTests> config);
|
void wasm(Action<TeaVMWasmTests> config);
|
||||||
|
|
||||||
void wasm(@DelegatesTo(TeaVMWasmTests.class) Closure<Void> config);
|
void wasm(@DelegatesTo(TeaVMWasmTests.class) Closure<?> config);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user