[skip ci] chore: Merge upstream changes (#1916)

multisrc/src/main/java/generator/ThemeSourceGenerator.kt

@@ -132,9 +132,9 @@ interface ThemeSourceGenerator {
             File(projectRootPath).let { projectRootFile ->
                 println("Generating $source")
 
-                projectRootFile.mkdirs()
                 // remove everything from past runs
-                cleanDirectory(projectRootFile)
+                projectRootFile.deleteRecursively()
+                projectRootFile.mkdirs()
 
                 writeGradle(projectGradleFile, source, themePkg, baseVersionCode, defaultAdditionalGradlePath, additionalGradleOverridePath)
                 writeAndroidManifest(projectAndroidManifestFile, manifestOverridePath, defaultAndroidManifestPath)
@@ -173,7 +173,7 @@ interface ThemeSourceGenerator {
 
             File(themeSrcPath).walk()
                 .map { it.toString().replace(themeSrcPath, "") }
-                .filter { it.endsWith(".kt") && !it.endsWith("Generator.kt") }
+                .filter { it.endsWith(".kt") && !it.endsWith("Generator.kt") && !it.endsWith("Gen.kt") }
                 .forEach {
                     File("$themeSrcPath/$it").copyTo(
                         File("$themeDestPath/$it"),
@@ -239,15 +239,6 @@ interface ThemeSourceGenerator {
                 """.trimMargin(),
             )
         }
-
-        private fun cleanDirectory(dir: File) {
-            dir.listFiles()?.forEach {
-                if (it.isDirectory) {
-                    cleanDirectory(it)
-                }
-                it.delete()
-            }
-        }
     }
 }