Skip to content

Commit 37e775b

Browse files
authored
Merge pull request #4 from cdsap/fix_inorrect_setup_project_whenjvm
fix incorrect setup project when jvm
2 parents 8b01867 + ddc7a14 commit 37e775b

1 file changed

Lines changed: 17 additions & 3 deletions

File tree

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

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,16 @@ class ConventionPluginWriter(
4343
}
4444

4545
private fun createPlugin(languages: List<LanguageAttributes>) {
46-
val plugin = CompositeBuildPlugin1().get()
46+
createPluginJvm(languages)
47+
if (requested == TypeProjectRequested.ANDROID) {
48+
createPluginAndroid(languages)
49+
}
50+
}
51+
52+
private fun createPluginAndroid(languages: List<LanguageAttributes>) {
4753
val pluginAndroidLib = CompositeBuildPluginAndroidLib().get()
4854
val pluginAndroidApp = CompositeBuildPluginAndroidApp().get()
4955
languages.forEach {
50-
File("${it.projectName}/build-logic/convention/src/main/kotlin/com/logic/Plugin1.kt").createNewFile()
51-
File("${it.projectName}/build-logic/convention/src/main/kotlin/com/logic/Plugin1.kt").writeText(plugin)
5256
File("${it.projectName}/build-logic/convention/src/main/kotlin/com/logic/CompositeBuildPluginAndroidApp.kt").createNewFile()
5357
File("${it.projectName}/build-logic/convention/src/main/kotlin/com/logic/CompositeBuildPluginAndroidApp.kt").writeText(
5458
pluginAndroidApp
@@ -59,4 +63,14 @@ class ConventionPluginWriter(
5963
)
6064
}
6165
}
66+
67+
private fun createPluginJvm(languages: List<LanguageAttributes>) {
68+
val plugin = CompositeBuildPlugin1().get()
69+
languages.forEach {
70+
File("${it.projectName}/build-logic/convention/src/main/kotlin/com/logic/Plugin1.kt").createNewFile()
71+
File("${it.projectName}/build-logic/convention/src/main/kotlin/com/logic/Plugin1.kt").writeText(plugin)
72+
}
73+
74+
}
6275
}
76+

0 commit comments

Comments
 (0)