nokeedev · lacasseio · Sep 15, 2020 · Sep 14, 2020
diff --git a/...platform-base/src/main/java/dev/nokee/platform/base/ApplicationComponentDependencies.java b/...platform-base/src/main/java/dev/nokee/platform/base/ApplicationComponentDependencies.java
@@ -1,9 +1,12 @@
 package dev.nokee.platform.base;
 
+import groovy.lang.Closure;
+import groovy.lang.DelegatesTo;
 import org.gradle.api.Action;
 import org.gradle.api.artifacts.ExternalModuleDependency;
 import org.gradle.api.artifacts.ModuleDependency;
 import org.gradle.api.artifacts.ProjectDependency;
+import org.gradle.util.ConfigureUtil;
 
 /**
  * The dependency buckets for an application component.
@@ -28,6 +31,17 @@ public interface ApplicationComponentDependencies extends ComponentDependencies
 	 */
 	void implementation(Object notation, Action<? super ModuleDependency> action);
 
+	/**
+	 * Adds an implementation dependency to this component.
+	 * An implementation dependency is not visible to consumers that are compiled against this component.
+	 *
+	 * @param notation The dependency notation, as per {@link org.gradle.api.artifacts.dsl.DependencyHandler#create(Object)}.
+	 * @param closure The closure to run to configure the dependency (project dependencies are {@link ProjectDependency} and external dependencies are {@link ExternalModuleDependency}).
+	 */
+	default void implementation(Object notation, @DelegatesTo(value = ModuleDependency.class, strategy = Closure.DELEGATE_FIRST) Closure<Void> closure) {
+		implementation(notation, ConfigureUtil.configureUsing(closure));
+	}
+
 	/**
 	 * Returns the implementation bucket of dependencies for this component.
 	 *

diff --git a/...rojects/platform-base/src/main/java/dev/nokee/platform/base/DependencyAwareComponent.java b/...rojects/platform-base/src/main/java/dev/nokee/platform/base/DependencyAwareComponent.java
@@ -1,6 +1,9 @@
 package dev.nokee.platform.base;
 
+import groovy.lang.Closure;
+import groovy.lang.DelegatesTo;
 import org.gradle.api.Action;
+import org.gradle.util.ConfigureUtil;
 
 /**
  * A component with dependency buckets.
@@ -24,5 +27,14 @@ public interface DependencyAwareComponent<T extends ComponentDependencies> {
 	default void dependencies(Action<? super T> action) {
 		action.execute(getDependencies());
 	}
+
+	/**
+	 * Configure the dependencies of this component.
+	 *
+	 * @param closure configuration closure for {@link ComponentDependencies}.
+	 */
+	default void dependencies(@DelegatesTo(type = "T", strategy = Closure.DELEGATE_FIRST) Closure<Void> closure) {
+		dependencies(ConfigureUtil.configureUsing(closure));
+	}
 }
 
diff --git a/...cts/platform-base/src/main/java/dev/nokee/platform/base/LibraryComponentDependencies.java b/...cts/platform-base/src/main/java/dev/nokee/platform/base/LibraryComponentDependencies.java
@@ -1,9 +1,12 @@
 package dev.nokee.platform.base;
 
+import groovy.lang.Closure;
+import groovy.lang.DelegatesTo;
 import org.gradle.api.Action;
 import org.gradle.api.artifacts.ExternalModuleDependency;
 import org.gradle.api.artifacts.ModuleDependency;
 import org.gradle.api.artifacts.ProjectDependency;
+import org.gradle.util.ConfigureUtil;
 
 /**
  * The dependency buckets for a library component.
@@ -26,6 +29,16 @@ public interface LibraryComponentDependencies extends ComponentDependencies {
 	 */
 	void api(Object notation, Action<? super ModuleDependency> action);
 
+	/**
+	 * Adds an API dependency to this library. An API dependency is made visible to consumers that are compiled against this component.
+	 *
+	 * @param notation The dependency notation, as per {@link org.gradle.api.artifacts.dsl.DependencyHandler#create(Object)}.
+	 * @param closure The closure to run to configure the dependency (project dependencies are {@link ProjectDependency} and external dependencies are {@link ExternalModuleDependency}).
+	 */
+	default void api(Object notation, @DelegatesTo(value = ModuleDependency.class, strategy = Closure.DELEGATE_FIRST) Closure<Void> closure) {
+		api(notation, ConfigureUtil.configureUsing(closure));
+	}
+
 	/**
 	 * Adds an implementation dependency to this component.
 	 * An implementation dependency is not visible to consumers that are compiled against this component.
@@ -43,6 +56,17 @@ public interface LibraryComponentDependencies extends ComponentDependencies {
 	 */
 	void implementation(Object notation, Action<? super ModuleDependency> action);
 
+	/**
+	 * Adds an implementation dependency to this component.
+	 * An implementation dependency is not visible to consumers that are compiled against this component.
+	 *
+	 * @param notation The dependency notation, as per {@link org.gradle.api.artifacts.dsl.DependencyHandler#create(Object)}.
+	 * @param closure The closure to run to configure the dependency (project dependencies are {@link ProjectDependency} and external dependencies are {@link ExternalModuleDependency}).
+	 */
+	default void implementation(Object notation, @DelegatesTo(value = ModuleDependency.class, strategy = Closure.DELEGATE_FIRST) Closure<Void> closure) {
+		implementation(notation, ConfigureUtil.configureUsing(closure));
+	}
+
 	/**
 	 * Returns the implementation bucket of dependencies for this component.
 	 *

diff --git a/subprojects/platform-base/src/main/java/dev/nokee/platform/base/View.java b/subprojects/platform-base/src/main/java/dev/nokee/platform/base/View.java
@@ -1,9 +1,12 @@
 package dev.nokee.platform.base;
 
+import groovy.lang.Closure;
+import groovy.lang.DelegatesTo;
 import org.gradle.api.Action;
 import org.gradle.api.Transformer;
 import org.gradle.api.provider.Provider;
 import org.gradle.api.specs.Spec;
+import org.gradle.util.ConfigureUtil;
 
 import java.util.List;
 import java.util.Set;
@@ -24,6 +27,17 @@ public interface View<T> {
 	 */
 	void configureEach(Action<? super T> action);
 
+	/**
+	 * Registers a closure to execute to configure each element in the view.
+	 * The action is only executed for those elements that are required.
+	 * Fails if any element has already been finalized.
+	 *
+	 * @param closure The closure to execute on each element for configuration.
+	 */
+	default void configureEach(@DelegatesTo(type = "T", strategy = Closure.DELEGATE_FIRST) Closure<Void> closure) {
+		configureEach(ConfigureUtil.configureUsing(closure));
+	}
+
 	/**
 	 * Registers an action to execute to configure each element in the view.
 	 * The action is only executed for those elements that are required.
@@ -37,6 +51,21 @@ public interface View<T> {
 	 */
 	<S extends T> void configureEach(Class<S> type, Action<? super S> action);
 
+	/**
+	 * Registers a closure to execute to configure each element in the view.
+	 * The action is only executed for those elements that are required.
+	 * Fails if any matching element has already been finalized.
+	 *
+	 * This method is equivalent to <code>view.withType(Foo).configureEach { ... }</code>.
+	 *
+	 * @param type the type of binary to select.
+	 * @param <S> the base type of the element to configure.
+	 * @param closure the closure to execute on each element for configuration.
+	 */
+	default <S extends T> void configureEach(Class<S> type, @DelegatesTo(type = "S", strategy = Closure.DELEGATE_FIRST) Closure<Void> closure) {
+		configureEach(type, ConfigureUtil.configureUsing(closure));
+	}
+
 	/**
 	 * Registers an action to execute to configure each element in the view matching the given specification.
 	 * The action is only executed for those elements that are required.
@@ -48,6 +77,19 @@ public interface View<T> {
 	 */
 	void configureEach(Spec<? super T> spec, Action<? super T> action);
 
+	/**
+	 * Registers a closure to execute to configure each element in the view matching the given specification.
+	 * The action is only executed for those elements that are required.
+	 * Fails if any element has already been finalized.
+	 *
+	 * @param spec a specification to satisfy. The spec is applied to each binary prior to configuration.
+	 * @param closure the closure to execute on each element for configuration.
+	 * @since 0.4
+	 */
+	default void configureEach(Spec<? super T> spec, @DelegatesTo(type = "S", strategy = Closure.DELEGATE_FIRST) Closure<Void> closure) {
+		configureEach(spec, ConfigureUtil.configureUsing(closure));
+	}
+
 	/**
 	 * Returns a view containing the objects in this view of the given type.
 	 * The returned view is live, so that when matching objects are later added to this view, they are also visible in the filtered view.

diff --git a/...src/main/java/dev/nokee/platform/jni/JavaNativeInterfaceLibraryComponentDependencies.java b/...src/main/java/dev/nokee/platform/jni/JavaNativeInterfaceLibraryComponentDependencies.java
@@ -2,10 +2,13 @@
 
 import dev.nokee.platform.base.ComponentDependencies;
 import dev.nokee.platform.base.DependencyBucket;
+import groovy.lang.Closure;
+import groovy.lang.DelegatesTo;
 import org.gradle.api.Action;
 import org.gradle.api.artifacts.ExternalModuleDependency;
 import org.gradle.api.artifacts.ModuleDependency;
 import org.gradle.api.artifacts.ProjectDependency;
+import org.gradle.util.ConfigureUtil;
 
 /**
  * Allows the API, JVM implementation and native implementation dependencies of a Java Native Interface (JNI) library to be specified.
@@ -29,6 +32,16 @@ public interface JavaNativeInterfaceLibraryComponentDependencies extends JavaNat
 	 */
 	void api(Object notation, Action<? super ModuleDependency> action);
 
+	/**
+	 * Adds an JVM API dependency to this library. An API dependency is made visible to consumers that are compiled against this component.
+	 *
+	 * @param notation The dependency notation, as per {@link org.gradle.api.artifacts.dsl.DependencyHandler#create(Object)}.
+	 * @param closure The closure to run to configure the dependency (project dependencies are {@link ProjectDependency} and external dependencies are {@link ExternalModuleDependency}).
+	 */
+	default void api(Object notation, @DelegatesTo(value = ModuleDependency.class, strategy = Closure.DELEGATE_FIRST) Closure<Void> closure) {
+		api(notation, ConfigureUtil.configureUsing(closure));
+	}
+
 	/**
 	 * Adds an JVM implementation dependency to this library. An implementation dependency is not visible to consumers that are compiled against this component.
 	 *
@@ -45,6 +58,17 @@ public interface JavaNativeInterfaceLibraryComponentDependencies extends JavaNat
 	 */
 	void jvmImplementation(Object notation, Action<? super ModuleDependency> action);
 
+	/**
+	 * Adds an JVM implementation dependency to this library.
+	 * An implementation dependency is not visible to consumers that are compiled against this component.
+	 *
+	 * @param notation The dependency notation, as per {@link org.gradle.api.artifacts.dsl.DependencyHandler#create(Object)}.
+	 * @param closure The closure to run to configure the dependency (project dependencies are {@link ProjectDependency} and external dependencies are {@link ExternalModuleDependency}).
+	 */
+	default void jvmImplementation(Object notation, @DelegatesTo(value = ModuleDependency.class, strategy = Closure.DELEGATE_FIRST) Closure<Void> closure) {
+		jvmImplementation(notation, ConfigureUtil.configureUsing(closure));
+	}
+
 	/**
 	 * Adds an JVM runtime only dependency to this library.
 	 * An implementation dependency is only visible to consumers that are running against this component.
@@ -62,6 +86,17 @@ public interface JavaNativeInterfaceLibraryComponentDependencies extends JavaNat
 	 */
 	void jvmRuntimeOnly(Object notation, Action<? super ModuleDependency> action);
 
+	/**
+	 * Adds an JVM runtime only dependency to this library.
+	 * An implementation dependency is only visible to consumers that are running against this component.
+	 *
+	 * @param notation The dependency notation, as per {@link org.gradle.api.artifacts.dsl.DependencyHandler#create(Object)}.
+	 * @param closure The closure to run to configure the dependency (project dependencies are {@link ProjectDependency} and external dependencies are {@link ExternalModuleDependency}).
+	 */
+	default void jvmRuntimeOnly(Object notation, @DelegatesTo(value = ModuleDependency.class, strategy = Closure.DELEGATE_FIRST) Closure<Void> closure) {
+		jvmRuntimeOnly(notation, ConfigureUtil.configureUsing(closure));
+	}
+
 	/**
 	 * Returns the JVM runtime only bucket of dependencies for this component.
 	 *

diff --git a/.../src/main/java/dev/nokee/platform/jni/JavaNativeInterfaceNativeComponentDependencies.java b/.../src/main/java/dev/nokee/platform/jni/JavaNativeInterfaceNativeComponentDependencies.java
@@ -2,10 +2,13 @@
 
 import dev.nokee.platform.base.ComponentDependencies;
 import dev.nokee.platform.base.DependencyBucket;
+import groovy.lang.Closure;
+import groovy.lang.DelegatesTo;
 import org.gradle.api.Action;
 import org.gradle.api.artifacts.ExternalModuleDependency;
 import org.gradle.api.artifacts.ModuleDependency;
 import org.gradle.api.artifacts.ProjectDependency;
+import org.gradle.util.ConfigureUtil;
 
 /**
  * Allows the native implementation dependencies of a Java Native Interface (JNI) library to be specified.
@@ -31,6 +34,17 @@ public interface JavaNativeInterfaceNativeComponentDependencies extends Componen
 	 */
 	void nativeImplementation(Object notation, Action<? super ModuleDependency> action);
 
+	/**
+	 * Adds an native implementation dependency to this component.
+	 * An implementation dependency is not visible to consumers that are compiled or linked against this component.
+	 *
+	 * @param notation The dependency notation, as per {@link org.gradle.api.artifacts.dsl.DependencyHandler#create(Object)}.
+	 * @param closure The closure to run to configure the dependency (project dependencies are {@link ProjectDependency} and external dependencies are {@link ExternalModuleDependency}).
+	 */
+	default void nativeImplementation(Object notation, @DelegatesTo(value = ModuleDependency.class, strategy = Closure.DELEGATE_FIRST) Closure<Void> closure) {
+		nativeImplementation(notation, ConfigureUtil.configureUsing(closure));
+	}
+
 	/**
 	 * Adds an native link only dependency to this component.
 	 * An link only dependency is not visible to consumers that are compiled or linked against this component.
@@ -49,6 +63,18 @@ public interface JavaNativeInterfaceNativeComponentDependencies extends Componen
 	 */
 	void nativeLinkOnly(Object notation, Action<? super ModuleDependency> action);
 
+	/**
+	 * Adds an native link only dependency to this component.
+	 * An link only dependency is not visible to consumers that are compiled or linked against this component.
+	 *
+	 * @param notation The dependency notation, as per {@link org.gradle.api.artifacts.dsl.DependencyHandler#create(Object)}.
+	 * @param closure The closure to run to configure the dependency (project dependencies are {@link ProjectDependency} and external dependencies are {@link ExternalModuleDependency}).
+	 * @since 0.4
+	 */
+	default void nativeLinkOnly(Object notation, @DelegatesTo(value = ModuleDependency.class, strategy = Closure.DELEGATE_FIRST) Closure<Void> closure) {
+		nativeLinkOnly(notation, ConfigureUtil.configureUsing(closure));
+	}
+
 	/**
 	 * Adds an native runtime only dependency to this component.
 	 * An runtime only dependency is not visible to consumers that are running against this component.
@@ -66,6 +92,17 @@ public interface JavaNativeInterfaceNativeComponentDependencies extends Componen
 	 */
 	void nativeRuntimeOnly(Object notation, Action<? super ModuleDependency> action);
 
+	/**
+	 * Adds an native runtime only dependency to this component.
+	 * An runtime only dependency is visible only to consumers that are running against this component.
+	 *
+	 * @param notation The dependency notation, as per {@link org.gradle.api.artifacts.dsl.DependencyHandler#create(Object)}.
+	 * @param closure The closure to run to configure the dependency (project dependencies are {@link ProjectDependency} and external dependencies are {@link ExternalModuleDependency}).
+	 */
+	default void nativeRuntimeOnly(Object notation, @DelegatesTo(value = ModuleDependency.class, strategy = Closure.DELEGATE_FIRST) Closure<Void> closure) {
+		nativeRuntimeOnly(notation, ConfigureUtil.configureUsing(closure));
+	}
+
 	/**
 	 * Returns the native implementation bucket of dependencies for this component.
 	 *

diff --git a/subprojects/platform-jni/src/main/java/dev/nokee/platform/jni/JniLibrary.java b/subprojects/platform-jni/src/main/java/dev/nokee/platform/jni/JniLibrary.java
@@ -5,9 +5,12 @@
 import dev.nokee.platform.base.Variant;
 import dev.nokee.platform.nativebase.SharedLibraryBinary;
 import dev.nokee.runtime.nativebase.TargetMachine;
+import groovy.lang.Closure;
+import groovy.lang.DelegatesTo;
 import org.gradle.api.Action;
 import org.gradle.api.file.ConfigurableFileCollection;
 import org.gradle.api.provider.Property;
+import org.gradle.util.ConfigureUtil;
 
 /**
  * Configuration for a specific Java Native Interface (JNI) library variant, defining the dependencies that make up the library plus other settings.
@@ -45,6 +48,16 @@ public interface JniLibrary extends Variant, DependencyAwareComponent<JavaNative
 	 */
 	void sharedLibrary(Action<? super SharedLibraryBinary> action);
 
+	/**
+	 * Configure the shared library binary for this variant.
+	 *
+	 * @param closure configuration closure for {@link SharedLibraryBinary}.
+	 * @since 0.3
+	 */
+	default void sharedLibrary(@DelegatesTo(value = SharedLibraryBinary.class, strategy = Closure.DELEGATE_FIRST) Closure<Void> closure) {
+		sharedLibrary(ConfigureUtil.configureUsing(closure));
+	}
+
 	/**
 	 * Configure the native runtime files to include inside the JNI JAR at the resource path location.
 	 *

diff --git a/subprojects/platform-jni/src/main/java/dev/nokee/platform/jni/JniLibraryExtension.java b/subprojects/platform-jni/src/main/java/dev/nokee/platform/jni/JniLibraryExtension.java
@@ -4,7 +4,6 @@
 import dev.nokee.platform.nativebase.TargetMachineAwareComponent;
 import dev.nokee.platform.nativebase.TargetMachineFactory;
 import dev.nokee.runtime.nativebase.TargetMachine;
-import org.gradle.api.Action;
 import org.gradle.api.provider.SetProperty;
 
 /**

diff --git a/...e/src/main/java/dev/nokee/platform/nativebase/NativeApplicationComponentDependencies.java b/...e/src/main/java/dev/nokee/platform/nativebase/NativeApplicationComponentDependencies.java
@@ -2,11 +2,22 @@
 
 import dev.nokee.platform.base.ApplicationComponentDependencies;
 import dev.nokee.platform.base.ComponentDependencies;
+import groovy.lang.Closure;
+import groovy.lang.DelegatesTo;
+import org.gradle.api.artifacts.ModuleDependency;
+import org.gradle.util.ConfigureUtil;
 
 /**
  * Allows the implementation dependencies of a native application to be specified.
  *
  * @since 0.5
  */
 public interface NativeApplicationComponentDependencies extends ApplicationComponentDependencies, NativeComponentDependencies, ComponentDependencies {
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	default void implementation(Object notation, @DelegatesTo(value = ModuleDependency.class, strategy = Closure.DELEGATE_FIRST) Closure<Void> closure) {
+		implementation(notation, ConfigureUtil.configureUsing(closure));
+	}
 }