plugin changes

Author: efraespada

src/main/kotlin/StringCare.kt

@@ -22,19 +22,22 @@ class StringCare : Plugin<Project> {
             extension.modules.forEach { module ->
                 when {
                     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)
+                        moduleMap[module.name!!] = Configuration(module.name).apply {
+                            stringFiles.addAll(module.stringFiles)
+                            srcFolders.addAll(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)
+                        moduleMap[module.name!!] = Configuration(module.name).apply {
+                            stringFiles.addAll(defaultConfig().stringFiles)
+                            srcFolders.addAll(module.srcFolders)
+                        }
                     }
                     module.stringFiles.isNotEmpty() -> {
-                        moduleMap[module.name!!] = Configuration(module.name)
-                        moduleMap[module.name!!]?.stringFiles?.addAll(module.stringFiles)
-                        moduleMap[module.name!!]?.srcFolders?.addAll(defaultConfig().srcFolders)
+                        moduleMap[module.name!!] = Configuration(module.name).apply {
+                            stringFiles.addAll(module.stringFiles)
+                            srcFolders.addAll(defaultConfig().srcFolders)
+                        }
                     }
                 }
             }

src/main/kotlin/components/Tasks.kt

@@ -8,4 +8,9 @@ internal fun signingReportTask(): String = "${when (getOs()) {
 internal fun gradleWrapper(): String = when (getOs()) {
     Os.WINDOWS -> wrapperWindows
     Os.OSX -> wrapperOsX
-}
+}
+
+internal fun pluginBuildTask(): String = "${when (getOs()) {
+    Os.WINDOWS -> wrapperWindows
+    Os.OSX -> wrapperOsX
+}} build -d --exclude-task test"

src/test/kotlin/SCTest.kt

@@ -8,7 +8,6 @@ class SCTest {
 
     private val logger by logger()
 
-    private val buildSuccess = "KotlinSample"
     private val projectName = "KotlinSample"
     private val mainModule = "app"
     private val mainModuleTest = "$projectName${File.separator}$mainModule"
@@ -178,4 +177,11 @@ class SCTest {
         }
     }
 
+    @Test
+    fun `12 - (PLUGIN COMPILATION) plugin with no test`() {
+        pluginBuildTask().runCommand { _, report ->
+            assert(report.contains("BUILD SUCCESSFUL"))
+        }
+    }
+
 }