Fixed modular projects initialization

pearxteam · Apr 10, 2019 · 2d8e88a · 2d8e88a
1 parent bf2a553
commit 2d8e88a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
-projectVersion=1.4.1
+projectVersion=1.4.2
 projectDescription=A Gradle plugin that simplifies the creation of %type% multiplatform Kotlin projects.
-projectChangelog=JS unit testing task will be skipped if there are no tests in the project
+projectChangelog=Fixed modular projects initializitaion
 
 nodeVersion=1.3.1
 kotlinVersion=1.3.21

diff --git a/src/main/kotlin/ru/pearx/multigradle/plugin/modular/MultiGradleModularSettings.kt b/src/main/kotlin/ru/pearx/multigradle/plugin/modular/MultiGradleModularSettings.kt
@@ -18,11 +18,11 @@ class MultiGradleModularSettings : Plugin<Settings> {
     override fun apply(target: Settings) {
         with(target) {
             val root = rootDir.toPath()
-            for (subPath in Files.newDirectoryStream(root.resolve("modules"))) {
-                if (Files.isDirectory(subPath)) {
-                    val proj = ":modules:${subPath.fileName}:${rootProject.name}-${subPath.fileName}"
+            for (modulePath in Files.newDirectoryStream(root.resolve("modules"))) {
+                if (Files.isDirectory(modulePath)) {
+                    val proj = ":modules:${rootProject.name}-${modulePath.fileName}"
                     include(proj)
-                    val projDir = subPath.toFile()
+                    val projDir = modulePath.toFile()
                     project(proj).projectDir = projDir
                     projDir.mkdirs()
                 }