warnings

Author: efraespada

src/main/kotlin/StringCare.kt

@@ -21,16 +21,20 @@ class StringCare : Plugin<Project> {
         this.project.afterEvaluate {
             extension.modules.forEach { module ->
                 when {
-                    module.stringFiles != null && module.srcFolders != null -> {
-                        moduleMap[module.name!!] = Configuration(module.name, module.stringFiles, module.srcFolders)
+                    module.stringFiles.isNotEmpty() && module.srcFolders.isNotEmpty() -> {
+                        moduleMap[module.name!!] = Configuration(module.name)
+                        moduleMap[module.name!!]?.stringFiles?.addAll(module.stringFiles)
+                        moduleMap[module.name!!]?.srcFolders?.addAll(module.srcFolders)
                     }
-                    module.srcFolders != null -> {
-                        moduleMap[module.name!!] =
-                            Configuration(module.name, defaultConfig().stringFiles, module.srcFolders)
+                    module.srcFolders.isNotEmpty() -> {
+                        moduleMap[module.name!!] = Configuration(module.name)
+                        moduleMap[module.name!!]?.stringFiles?.addAll(defaultConfig().stringFiles)
+                        moduleMap[module.name!!]?.srcFolders?.addAll(module.srcFolders)
                     }
-                    module.stringFiles != null -> {
-                        moduleMap[module.name!!] =
-                            Configuration(module.name, module.stringFiles, defaultConfig().srcFolders)
+                    module.stringFiles.isNotEmpty() -> {
+                        moduleMap[module.name!!] = Configuration(module.name)
+                        moduleMap[module.name!!]?.stringFiles?.addAll(module.stringFiles)
+                        moduleMap[module.name!!]?.srcFolders?.addAll(defaultConfig().srcFolders)
                     }
                 }
             }

src/main/kotlin/components/Extensions.kt

@@ -4,7 +4,6 @@ import groovy.json.StringEscapeUtils
 import models.Configuration
 import models.Extension
 import models.ResourceFile
-import org.gradle.api.NamedDomainObjectContainer
 import org.gradle.api.Project
 import org.gradle.api.Task
 import org.w3c.dom.Document
@@ -30,7 +29,7 @@ fun File.validForConfiguration(configuration: Configuration): Boolean {
             && !this.absolutePath.contains("/$resourceBackup/")
     if (valid) {
         valid = false
-        configuration.srcFolders?.forEach { folder ->
+        configuration.srcFolders.forEach { folder ->
             if (this.absolutePath.contains("/$folder/".replace("//", "/"))
                 && !this.absolutePath.contains("/$resourceBackup/")
             ) {
@@ -40,7 +39,7 @@ fun File.validForConfiguration(configuration: Configuration): Boolean {
     }
     if (valid) {
         valid = false
-        configuration.stringFiles?.forEach { file ->
+        configuration.stringFiles.forEach { file ->
             if (this.absolutePath.contains("/$file".replace("//", "/"))) {
                 valid = true
             }
@@ -53,7 +52,7 @@ fun File.resourceFile(configuration: Configuration): ResourceFile? {
     var sourceFolder = ""
     var validFile: File? = null
     var valid = false
-    configuration.srcFolders?.forEach { folder ->
+    configuration.srcFolders.forEach { folder ->
         if (this.absolutePath.contains("/$folder/".replace("//", "/"))
             && !this.absolutePath.contains("/$resourceBackup/")
         ) {
@@ -63,7 +62,7 @@ fun File.resourceFile(configuration: Configuration): ResourceFile? {
     }
     if (valid) {
         valid = false
-        configuration.stringFiles?.forEach { file ->
+        configuration.stringFiles.forEach { file ->
             if (this.absolutePath.contains("/$file".replace("//", "/"))) {
                 valid = true
                 validFile = this
@@ -87,7 +86,10 @@ fun Project.createExtension(): Extension {
 fun Process.outputString() = this.inputStream.bufferedReader().use { it.readText() }
 
 fun defaultConfig(): Configuration {
-    return Configuration("app", listOf("strings.xml"), listOf("src${File.separator}main"))
+    return Configuration("app").apply {
+        stringFiles.add("strings.xml")
+        srcFolders.add("src${File.separator}main")
+    }
 }
 
 fun ResourceFile.backup(projectPath: String): File {

src/main/kotlin/components/Stark.kt

@@ -17,11 +17,10 @@ class Stark {
             // val path = (Stark::class.java.protectionDomain.codeSource.location.toURI()).path
             val inputStream = Stark::class.java.getResourceAsStream(name)
             val buffer = ByteArray(1024)
-            var read = -1
             val temp = File.createTempFile(name, "")
             val fos = FileOutputStream(temp)
 
-            read = inputStream.read(buffer)
+            var read = inputStream.read(buffer)
             while (read != -1) {
                 fos.write(buffer, 0, read)
                 read = inputStream.read(buffer)

src/main/kotlin/models/Configuration.kt

@@ -1,3 +1,6 @@
 package models
 
-class Configuration(var name: String?, val stringFiles: List<String>?, val srcFolders: List<String>?)
+class Configuration(var name: String?) {
+    val stringFiles = mutableListOf<String>()
+    val srcFolders = mutableListOf<String>()
+}