From 8cb2984fd505f822e17704adf63fd202863a7f5a Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <paul@gradle.com>
Date: Wed, 13 Nov 2024 13:28:33 +0100
Subject: [PATCH] Rework docs content for EAP2

---
 docs/ROADMAP.md | 60 +++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 51 insertions(+), 9 deletions(-)

diff --git a/docs/ROADMAP.md b/docs/ROADMAP.md
index a22134b..eb5dd9e 100644
--- a/docs/ROADMAP.md
+++ b/docs/ROADMAP.md
@@ -1,15 +1,27 @@
-# Declarative Gradle Roadmap (Preview)
+# Declarative Gradle Roadmap
 
 Declarative Gradle is an experimental project under active development.
 Below, you can see the key milestones we anticipate.
-All the dates and the scope are aspirational.
+
+!!!warn
+    All the dates and the scope are aspirational.
+
+| Milestone                           |   | Date          |
+| ----------------------------------- |:-:| ------------: |
+| First Early Access Preview (EAP)    | ✅ |     July 2024 |
+| Second Early Access Preview (EAP 2) | ✅ | November 2024 |
+| Third Early Access Preview (EAP 3)  | 🏗️ | February 2024 |
+| Incubating Software Types and DCL   | ⏳ |          2025 |
+| Stable Software Types and DCL       | ⏳ |          2026 |
+
+Gradle feature lifecycle is documented in the [user manual](https://docs.gradle.org/current/userguide/feature_lifecycle.html#sec:incubating_state).
 
 To discuss the roadmap and the related initiatives, use the
 `#declarative-gradle` channel on the [Gradle Community Slack](https://gradle.org/slack-invite)
 
-## First Early Access Preview (EAP) - July 2024
+## First Early Access Preview (EAP)
 
-* Summer 2024
+* July 2024
 * Early feedback from IDE vendors and plugin integrators
 * Early feedback from software developers and build engineers from the community
 * Demonstrating end to end workflows with [Now In Android](https://github.com/gradle/nowinandroid) sample and [other prototypes](https://github.com/gradle/declarative-gradle)
@@ -19,12 +31,42 @@ To discuss the roadmap and the related initiatives, use the
   * Toolability demonstrations (IDE integration, mutations)
 
 
-## Second Early Access Preview (EAP) - November 2024
+## Second Early Access Preview (EAP)
+
+* November 2024
+* Official Android Software Type Preview
+* New DCL Language Features
+  * Enum properties
+  * Named domain object containers
+* Configuring Software Types from Kotlin DSL
+* Prototype Plugins for C++ and Swift
+* Support for VS Code and Eclipse IDE
+* Generating Declarative Builds with `gradle init`
+
+## Third Early Access Preview (EAP)
+
+* February 2025
+* Declarative Gradle can be used by early adopters for simple projects
+  * Add support for testing to our prototype plugins
+* Validating the Software Types approach for Composability and Extensibility
+  * Supporting new software features that are not part of the base software type
+  * Adding/configuring code quality checks
+  * Adding/configuring source-generation/bytecode-manipulation
+* More DCL features to support the official Android Software Type
+  * File and directory properties
+  * Multi-valued properties (Lists, Maps)
+  * Container defaults
+* Discovery work on the migration of existing builds
 
-## Third Early Access Previes (EAP) - February 2025
+## Incubating Software Types and DCL
 
-## Incubating Software Types and Declarative Configuration Language (DCL) - 2025
+* 2025
+* Software Types are promoted to Incubating
+  * They can be configured from both Kotlin DSL and Groovy DSL
+* Declarative Configuration Language (DCL) is promoted to Incubating
 
-## Stable Software Types
+## Stable Software Types and DCL
 
-## Stable Declarative Configuration Language (DCL)
+* 2026
+* Software Types are promoted to Stable
+* Declarative Configuration Language (DCL) is promoted to Stable