Don't lint generated source files

Ashuyomi · Feb 7, 2021 · 473a1fb · 473a1fb
1 parent 68db37b
commit 473a1fb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/common.gradle b/common.gradle
@@ -58,5 +58,9 @@ repositories {
 
 apply from: "$rootDir/common-dependencies.gradle"
 
+lintKotlinMain {
+    exclude 'generated-src/**/*.kt'
+}
+
 preBuild.dependsOn(lintKotlin)
 lintKotlin.dependsOn(formatKotlin)
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/ThemeSourceGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/ThemeSourceGenerator.kt
@@ -106,8 +106,8 @@ interface ThemeSourceGenerator {
             val themeSrcPath = "$userDir/multisrc/src/main/java/${themeSuffix(themePkg, "/")}"
             val themeSrcFile = File(themeSrcPath)
             val themeDestPath = "$projectRootPath/src/${themeSuffix(themePkg, "/")}"
-            val themeDestFile = File(themeDestPath)
 
+            val themeDestFile = File(themeDestPath)
             themeDestFile.mkdirs()
 
             themeSrcFile.list()!!
@@ -147,7 +147,7 @@ interface ThemeSourceGenerator {
                         """.trimIndent()
                     }
                     is ThemeSourceData.MultiLang -> {
-                        val sourceClasses = source.lang.mapIndexed { index, lang ->
+                        val sourceClasses = source.langs.mapIndexed { index, lang ->
                             val indexedClassName = "$themeClass${index}"
                             indexedClassName to """$indexedClassName : $themeClass("${source.name}", "${source.baseUrl}", "$lang") {
                                 override val versionId = ${source.versionId}
@@ -168,7 +168,7 @@ interface ThemeSourceGenerator {
             }
 
             File("$classPath/${source.className}.kt").writeText("""
-                // THIS FILE IS AUTO-GENERATED; DO NOT EDIT???
+                // THIS FILE IS AUTO-GENERATED; DO NOT EDIT
                 package eu.kanade.tachiyomi.extension.${pkgNameSuffix(source, ".")}
 
                 import eu.kanade.tachiyomi.multisrc.$themePkg.$themeClass
@@ -181,7 +181,7 @@ interface ThemeSourceGenerator {
         }
 
         private fun cleanDirectory(dir: File) {
-            for (file in dir.listFiles()!!) {
+            dir.listFiles()?.forEach { file ->
                 if (file.isDirectory) cleanDirectory(file)
                 file.delete()
             }
@@ -212,20 +212,20 @@ sealed class ThemeSourceData {
         override val baseUrl: String,
         val lang: String,
         override val isNsfw: Boolean = false,
+        override val versionId: Int = 1,
         override val className: String = name.replace(" ", ""),
         override val pkgName: String = className.toLowerCase(Locale.ENGLISH),
-        override val versionId: Int = 1,
         override val overrideVersionCode: Int = 0,
     ) : ThemeSourceData()
 
     data class MultiLang(
         override val name: String,
         override val baseUrl: String,
-        val lang: List<String>,
+        val langs: List<String>,
         override val isNsfw: Boolean = false,
+        override val versionId: Int = 1,
         override val className: String = name.replace(" ", "") + "Factory",
         override val pkgName: String = className.substringBefore("Factory").toLowerCase(Locale.ENGLISH),
-        override val versionId: Int = 1,
         override val overrideVersionCode: Int = 0,
     ) : ThemeSourceData()
 }