Adds a testing block to jvm software types

unified-prototype/unified-plugin/plugin-common/src/main/java/org/gradle/api/experimental/common/ApplicationDependencies.java

@@ -1,16 +1,9 @@
 package org.gradle.api.experimental.common;
 
-import org.gradle.api.artifacts.dsl.Dependencies;
-import org.gradle.api.artifacts.dsl.DependencyCollector;
 import org.gradle.declarative.dsl.model.annotations.Restricted;
 
 /**
  * The declarative dependencies DSL block for an application.
  */
-@SuppressWarnings("UnstableApiUsage")
 @Restricted
-public interface ApplicationDependencies extends Dependencies {
-    DependencyCollector getImplementation();
-    DependencyCollector getRuntimeOnly();
-    DependencyCollector getCompileOnly();
-}
+public interface ApplicationDependencies extends BasicDependencies {}

unified-prototype/unified-plugin/plugin-common/src/main/java/org/gradle/api/experimental/common/BasicDependencies.java

@@ -0,0 +1,15 @@
+package org.gradle.api.experimental.common;
+
+
+import org.gradle.api.artifacts.dsl.Dependencies;
+import org.gradle.api.artifacts.dsl.DependencyCollector;
+
+/**
+ * Basic types of dependencies used by either an application or library, for production or test code.
+ */
+@SuppressWarnings("UnstableApiUsage")
+public interface BasicDependencies extends Dependencies {
+    DependencyCollector getImplementation();
+    DependencyCollector getRuntimeOnly();
+    DependencyCollector getCompileOnly();
+}

unified-prototype/unified-plugin/plugin-common/src/main/java/org/gradle/api/experimental/common/LibraryDependencies.java

@@ -1,6 +1,5 @@
 package org.gradle.api.experimental.common;
 
-import org.gradle.api.artifacts.dsl.Dependencies;
 import org.gradle.api.artifacts.dsl.DependencyCollector;
 import org.gradle.declarative.dsl.model.annotations.Restricted;
 
@@ -9,11 +8,8 @@
  */
 @SuppressWarnings("UnstableApiUsage")
 @Restricted
-public interface LibraryDependencies extends Dependencies {
+public interface LibraryDependencies extends BasicDependencies {
     DependencyCollector getApi();
-    DependencyCollector getImplementation();
-    DependencyCollector getRuntimeOnly();
-    DependencyCollector getCompileOnly();
 
     // CompileOnlyApi is not included here, since both Android and KMP do not support it.
     // Does that mean we should also reconsider if we should support it? Or, should we

unified-prototype/unified-plugin/plugin-jvm/src/main/java/org/gradle/api/experimental/java/JavaApplication.java

@@ -1,13 +1,24 @@
 package org.gradle.api.experimental.java;
 
+import org.gradle.api.Action;
 import org.gradle.api.experimental.common.HasCliExecutables;
 import org.gradle.api.experimental.jvm.HasJavaTarget;
 import org.gradle.api.experimental.jvm.HasJvmApplication;
+import org.gradle.api.experimental.jvm.extensions.testing.Testing;
+import org.gradle.api.tasks.Nested;
+import org.gradle.declarative.dsl.model.annotations.Configuring;
 import org.gradle.declarative.dsl.model.annotations.Restricted;
 
 /**
  * An application implemented using a single version of Java.
  */
 @Restricted
 public interface JavaApplication extends HasJavaTarget, HasJvmApplication, HasCliExecutables {
+    @Nested
+    Testing getTesting();
+
+    @Configuring
+    default void testing(Action<? super Testing> action) {
+        action.execute(getTesting());
+    }
 }

unified-prototype/unified-plugin/plugin-jvm/src/main/java/org/gradle/api/experimental/java/JavaLibrary.java

@@ -1,12 +1,23 @@
 package org.gradle.api.experimental.java;
 
+import org.gradle.api.Action;
 import org.gradle.api.experimental.jvm.HasJavaTarget;
 import org.gradle.api.experimental.common.HasLibraryDependencies;
+import org.gradle.api.experimental.jvm.extensions.testing.Testing;
+import org.gradle.api.tasks.Nested;
+import org.gradle.declarative.dsl.model.annotations.Configuring;
 import org.gradle.declarative.dsl.model.annotations.Restricted;
 
 /**
  * A library implemented using a single version of Java.
  */
 @Restricted
 public interface JavaLibrary extends HasJavaTarget, HasLibraryDependencies {
+    @Nested
+    Testing getTesting();
+
+    @Configuring
+    default void testing(Action<? super Testing> action) {
+        action.execute(getTesting());
+    }
 }

unified-prototype/unified-plugin/plugin-jvm/src/main/java/org/gradle/api/experimental/java/StandaloneJavaApplicationPlugin.java

@@ -33,6 +33,7 @@ private void linkDslModelToPlugin(Project project, JavaApplication dslModel) {
         JvmPluginSupport.linkJavaVersion(project, dslModel);
         JvmPluginSupport.linkApplicationMainClass(project, dslModel);
         JvmPluginSupport.linkMainSourceSourceSetDependencies(project, dslModel.getDependencies());
+        JvmPluginSupport.linkTestSourceSourceSetDependencies(project, dslModel.getTesting().getDependencies());
 
         dslModel.getRunTasks().add(project.getTasks().named("run"));
     }

unified-prototype/unified-plugin/plugin-jvm/src/main/java/org/gradle/api/experimental/java/StandaloneJavaLibraryPlugin.java

@@ -29,5 +29,6 @@ public void apply(Project project) {
     private void linkDslModelToPlugin(Project project, JavaLibrary dslModel) {
         JvmPluginSupport.linkJavaVersion(project, dslModel);
         JvmPluginSupport.linkMainSourceSourceSetDependencies(project, dslModel.getDependencies());
+        JvmPluginSupport.linkTestSourceSourceSetDependencies(project, dslModel.getTesting().getDependencies());
     }
 }

unified-prototype/unified-plugin/plugin-jvm/src/main/java/org/gradle/api/experimental/jvm/HasJvmApplication.java

@@ -1,11 +1,7 @@
 package org.gradle.api.experimental.jvm;
 
-import org.gradle.api.Action;
-import org.gradle.api.experimental.common.ApplicationDependencies;
 import org.gradle.api.experimental.common.HasApplicationDependencies;
 import org.gradle.api.provider.Property;
-import org.gradle.api.tasks.Nested;
-import org.gradle.declarative.dsl.model.annotations.Configuring;
 import org.gradle.declarative.dsl.model.annotations.Restricted;
 
 /**

unified-prototype/unified-plugin/plugin-jvm/src/main/java/org/gradle/api/experimental/jvm/JvmTarget.java

@@ -3,6 +3,7 @@
 import org.gradle.api.Action;
 import org.gradle.api.Named;
 import org.gradle.api.experimental.common.LibraryDependencies;
+import org.gradle.api.experimental.jvm.extensions.testing.Testing;
 import org.gradle.api.tasks.Nested;
 import org.gradle.declarative.dsl.model.annotations.Configuring;
 import org.gradle.declarative.dsl.model.annotations.Restricted;
@@ -18,4 +19,11 @@ default void dependencies(Action<? super LibraryDependencies> action) {
         action.execute(getDependencies());
     }
 
+    @Nested
+    Testing getTesting();
+
+    @Configuring
+    default void testing(Action<? super Testing> action) {
+        action.execute(getTesting());
+    }
 }

unified-prototype/unified-plugin/plugin-jvm/src/main/java/org/gradle/api/experimental/jvm/StandaloneJvmApplicationPlugin.java

@@ -21,6 +21,7 @@ abstract public class StandaloneJvmApplicationPlugin implements Plugin<Project>
 
     public static final String JVM_APPLICATION = "jvmApplication";
 
+    @SuppressWarnings("UnstableApiUsage")
     @SoftwareType(name = JVM_APPLICATION, modelPublicType = JvmApplication.class)
     abstract public JvmApplication getJvmApplication();
 

unified-prototype/unified-plugin/plugin-jvm/src/main/java/org/gradle/api/experimental/jvm/StandaloneJvmLibraryPlugin.java

@@ -18,6 +18,7 @@ abstract public class StandaloneJvmLibraryPlugin implements Plugin<Project> {
 
     public static final String JVM_LIBRARY = "jvmLibrary";
 
+    @SuppressWarnings("UnstableApiUsage")
     @SoftwareType(name = JVM_LIBRARY, modelPublicType = JvmLibrary.class)
     abstract public JvmLibrary getJvmLibrary();
 

unified-prototype/unified-plugin/plugin-jvm/src/main/java/org/gradle/api/experimental/jvm/extensions/testing/TestDependencies.java

@@ -0,0 +1,7 @@
+package org.gradle.api.experimental.jvm.extensions.testing;
+
+import org.gradle.api.experimental.common.BasicDependencies;
+import org.gradle.declarative.dsl.model.annotations.Restricted;
+
+@Restricted
+public interface TestDependencies extends BasicDependencies {}

unified-prototype/unified-plugin/plugin-jvm/src/main/java/org/gradle/api/experimental/jvm/extensions/testing/Testing.java

@@ -0,0 +1,17 @@
+package org.gradle.api.experimental.jvm.extensions.testing;
+
+import org.gradle.api.Action;
+import org.gradle.api.tasks.Nested;
+import org.gradle.declarative.dsl.model.annotations.Configuring;
+import org.gradle.declarative.dsl.model.annotations.Restricted;
+
+@Restricted
+public interface Testing {
+    @Nested
+    TestDependencies getDependencies();
+
+    @Configuring
+    default void dependencies(Action<? super TestDependencies> action) {
+        action.execute(getDependencies());
+    }
+}

unified-prototype/unified-plugin/plugin-jvm/src/main/java/org/gradle/api/experimental/jvm/internal/JvmPluginSupport.java

@@ -2,11 +2,13 @@
 
 import org.gradle.api.Project;
 import org.gradle.api.experimental.common.ApplicationDependencies;
+import org.gradle.api.experimental.common.BasicDependencies;
 import org.gradle.api.experimental.common.LibraryDependencies;
 import org.gradle.api.experimental.jvm.HasJavaTarget;
 import org.gradle.api.experimental.jvm.HasJavaTargets;
 import org.gradle.api.experimental.jvm.HasJvmApplication;
 import org.gradle.api.experimental.jvm.JavaTarget;
+import org.gradle.api.experimental.jvm.extensions.testing.TestDependencies;
 import org.gradle.api.file.Directory;
 import org.gradle.api.plugins.JavaApplication;
 import org.gradle.api.plugins.JavaPluginExtension;
@@ -19,26 +21,6 @@
 import java.util.Collections;
 
 public class JvmPluginSupport {
-    public static void linkSourceSetToDependencies(Project project, SourceSet sourceSet, LibraryDependencies dependencies) {
-        project.getConfigurations().getByName(sourceSet.getImplementationConfigurationName())
-                .getDependencies().addAllLater(dependencies.getImplementation().getDependencies());
-        project.getConfigurations().getByName(sourceSet.getCompileOnlyConfigurationName())
-                .getDependencies().addAllLater(dependencies.getCompileOnly().getDependencies());
-        project.getConfigurations().getByName(sourceSet.getRuntimeOnlyConfigurationName())
-                .getDependencies().addAllLater(dependencies.getRuntimeOnly().getDependencies());
-        project.getConfigurations().getByName(sourceSet.getApiConfigurationName())
-                .getDependencies().addAllLater(dependencies.getApi().getDependencies());
-    }
-
-    public static void linkSourceSetToDependencies(Project project, SourceSet sourceSet, ApplicationDependencies dependencies) {
-        project.getConfigurations().getByName(sourceSet.getImplementationConfigurationName())
-                .getDependencies().addAllLater(dependencies.getImplementation().getDependencies());
-        project.getConfigurations().getByName(sourceSet.getCompileOnlyConfigurationName())
-                .getDependencies().addAllLater(dependencies.getCompileOnly().getDependencies());
-        project.getConfigurations().getByName(sourceSet.getRuntimeOnlyConfigurationName())
-                .getDependencies().addAllLater(dependencies.getRuntimeOnly().getDependencies());
-    }
-
     public static void linkMainSourceSourceSetDependencies(Project project, LibraryDependencies dependencies) {
         JavaPluginExtension java = project.getExtensions().getByType(JavaPluginExtension.class);
         linkSourceSetToDependencies(project, java.getSourceSets().getByName("main"), dependencies);
@@ -49,11 +31,34 @@ public static void linkMainSourceSourceSetDependencies(Project project, Applicat
         linkSourceSetToDependencies(project, java.getSourceSets().getByName("main"), dependencies);
     }
 
+    public static void linkTestSourceSourceSetDependencies(Project project, TestDependencies dependencies) {
+        JavaPluginExtension java = project.getExtensions().getByType(JavaPluginExtension.class);
+        linkSourceSetToDependencies(project, java.getSourceSets().getByName("main"), dependencies);
+    }
+
+    @SuppressWarnings("UnstableApiUsage")
+    public static void linkSourceSetToDependencies(Project project, SourceSet sourceSet, BasicDependencies dependencies) {
+        project.getConfigurations().getByName(sourceSet.getImplementationConfigurationName())
+            .getDependencies().addAllLater(dependencies.getImplementation().getDependencies());
+        project.getConfigurations().getByName(sourceSet.getCompileOnlyConfigurationName())
+            .getDependencies().addAllLater(dependencies.getCompileOnly().getDependencies());
+        project.getConfigurations().getByName(sourceSet.getRuntimeOnlyConfigurationName())
+            .getDependencies().addAllLater(dependencies.getRuntimeOnly().getDependencies());
+    }
+
+    @SuppressWarnings("UnstableApiUsage")
+    public static void linkSourceSetToDependencies(Project project, SourceSet sourceSet, LibraryDependencies dependencies) {
+        linkSourceSetToDependencies(project, sourceSet, (BasicDependencies) dependencies);
+        project.getConfigurations().getByName(sourceSet.getApiConfigurationName())
+            .getDependencies().addAllLater(dependencies.getApi().getDependencies());
+    }
+
     public static void linkJavaVersion(Project project, HasJavaTarget dslModel) {
         JavaPluginExtension java = project.getExtensions().getByType(JavaPluginExtension.class);
         java.getToolchain().getLanguageVersion().set(dslModel.getJavaVersion().map(JavaLanguageVersion::of));
     }
 
+    @SuppressWarnings("OptionalGetWithoutIsPresent")
     public static void linkJavaVersion(Project project, HasJavaTargets dslModel) {
         JavaPluginExtension java = project.getExtensions().getByType(JavaPluginExtension.class);
         java.getToolchain().getLanguageVersion().set(project.provider(() ->