Merge pull request #3 from cdsap/removing_android_plugins_when_jvm

Removing android plugins when jvm

Author: cdsap

src/main/kotlin/io/github/cdsap/generator/Main.kt

@@ -63,7 +63,7 @@ class ProjectGenerator(
 
         val projectLanguageAttributes =
             getProjectLanguageAttributes(language, "projects_generated/${shape.name.lowercase()}_$numberOfModules")
-        ProjectWriter(nodes, projectLanguageAttributes, classesPerModule,versions).write()
+        ProjectWriter(nodes, projectLanguageAttributes, classesPerModule, versions, typeOfProjectRequested).write()
         GraphWriter(nodes, "projects_generated/${shape.name.lowercase()}_$numberOfModules").write()
         println("Project created in projects_generated/${shape.name.lowercase()}_$numberOfModules")
     }

src/main/kotlin/io/github/cdsap/generator/ProjectWriter.kt

@@ -1,9 +1,7 @@
 package io.github.cdsap.generator
 
 import io.github.cdsap.generator.files.*
-import io.github.cdsap.generator.model.LanguageAttributes
-import io.github.cdsap.generator.model.ProjectGraph
-import io.github.cdsap.generator.model.Versions
+import io.github.cdsap.generator.model.*
 import io.github.cdsap.generator.writer.ConventionPluginWriter
 import io.github.cdsap.generator.writer.ModulesWriter
 import java.io.File
@@ -12,11 +10,12 @@ class ProjectWriter(
     private val nodes: List<ProjectGraph>,
     private val languages: List<LanguageAttributes>,
     private val numberOfClassPerModule: Int,
-    private val versions: Versions
+    private val versions: Versions,
+    private val typeOfProjectRequested: TypeProjectRequested
 ) {
     fun write() {
         println("Creating Convention Plugin files")
-        ConventionPluginWriter(languages, versions).write()
+        ConventionPluginWriter(languages, versions, typeOfProjectRequested).write()
         println("Creating Modules files")
         ModulesWriter(nodes, languages, numberOfClassPerModule).write()
 
@@ -36,8 +35,11 @@ class ProjectWriter(
         }
     }
 
-    private fun createProjectBuildGradle(languages: List<LanguageAttributes>) {
-        val plugins = BuildGradle().get(versions)
+    private fun createProjectBuildGradle(
+        languages: List<LanguageAttributes>
+    ) {
+        val plugins = if (typeOfProjectRequested == TypeProjectRequested.JVM) BuildGradle().getJvm(versions)
+        else BuildGradle().get(versions)
         languages.forEach {
             File("${it.projectName}/build.${it.extension}").createNewFile()
             File("${it.projectName}/build.${it.extension}").writeText(plugins)

src/main/kotlin/io/github/cdsap/generator/files/BuildGradle.kt

@@ -12,4 +12,11 @@ class BuildGradle {
             id("com.android.library") version "${versions.agp}" apply false
         }
         """.trimIndent()
+
+    fun getJvm(versions: Versions) = """
+        plugins {
+            id("com.autonomousapps.dependency-analysis") version "1.21.0"
+            id("org.jetbrains.kotlin.jvm") version("${versions.kgp}") apply false
+        }
+        """.trimIndent()
 }

src/main/kotlin/io/github/cdsap/generator/files/CompositeBuildBuildGradle.kt

@@ -1,17 +1,26 @@
 package io.github.cdsap.generator.files
 
+import io.github.cdsap.generator.model.TypeProjectRequested
 import io.github.cdsap.generator.model.Versions
 
 class CompositeBuildBuildGradle {
 
-    fun get(versions: Versions) = """
+    fun get(versions: Versions, requested: TypeProjectRequested): String {
+        val classpath = if (requested == TypeProjectRequested.ANDROID) {
+            """
+                implementation("com.android.tools.build:gradle:${versions.agp}")
+            """.trimIndent()
+        } else {
+            ""
+        }
+        return """
             plugins {
                 `kotlin-dsl`
             }
 
             dependencies {
                 implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kgp}")
-                implementation("com.android.tools.build:gradle:${versions.agp}")
+                $classpath
             }
 
             gradlePlugin {
@@ -40,4 +49,5 @@ class CompositeBuildBuildGradle {
             }
 
         """.trimIndent()
+    }
 }

src/main/kotlin/io/github/cdsap/generator/writer/ConventionPluginWriter.kt

@@ -2,11 +2,15 @@ package io.github.cdsap.generator.writer
 
 import io.github.cdsap.generator.files.*
 import io.github.cdsap.generator.model.LanguageAttributes
+import io.github.cdsap.generator.model.TypeProjectRequested
 import io.github.cdsap.generator.model.Versions
 import java.io.File
 
-class ConventionPluginWriter(private val languages: List<LanguageAttributes>,
-    private val versions: Versions) {
+class ConventionPluginWriter(
+    private val languages: List<LanguageAttributes>,
+    private val versions: Versions,
+    private val requested: TypeProjectRequested
+) {
 
     fun write() {
         createConventionFolders(languages)
@@ -25,9 +29,7 @@ class ConventionPluginWriter(private val languages: List<LanguageAttributes>,
         languages.forEach {
             File("${it.projectName}/build-logic/convention/build.gradle.kts").createNewFile()
             File("${it.projectName}/build-logic/convention/build.gradle.kts").writeText(
-                CompositeBuildBuildGradle().get(
-                    versions
-                )
+                CompositeBuildBuildGradle().get(versions, requested)
             )
         }
     }