Update AGP flag handling (#262)

Author: cdsap

README.md

@@ -50,10 +50,11 @@ Then, you can use the versions.yaml in the `generate-project` command:
 - `--develocity-url`: Specify Develocity URL
 - `--versions-file`: Path to a custom YAML file with dependency versions
 - `--project-name`: Name of the project
-- `--agp9`: Use AGP 9.x (default: false). Only for Android projects.
 - `--room-database`: Enable Room database generation (default: false). Only for Android projects.
 - `--android-kotlin-multiplatform-library`: For Android projects, generate Android library modules with `com.android.kotlin.multiplatform.library` instead of `com.android.library` (default: false).
 
+Android projects use the default AGP version from `Versions()` unless you override it in `--versions-file`.
+
 #### Example: Generate a project with custom options
 ```bash
 ./projectGenerator generate-project --shape rhombus --modules 50 --layers 4 --language both --type jvm --classesModule 10 --classesModuleType random --typeOfStringResources large --generateUnitTest --gradle gradle_8_9 --develocity --versionsFile ./my_versions.yaml

backend/server.cjs

@@ -80,7 +80,6 @@ app.post('/api/generate', upload.single('versions-file'), async (req, res) => {
         // Add project name if provided
         if (body['project-name']) { args.push('--project-name', body['project-name']);}
         if (toBool(body['generate-unit-test']) || toBool(body.generateUnitTest)) args.push('--generate-unit-test');
-        if (toBool(body['agp9'])) args.push('--agp9');
         if (toBool(body.develocity)) args.push('--develocity');
         if (body['develocity-url']) args.push('--develocity-url', body['develocity-url']);
         if (type === 'android' && body.processor) args.push('--processor', body.processor);

cli/src/main/kotlin/io/github/cdsap/projectgenerator/cli/Main.kt

@@ -58,6 +58,7 @@ class GenerateProjects : CliktCommand(name = "generate-project") {
     private val versionsFile by option().file()
     private val projectName by option()
     private val develocityUrl by option()
+    // Kept for CLI backwards compatibility. AGP 9 is the default now.
     private val agp9 by option().flag(default = false)
     private val roomDatabase by option("--room-database").flag(default = false)
     private val kotlinMultiplatformLibrary by option("--android-kotlin-multiplatform-library").flag(default = false)
@@ -73,7 +74,6 @@ class GenerateProjects : CliktCommand(name = "generate-project") {
         val versions = getVersions(
             fileVersions = versionsFile,
             develocityUrl = develocityUrl,
-            agp9 = agp9,
             roomDatabase = roomDatabase,
             kotlinMultiplatformLibrary = kotlinMultiplatformLibrary
         ).copy(di = dependencyInjection)
@@ -118,21 +118,13 @@ class GenerateProjects : CliktCommand(name = "generate-project") {
     private fun getVersions(
         fileVersions: File?,
         develocityUrl: String?,
-        agp9: Boolean,
         roomDatabase: Boolean,
         kotlinMultiplatformLibrary: Boolean
     ): Versions {
         val versions = if (fileVersions != null) {
             parseYaml(fileVersions)
         } else {
-            // We only support the injection of AGP 9 version via CLI with the `agp9` option
-            // if the version is provided by file this logic is not executed
-            if (agp9) {
-                val versions = Versions()
-                versions.copy(android = versions.android.copy(agp = versions.android.agp9))
-            } else {
-                Versions()
-            }
+            Versions()
         }
         var androidConfig = versions.android
         if (roomDatabase) {

project-generator/src/test/kotlin/io/github/cdsap/projectgenerator/generator/files/GradlePropertiesTest.kt

@@ -1,6 +1,7 @@
 package io.github.cdsap.projectgenerator.generator.files
 
 import io.github.cdsap.projectgenerator.generator.rootproject.GradleProperties
+import io.github.cdsap.projectgenerator.model.DependencyInjection
 import io.github.cdsap.projectgenerator.model.Android
 import io.github.cdsap.projectgenerator.model.Kotlin
 import io.github.cdsap.projectgenerator.model.KotlinProcessor
@@ -61,4 +62,28 @@ class GradlePropertiesTest {
         val gradleProperties = GradleProperties().get(versions)
         Assertions.assertTrue(!gradleProperties.contains("ksp.useKSP2=false"))
     }
+
+    @Test
+    fun `includes android newDsl override for hilt on agp9`() {
+        val versions = Versions(
+            android = Android(agp = "9.1.0"),
+            di = DependencyInjection.HILT
+        )
+
+        val gradleProperties = GradleProperties().get(versions)
+
+        Assertions.assertTrue(gradleProperties.contains("android.newDsl=false"))
+    }
+
+    @Test
+    fun `does not include android newDsl override for hilt on agp8`() {
+        val versions = Versions(
+            android = Android(agp = "8.10.0"),
+            di = DependencyInjection.HILT
+        )
+
+        val gradleProperties = GradleProperties().get(versions)
+
+        Assertions.assertFalse(gradleProperties.contains("android.newDsl=false"))
+    }
 }