diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 34d4935..44b2129 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -2,14 +2,12 @@
 <project version="4">
   <component name="CompilerConfiguration">
     <bytecodeTargetLevel>
+      <module name="declarative.main" target="21" />
+      <module name="declarative.test" target="21" />
       <module name="gradle-enforcer" target="21" />
       <module name="gradle-enforcer.functionalTest" target="21" />
       <module name="gradle-enforcer.main" target="21" />
       <module name="gradle-enforcer.test" target="21" />
-      <module name="gradle-manifest-dependencies" target="21" />
-      <module name="gradle-manifest-dependencies.functionalTest" target="21" />
-      <module name="gradle-manifest-dependencies.main" target="21" />
-      <module name="gradle-manifest-dependencies.test" target="21" />
       <module name="gradle-playground" target="21" />
       <module name="gradle-playground.main" target="21" />
       <module name="gradle-playground.test" target="21" />
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index f2b130e..fada239 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -3,35 +3,53 @@
   <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="externalProjectPath" value="$PROJECT_DIR$/gradle/catalog" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$/gradle/catalog" />
-          </set>
-        </option>
-      </GradleProjectSettings>
       <GradleProjectSettings>
         <compositeConfiguration>
           <compositeBuild compositeDefinitionSource="SCRIPT">
             <builds>
-              <build path="$PROJECT_DIR$/gradle/platform/buildSrc" name="buildSrc">
+              <build path="$PROJECT_DIR$/gradle/catalog" name="gradle-catalog">
                 <projects>
-                  <project path="$PROJECT_DIR$/gradle/platform/buildSrc" />
+                  <project path="$PROJECT_DIR$/gradle/catalog" />
                 </projects>
               </build>
-              <build path="$PROJECT_DIR$/gradle/catalog" name="gradle-catalog">
+              <build path="$PROJECT_DIR$/gradle/declarative" name="declarative">
                 <projects>
-                  <project path="$PROJECT_DIR$/gradle/catalog" />
+                  <project path="$PROJECT_DIR$/gradle/declarative" />
+                </projects>
+              </build>
+              <build path="$PROJECT_DIR$/gradle/declarative/buildSrc" name="buildSrc">
+                <projects>
+                  <project path="$PROJECT_DIR$/gradle/declarative/buildSrc" />
+                </projects>
+              </build>
+              <build path="$PROJECT_DIR$/gradle/manifest-dependencies" name="gradle-manifest-dependencies">
+                <projects>
+                  <project path="$PROJECT_DIR$/gradle/manifest-dependencies" />
+                  <project path="$PROJECT_DIR$/gradle/manifest-dependencies/plugin" />
+                </projects>
+              </build>
+              <build path="$PROJECT_DIR$/gradle/platform" name="gradle-platform">
+                <projects>
+                  <project path="$PROJECT_DIR$/gradle/platform" />
+                </projects>
+              </build>
+              <build path="$PROJECT_DIR$/gradle/platform/buildSrc" name="buildSrc">
+                <projects>
+                  <project path="$PROJECT_DIR$/gradle/platform/buildSrc" />
                 </projects>
               </build>
             </builds>
           </compositeBuild>
         </compositeConfiguration>
-        <option name="externalProjectPath" value="$PROJECT_DIR$/gradle/platform" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$/gradle" />
         <option name="modules">
           <set>
+            <option value="$PROJECT_DIR$/gradle" />
             <option value="$PROJECT_DIR$/gradle/catalog" />
+            <option value="$PROJECT_DIR$/gradle/declarative" />
+            <option value="$PROJECT_DIR$/gradle/declarative/buildSrc" />
+            <option value="$PROJECT_DIR$/gradle/manifest-dependencies" />
+            <option value="$PROJECT_DIR$/gradle/manifest-dependencies/plugin" />
             <option value="$PROJECT_DIR$/gradle/platform" />
             <option value="$PROJECT_DIR$/gradle/platform/buildSrc" />
           </set>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index c010932..437ec36 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,6 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/declarative/buildSrc/declarative.buildSrc.main.iml" filepath="$PROJECT_DIR$/.idea/modules/declarative/buildSrc/declarative.buildSrc.main.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/base/gradle-base.iml" filepath="$PROJECT_DIR$/.idea/modules/base/gradle-base.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/base/gradle-base.main.iml" filepath="$PROJECT_DIR$/.idea/modules/base/gradle-base.main.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/base/gradle-base.test.iml" filepath="$PROJECT_DIR$/.idea/modules/base/gradle-base.test.iml" />
diff --git a/.idea/modules/declarative/buildSrc/declarative.buildSrc.main.iml b/.idea/modules/declarative/buildSrc/declarative.buildSrc.main.iml
new file mode 100644
index 0000000..d6d805b
--- /dev/null
+++ b/.idea/modules/declarative/buildSrc/declarative.buildSrc.main.iml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="AdditionalModuleElements">
+    <content url="file://$MODULE_DIR$/../../../../gradle/declarative/buildSrc/src/main" dumb="true">
+      <sourceFolder url="file://$MODULE_DIR$/../../../../gradle/declarative/buildSrc/src/main/kotlin" isTestSource="false" />
+    </content>
+  </component>
+</module>
\ No newline at end of file
diff --git a/gradle/declarative/build.gradle.kts b/gradle/declarative/build.gradle.kts
new file mode 100644
index 0000000..26508a6
--- /dev/null
+++ b/gradle/declarative/build.gradle.kts
@@ -0,0 +1,9 @@
+//import org.gradle.api.experimental.java.javaLibrary
+
+plugins {
+
+}
+
+//javaLibrary {
+//    javaVersion = 11
+//}
\ No newline at end of file
diff --git a/gradle/declarative/buildSrc/build.gradle.kts b/gradle/declarative/buildSrc/build.gradle.kts
new file mode 100644
index 0000000..b22ed73
--- /dev/null
+++ b/gradle/declarative/buildSrc/build.gradle.kts
@@ -0,0 +1,7 @@
+plugins {
+    `kotlin-dsl`
+}
+
+repositories {
+    mavenCentral()
+}
\ No newline at end of file
diff --git a/gradle/declarative/buildSrc/settings.gradle.kts b/gradle/declarative/buildSrc/settings.gradle.kts
new file mode 100644
index 0000000..3f87d39
--- /dev/null
+++ b/gradle/declarative/buildSrc/settings.gradle.kts
@@ -0,0 +1 @@
+rootProject.name = "buildSrc"
\ No newline at end of file
diff --git a/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/common/ApplicationDependencies.kt b/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/common/ApplicationDependencies.kt
new file mode 100644
index 0000000..c1ce39d
--- /dev/null
+++ b/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/common/ApplicationDependencies.kt
@@ -0,0 +1,15 @@
+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.
+ */
+@Restricted
+interface ApplicationDependencies : Dependencies {
+    val implementation: DependencyCollector
+    val runtimeOnly: DependencyCollector
+    val compileOnly: DependencyCollector
+}
diff --git a/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/common/LibraryDependencies.kt b/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/common/LibraryDependencies.kt
new file mode 100644
index 0000000..21ed088
--- /dev/null
+++ b/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/common/LibraryDependencies.kt
@@ -0,0 +1,19 @@
+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 a library.
+ */
+@Restricted
+interface LibraryDependencies : Dependencies {
+    val api: DependencyCollector
+    val implementation: DependencyCollector
+    val runtimeOnly: DependencyCollector
+    val compileOnly: DependencyCollector
+    // 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
+    // talk to Android and KMP about adding support
+}
diff --git a/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/java/JavaApplication.kt b/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/java/JavaApplication.kt
new file mode 100644
index 0000000..aed19b8
--- /dev/null
+++ b/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/java/JavaApplication.kt
@@ -0,0 +1,11 @@
+package org.gradle.api.experimental.java
+
+import org.gradle.api.experimental.jvm.HasJavaTarget
+import org.gradle.api.experimental.jvm.HasJvmApplication
+import org.gradle.declarative.dsl.model.annotations.Restricted
+
+/**
+ * An application implemented using a single version of Java.
+ */
+@Restricted
+interface JavaApplication : HasJavaTarget, HasJvmApplication
diff --git a/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/java/JavaLibrary.kt b/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/java/JavaLibrary.kt
new file mode 100644
index 0000000..ade994f
--- /dev/null
+++ b/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/java/JavaLibrary.kt
@@ -0,0 +1,22 @@
+package org.gradle.api.experimental.java
+
+import org.gradle.api.experimental.common.LibraryDependencies
+import org.gradle.api.experimental.jvm.HasJavaTarget
+import org.gradle.api.experimental.jvm.HasJvmLibrary
+import org.gradle.api.provider.Property
+import org.gradle.declarative.dsl.model.annotations.Restricted
+
+/**
+ * A library implemented using a single version of Java.
+ */
+@Restricted
+interface JavaLibrary : HasJavaTarget, HasJvmLibrary
+
+//inline fun javaLibrary(block: JavaLibrary.() -> Unit): JavaLibrary {
+//    return object : JavaLibrary{
+//        override val javaVersion: Property<Int> = Property
+//        override val dependencies: LibraryDependencies
+//            get() = TODO("Not yet implemented")
+//
+//    }.also(block)
+//}
\ No newline at end of file
diff --git a/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/java/StandaloneJavaApplicationPlugin.kt b/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/java/StandaloneJavaApplicationPlugin.kt
new file mode 100644
index 0000000..a1eee0b
--- /dev/null
+++ b/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/java/StandaloneJavaApplicationPlugin.kt
@@ -0,0 +1,30 @@
+package org.gradle.api.experimental.java
+
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.api.experimental.jvm.internal.JvmPluginSupport
+import org.gradle.api.internal.plugins.software.SoftwareType
+import org.gradle.api.plugins.ApplicationPlugin
+
+/**
+ * Creates a declarative [JavaApplication] DSL model, applies the official Java application plugin,
+ * and links the declarative model to the official plugin.
+ */
+abstract class StandaloneJavaApplicationPlugin : Plugin<Project> {
+    @get:SoftwareType(name = "javaApplication", modelPublicType = JavaApplication::class)
+    abstract val application: JavaApplication
+
+    override fun apply(project: Project) {
+        val dslModel = application
+
+        project.plugins.apply(ApplicationPlugin::class.java)
+
+        linkDslModelToPlugin(project, dslModel)
+    }
+
+    private fun linkDslModelToPlugin(project: Project, dslModel: JavaApplication) {
+        JvmPluginSupport.linkJavaVersion(project, dslModel)
+        JvmPluginSupport.linkApplicationMainClass(project, dslModel)
+        JvmPluginSupport.linkMainSourceSourceSetDependencies(project, dslModel.dependencies)
+    }
+}
diff --git a/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/java/StandaloneJavaLibraryPlugin.kt b/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/java/StandaloneJavaLibraryPlugin.kt
new file mode 100644
index 0000000..42e96b1
--- /dev/null
+++ b/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/java/StandaloneJavaLibraryPlugin.kt
@@ -0,0 +1,28 @@
+package org.gradle.api.experimental.java
+
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.api.experimental.jvm.internal.JvmPluginSupport
+import org.gradle.api.internal.plugins.software.SoftwareType
+import org.gradle.api.plugins.JavaLibraryPlugin
+
+/**
+ * Creates a declarative [JavaLibrary] DSL model, applies the official Java library plugin,
+ * and links the declarative model to the official plugin.
+ */
+abstract class StandaloneJavaLibraryPlugin : Plugin<Project> {
+    @get:SoftwareType(name = "javaLibrary", modelPublicType = JavaLibrary::class) abstract val library: JavaLibrary
+
+    override fun apply(project: Project) {
+        val dslModel = library
+
+        project.plugins.apply(JavaLibraryPlugin::class.java)
+
+        linkDslModelToPlugin(project, dslModel)
+    }
+
+    private fun linkDslModelToPlugin(project: Project, dslModel: JavaLibrary) {
+        JvmPluginSupport.linkJavaVersion(project, dslModel)
+        JvmPluginSupport.linkMainSourceSourceSetDependencies(project, dslModel.dependencies)
+    }
+}
diff --git a/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/jvm/HasJavaTarget.kt b/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/jvm/HasJavaTarget.kt
new file mode 100644
index 0000000..5f6b916
--- /dev/null
+++ b/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/jvm/HasJavaTarget.kt
@@ -0,0 +1,13 @@
+package org.gradle.api.experimental.jvm
+
+import org.gradle.api.provider.Property
+import org.gradle.declarative.dsl.model.annotations.Restricted
+
+/**
+ * A component that is built for a single Java version.
+ */
+@Restricted
+interface HasJavaTarget {
+    @get:Restricted
+    val javaVersion: Property<Int>
+}
diff --git a/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/jvm/HasJavaTargets.kt b/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/jvm/HasJavaTargets.kt
new file mode 100644
index 0000000..aab1357
--- /dev/null
+++ b/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/jvm/HasJavaTargets.kt
@@ -0,0 +1,18 @@
+package org.gradle.api.experimental.jvm
+
+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
+
+/**
+ * A component that is built for multiple Java versions.
+ */
+@Restricted
+interface HasJavaTargets {
+    @get:Nested
+    val targets: JvmTargetContainer
+
+    @Configuring
+    fun targets(action: Action<in JvmTargetContainer>) = action.execute(targets)
+}
diff --git a/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/jvm/HasJvmApplication.kt b/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/jvm/HasJvmApplication.kt
new file mode 100644
index 0000000..c084e9c
--- /dev/null
+++ b/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/jvm/HasJvmApplication.kt
@@ -0,0 +1,23 @@
+package org.gradle.api.experimental.jvm
+
+import org.gradle.api.Action
+import org.gradle.api.experimental.common.ApplicationDependencies
+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
+
+/**
+ * Represents an application that runs on the JVM.
+ */
+@Restricted
+interface HasJvmApplication {
+    @get:Restricted
+    val mainClass: Property<String>
+
+    @get:Nested
+    val dependencies: ApplicationDependencies
+
+    @Configuring
+    fun dependencies(action: Action<in ApplicationDependencies>) = action.execute(dependencies)
+}
diff --git a/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/jvm/HasJvmLibrary.kt b/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/jvm/HasJvmLibrary.kt
new file mode 100644
index 0000000..e6bf99b
--- /dev/null
+++ b/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/jvm/HasJvmLibrary.kt
@@ -0,0 +1,19 @@
+package org.gradle.api.experimental.jvm
+
+import org.gradle.api.Action
+import org.gradle.api.experimental.common.LibraryDependencies
+import org.gradle.api.tasks.Nested
+import org.gradle.declarative.dsl.model.annotations.Configuring
+import org.gradle.declarative.dsl.model.annotations.Restricted
+
+/**
+ * Represents a library that runs on the JVM.
+ */
+@Restricted
+interface HasJvmLibrary {
+    @get:Nested
+    val dependencies: LibraryDependencies
+
+    @Configuring
+    fun dependencies(action: Action<in LibraryDependencies>) = action.execute(dependencies)
+}
diff --git a/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/jvm/JavaTarget.kt b/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/jvm/JavaTarget.kt
new file mode 100644
index 0000000..6fc1861
--- /dev/null
+++ b/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/jvm/JavaTarget.kt
@@ -0,0 +1,7 @@
+package org.gradle.api.experimental.jvm
+
+import org.gradle.api.Named
+
+abstract class JavaTarget(val javaVersion: Int) : JvmTarget, Named {
+    override fun getName(): String = "java$javaVersion"
+}
diff --git a/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/jvm/JvmApplication.kt b/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/jvm/JvmApplication.kt
new file mode 100644
index 0000000..19ad8d7
--- /dev/null
+++ b/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/jvm/JvmApplication.kt
@@ -0,0 +1,6 @@
+package org.gradle.api.experimental.jvm
+
+/**
+ * An application that runs on the JVM and that is implemented using one or more versions of Java.
+ */
+interface JvmApplication : HasJavaTargets, HasJvmApplication
diff --git a/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/jvm/JvmEcosystemPlugin.kt b/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/jvm/JvmEcosystemPlugin.kt
new file mode 100644
index 0000000..f33b20f
--- /dev/null
+++ b/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/jvm/JvmEcosystemPlugin.kt
@@ -0,0 +1,15 @@
+package org.gradle.api.experimental.jvm
+
+import org.gradle.api.Plugin
+import org.gradle.api.experimental.java.StandaloneJavaApplicationPlugin
+import org.gradle.api.experimental.java.StandaloneJavaLibraryPlugin
+import org.gradle.api.initialization.Settings
+import org.gradle.api.internal.plugins.software.RegistersSoftwareTypes
+
+@RegistersSoftwareTypes(StandaloneJavaApplicationPlugin::class,
+                        StandaloneJavaLibraryPlugin::class,
+                        StandaloneJvmLibraryPlugin::class,
+                        StandaloneJvmApplicationPlugin::class)
+class JvmEcosystemPlugin : Plugin<Settings> {
+    override fun apply(target: Settings) {}
+}
diff --git a/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/jvm/JvmLibrary.kt b/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/jvm/JvmLibrary.kt
new file mode 100644
index 0000000..2ea9637
--- /dev/null
+++ b/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/jvm/JvmLibrary.kt
@@ -0,0 +1,9 @@
+package org.gradle.api.experimental.jvm
+
+import org.gradle.declarative.dsl.model.annotations.Restricted
+
+/**
+ * A library that runs on the JVM and that is implemented using one or more versions of Java.
+ */
+@Restricted
+interface JvmLibrary : HasJavaTargets, HasJvmLibrary
diff --git a/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/jvm/JvmTarget.kt b/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/jvm/JvmTarget.kt
new file mode 100644
index 0000000..14ea67e
--- /dev/null
+++ b/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/jvm/JvmTarget.kt
@@ -0,0 +1,17 @@
+package org.gradle.api.experimental.jvm
+
+import org.gradle.api.Action
+import org.gradle.api.Named
+import org.gradle.api.experimental.common.LibraryDependencies
+import org.gradle.api.tasks.Nested
+import org.gradle.declarative.dsl.model.annotations.Configuring
+import org.gradle.declarative.dsl.model.annotations.Restricted
+
+@Restricted
+interface JvmTarget : Named {
+    @get:Nested
+    val dependencies: LibraryDependencies
+
+    @Configuring
+    fun dependencies(action: Action<in LibraryDependencies>) = action.execute(dependencies)
+}
diff --git a/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/jvm/JvmTargetContainer.kt b/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/jvm/JvmTargetContainer.kt
new file mode 100644
index 0000000..2925de7
--- /dev/null
+++ b/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/jvm/JvmTargetContainer.kt
@@ -0,0 +1,33 @@
+package org.gradle.api.experimental.jvm
+
+import org.gradle.api.Action
+import org.gradle.api.internal.CollectionCallbackActionDecorator
+import org.gradle.api.internal.DefaultNamedDomainObjectSet
+import org.gradle.declarative.dsl.model.annotations.Adding
+import org.gradle.declarative.dsl.model.annotations.Restricted
+import org.gradle.internal.instantiation.InstantiatorFactory
+import org.gradle.internal.reflect.Instantiator
+import org.gradle.internal.service.ServiceRegistry
+import javax.inject.Inject
+
+@Restricted
+class JvmTargetContainer
+@Inject
+constructor(instantiator: Instantiator,
+            instantiatorFactory: InstantiatorFactory,
+            serviceRegistry: ServiceRegistry, callbackDecorator: CollectionCallbackActionDecorator)
+    : DefaultNamedDomainObjectSet<JvmTarget>(JvmTarget::class.java, instantiator, callbackDecorator) {
+
+    private val elementInstantiator: Instantiator = instantiatorFactory.decorateLenient(serviceRegistry)
+
+    @Adding
+    fun java(version: Int): JvmTarget = java(version) {}
+
+    @Adding
+    fun java(version: Int, action: Action<in JvmTarget>): JvmTarget {
+        val element = elementInstantiator.newInstance(JavaTarget::class.java, version)
+        add(element)
+        action.execute(element)
+        return element
+    }
+}
diff --git a/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/jvm/StandaloneJvmApplicationPlugin.kt b/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/jvm/StandaloneJvmApplicationPlugin.kt
new file mode 100644
index 0000000..798b5d6
--- /dev/null
+++ b/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/jvm/StandaloneJvmApplicationPlugin.kt
@@ -0,0 +1,46 @@
+package org.gradle.api.experimental.jvm
+
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.api.experimental.jvm.internal.JvmPluginSupport
+import org.gradle.api.experimental.jvm.internal.JvmPluginSupport.createTargetSourceSet
+import org.gradle.api.experimental.jvm.internal.JvmPluginSupport.linkApplicationMainClass
+import org.gradle.api.experimental.jvm.internal.JvmPluginSupport.setupCommonSourceSet
+import org.gradle.api.internal.plugins.software.SoftwareType
+import org.gradle.api.plugins.ApplicationPlugin
+import org.gradle.jvm.toolchain.JavaToolchainService
+import org.gradle.kotlin.dsl.withType
+import javax.inject.Inject
+
+/**
+ * Creates a declarative [JvmApplication] DSL model, applies the official Jvm plugin,
+ * and links the declarative model to the official plugin.
+ */
+abstract class StandaloneJvmApplicationPlugin : Plugin<Project> {
+    @get:SoftwareType(name = "jvmApplication", modelPublicType = JvmApplication::class)
+    abstract val jvmApplication: JvmApplication
+
+    override fun apply(project: Project) {
+        val dslModel = jvmApplication
+
+        project.plugins.apply(ApplicationPlugin::class.java)
+
+        linkDslModelToPlugin(project, dslModel)
+    }
+
+    @get:Inject
+    protected abstract val javaToolchainService: JavaToolchainService
+
+    private fun linkDslModelToPlugin(project: Project, dslModel: JvmApplication) {
+        val commonSources = setupCommonSourceSet(project)
+        JvmPluginSupport.linkSourceSetToDependencies(project, commonSources, dslModel.dependencies)
+
+        JvmPluginSupport.linkJavaVersion(project, dslModel)
+        linkApplicationMainClass(project, dslModel)
+        dslModel.targets.withType<JavaTarget>().all {
+            val sourceSet = createTargetSourceSet(project, this, commonSources, javaToolchainService)
+            // Link dependencies to DSL
+            JvmPluginSupport.linkSourceSetToDependencies(project, sourceSet, dependencies)
+        }
+    }
+}
diff --git a/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/jvm/StandaloneJvmLibraryPlugin.kt b/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/jvm/StandaloneJvmLibraryPlugin.kt
new file mode 100644
index 0000000..1e28d54
--- /dev/null
+++ b/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/jvm/StandaloneJvmLibraryPlugin.kt
@@ -0,0 +1,50 @@
+package org.gradle.api.experimental.jvm
+
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.api.experimental.jvm.internal.JvmPluginSupport
+import org.gradle.api.experimental.jvm.internal.JvmPluginSupport.createTargetSourceSet
+import org.gradle.api.experimental.jvm.internal.JvmPluginSupport.setupCommonSourceSet
+import org.gradle.api.internal.plugins.software.SoftwareType
+import org.gradle.api.plugins.JavaLibraryPlugin
+import org.gradle.jvm.toolchain.JavaToolchainService
+import org.gradle.kotlin.dsl.get
+import org.gradle.kotlin.dsl.withType
+import javax.inject.Inject
+
+/**
+ * Creates a declarative [JvmLibrary] DSL model, applies the official Jvm plugin,
+ * and links the declarative model to the official plugin.
+ */
+abstract class StandaloneJvmLibraryPlugin : Plugin<Project> {
+    @get:SoftwareType(name = "jvmLibrary", modelPublicType = JvmLibrary::class)
+    abstract val jvmLibrary: JvmLibrary
+
+    override fun apply(project: Project) {
+        val dslModel = jvmLibrary
+
+        project.plugins.apply(JavaLibraryPlugin::class.java)
+
+        linkDslModelToPlugin(project, dslModel)
+    }
+
+    @get:Inject
+    protected abstract val javaToolchainService: JavaToolchainService?
+
+    private fun linkDslModelToPlugin(project: Project, dslModel: JvmLibrary) {
+        val commonSources = setupCommonSourceSet(project)
+        JvmPluginSupport.linkSourceSetToDependencies(project, commonSources, dslModel.dependencies)
+
+        JvmPluginSupport.linkJavaVersion(project, dslModel)
+
+        dslModel.targets.withType<JavaTarget>().all {
+            val sourceSet = createTargetSourceSet(project, this, commonSources, javaToolchainService!!)
+            // Link dependencies to DSL
+            JvmPluginSupport.linkSourceSetToDependencies(project, sourceSet, dependencies)
+
+            // Extend common dependencies
+            project.configurations[sourceSet.apiConfigurationName]
+                    .extendsFrom(project.configurations[commonSources.apiConfigurationName])
+        }
+    }
+}
diff --git a/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/jvm/internal/JvmPluginSupport.kt b/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/jvm/internal/JvmPluginSupport.kt
new file mode 100644
index 0000000..b6378e5
--- /dev/null
+++ b/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/jvm/internal/JvmPluginSupport.kt
@@ -0,0 +1,106 @@
+package org.gradle.api.experimental.jvm.internal
+
+import org.gradle.api.Action
+import org.gradle.api.Project
+import org.gradle.api.Task
+import org.gradle.api.experimental.common.ApplicationDependencies
+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.plugins.FeatureSpec
+import org.gradle.api.plugins.JavaApplication
+import org.gradle.api.plugins.JavaPluginExtension
+import org.gradle.api.plugins.internal.JavaPluginHelper
+import org.gradle.api.tasks.SourceSet
+import org.gradle.api.tasks.compile.JavaCompile
+import org.gradle.jvm.toolchain.JavaLanguageVersion
+import org.gradle.jvm.toolchain.JavaToolchainService
+import org.gradle.jvm.toolchain.JavaToolchainSpec
+import org.gradle.kotlin.dsl.*
+
+object JvmPluginSupport {
+    fun linkSourceSetToDependencies(project: Project, sourceSet: SourceSet, dependencies: LibraryDependencies) {
+        project.configurations[sourceSet.implementationConfigurationName]
+                .dependencies.addAllLater(dependencies.implementation.dependencies)
+        project.configurations[sourceSet.compileOnlyConfigurationName]
+                .dependencies.addAllLater(dependencies.compileOnly.dependencies)
+        project.configurations[sourceSet.runtimeOnlyConfigurationName]
+                .dependencies.addAllLater(dependencies.runtimeOnly.dependencies)
+        project.configurations[sourceSet.apiConfigurationName]
+                .dependencies.addAllLater(dependencies.api.dependencies)
+    }
+
+    fun linkSourceSetToDependencies(project: Project, sourceSet: SourceSet, dependencies: ApplicationDependencies) {
+        project.configurations[sourceSet.implementationConfigurationName]
+                .dependencies.addAllLater(dependencies.implementation.dependencies)
+        project.configurations[sourceSet.compileOnlyConfigurationName]
+                .dependencies.addAllLater(dependencies.compileOnly.dependencies)
+        project.configurations[sourceSet.runtimeOnlyConfigurationName]
+                .dependencies.addAllLater(dependencies.runtimeOnly.dependencies)
+    }
+
+    fun linkMainSourceSourceSetDependencies(project: Project, dependencies: LibraryDependencies) {
+        val java = project.extensions.getByType<JavaPluginExtension>()
+        linkSourceSetToDependencies(project, java.sourceSets["main"], dependencies)
+    }
+
+    fun linkMainSourceSourceSetDependencies(project: Project, dependencies: ApplicationDependencies) {
+        val java = project.extensions.getByType<JavaPluginExtension>()
+        linkSourceSetToDependencies(project, java.sourceSets["main"], dependencies)
+    }
+
+    fun linkJavaVersion(project: Project, dslModel: HasJavaTarget) {
+        val java = project.extensions.getByType<JavaPluginExtension>()
+        java.toolchain.languageVersion = dslModel.javaVersion.map(JavaLanguageVersion::of)
+    }
+
+    fun linkJavaVersion(project: Project, dslModel: HasJavaTargets) {
+        val java = project.extensions.getByType<JavaPluginExtension>()
+        java.toolchain.languageVersion = project.provider<JavaLanguageVersion> { JavaLanguageVersion.of(dslModel.targets.withType<JavaTarget>().map { it.javaVersion }.min()) }
+    }
+
+    fun linkApplicationMainClass(project: Project, application: HasJvmApplication) {
+        val app = project.extensions.getByType<JavaApplication>()
+        app.mainClass = application.mainClass
+    }
+
+    fun setupCommonSourceSet(project: Project): SourceSet {
+        val commonSources = JavaPluginHelper.getJavaComponent(project).mainFeature.sourceSet
+        val srcDir = project.layout.projectDirectory.dir("src").dir("common").dir("java")
+        commonSources.java.setSrcDirs(setOf(srcDir))
+        return commonSources
+    }
+
+    fun createTargetSourceSet(project: Project,
+                              target: JavaTarget,
+                              commonSources: SourceSet,
+                              javaToolchainService: JavaToolchainService): SourceSet {
+        val java = project.extensions.getByType<JavaPluginExtension>()
+        val sourceSet = java.sourceSets.create("java${target.javaVersion}")
+        java.registerFeature("java" + target.javaVersion) { usingSourceSet(sourceSet) }
+
+        // Link properties
+        project.tasks.named<JavaCompile>(sourceSet.compileJavaTaskName) {
+            javaCompiler = javaToolchainService.compilerFor { languageVersion = JavaLanguageVersion.of(target.javaVersion) }
+        }
+
+        // Depend on common sources
+        project.configurations[sourceSet.implementationConfigurationName]
+                .dependencies += project.dependencies.create(commonSources.output)
+
+        // Extend common dependencies
+        project.configurations[sourceSet.implementationConfigurationName]
+                .extendsFrom(project.configurations[commonSources.implementationConfigurationName])
+        project.configurations[sourceSet.compileOnlyConfigurationName]
+                .extendsFrom(project.configurations[commonSources.compileOnlyConfigurationName])
+        project.configurations[sourceSet.runtimeOnlyConfigurationName]
+                .extendsFrom(project.configurations[commonSources.runtimeOnlyConfigurationName])
+
+        // Assemble includes all targets
+        project.tasks["assemble"].configure<Task> { dependsOn(sourceSet.output) }
+
+        return sourceSet
+    }
+}
diff --git a/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/internal/plugins/software/RegistersSoftwareTypes.kt b/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/internal/plugins/software/RegistersSoftwareTypes.kt
new file mode 100644
index 0000000..85690ba
--- /dev/null
+++ b/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/internal/plugins/software/RegistersSoftwareTypes.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.gradle.api.internal.plugins.software
+
+import org.gradle.api.Incubating
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import kotlin.reflect.KClass
+
+/**
+ * Marks a Settings plugin as registering one or more software types.
+ *
+ * @since 8.9
+ */
+@Incubating
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+annotation class RegistersSoftwareTypes(
+    /**
+     * The [Project] plugins that provide the software types.
+     *
+     * @since 8.9
+     */
+    vararg val value: KClass<out Plugin<Project>>)
diff --git a/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/internal/plugins/software/SoftwareType.kt b/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/internal/plugins/software/SoftwareType.kt
new file mode 100644
index 0000000..3abc707
--- /dev/null
+++ b/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/internal/plugins/software/SoftwareType.kt
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.gradle.api.internal.plugins.software
+
+import org.gradle.api.Incubating
+import kotlin.reflect.KClass
+
+/**
+ * Marks a method as exposing a software type.  This should be used in plugin classes to communicate which software types they provide.
+ *
+ * @since 8.9
+ */
+@Incubating
+@Target(AnnotationTarget.FUNCTION,
+        AnnotationTarget.PROPERTY_GETTER,
+        AnnotationTarget.PROPERTY_SETTER)
+@Retention(AnnotationRetention.RUNTIME)
+annotation class SoftwareType(
+    /**
+     * The name of the software type.  This will correspond to the DSL element that is exposed to configure the software type.
+     *
+     * @since 8.9
+     */
+    val name: String,
+    /**
+     * The model type used to configure the software type.  Note that this class should be the same type or a super type of the return type
+     * of the method that this annotation is applied to.
+     *
+     * @since 8.9
+     */
+    val modelPublicType: KClass<*>)
\ No newline at end of file
diff --git a/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/declarative/dsl/model/annotations/Adding.kt b/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/declarative/dsl/model/annotations/Adding.kt
new file mode 100644
index 0000000..65418b5
--- /dev/null
+++ b/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/declarative/dsl/model/annotations/Adding.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.gradle.declarative.dsl.model.annotations
+
+@Target(AnnotationTarget.FUNCTION,
+        AnnotationTarget.PROPERTY_GETTER,
+        AnnotationTarget.PROPERTY_SETTER)
+@Retention(AnnotationRetention.RUNTIME)
+annotation class Adding
diff --git a/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/declarative/dsl/model/annotations/Configuring.kt b/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/declarative/dsl/model/annotations/Configuring.kt
new file mode 100644
index 0000000..e1e6290
--- /dev/null
+++ b/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/declarative/dsl/model/annotations/Configuring.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.gradle.declarative.dsl.model.annotations
+
+@Target(AnnotationTarget.FUNCTION,
+        AnnotationTarget.PROPERTY_GETTER,
+        AnnotationTarget.PROPERTY_SETTER)
+@Retention(AnnotationRetention.RUNTIME)
+annotation class Configuring(val propertyName: String = "")
diff --git a/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/declarative/dsl/model/annotations/Restricted.kt b/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/declarative/dsl/model/annotations/Restricted.kt
new file mode 100644
index 0000000..14fc4f9
--- /dev/null
+++ b/gradle/declarative/buildSrc/src/main/kotlin/org/gradle/declarative/dsl/model/annotations/Restricted.kt
@@ -0,0 +1,8 @@
+package org.gradle.declarative.dsl.model.annotations
+
+@Target(AnnotationTarget.CLASS,
+        AnnotationTarget.FUNCTION,
+        AnnotationTarget.PROPERTY_GETTER,
+        AnnotationTarget.PROPERTY_SETTER)
+@Retention(AnnotationRetention.RUNTIME)
+annotation class Restricted
\ No newline at end of file
diff --git a/gradle/declarative/settings.gradle.kts b/gradle/declarative/settings.gradle.kts
new file mode 100644
index 0000000..e4f87df
--- /dev/null
+++ b/gradle/declarative/settings.gradle.kts
@@ -0,0 +1,6 @@
+// This is an empty umbrella build including all the component builds.
+// This build is not necessarily needed. The component builds work independently.
+
+rootProject.name = "declarative"
+
+enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
\ No newline at end of file
diff --git a/gradle/settings.gradle.kts b/gradle/settings.gradle.kts
index 2a15aec..72ebbc5 100644
--- a/gradle/settings.gradle.kts
+++ b/gradle/settings.gradle.kts
@@ -6,6 +6,7 @@ rootProject.name = "gradle"
 includeBuild("catalog")
 includeBuild("platform")
 includeBuild("manifest-dependencies")
+includeBuild("declarative")
 //includeBuild("playground")
 //includeBuild("enforcer")