#48 nested modules resources

gradle-plugin/src/main/kotlin/dev/icerock/gradle/MultiplatformResourcesPlugin.kt

@@ -7,16 +7,17 @@ package dev.icerock.gradle
 import com.android.build.gradle.LibraryExtension
 import com.android.build.gradle.LibraryPlugin
 import com.android.build.gradle.api.AndroidSourceSet
-import dev.icerock.gradle.generator.AndroidMRGenerator
-import dev.icerock.gradle.generator.CommonMRGenerator
-import dev.icerock.gradle.generator.IosMRGenerator
+import dev.icerock.gradle.generator.FontsGenerator
+import dev.icerock.gradle.generator.GenerateMultiplatformResourcesTask
+import dev.icerock.gradle.generator.ImagesGenerator
 import dev.icerock.gradle.generator.MRGenerator
+import dev.icerock.gradle.generator.PluralsGenerator
 import dev.icerock.gradle.generator.ResourceGeneratorFeature
 import dev.icerock.gradle.generator.SourceInfo
-import dev.icerock.gradle.generator.fonts.FontsGeneratorFeature
-import dev.icerock.gradle.generator.image.ImagesGeneratorFeature
-import dev.icerock.gradle.generator.plurals.PluralsGeneratorFeature
-import dev.icerock.gradle.generator.strings.StringsGeneratorFeature
+import dev.icerock.gradle.generator.StringsGenerator
+import dev.icerock.gradle.generator.android.AndroidMRGenerator
+import dev.icerock.gradle.generator.common.CommonMRGenerator
+import dev.icerock.gradle.generator.ios.IosMRGenerator
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.tasks.SourceSet
@@ -79,17 +80,23 @@ class MultiplatformResourcesPlugin : Plugin<Project> {
             mrExtension.multiplatformResourcesPackage!!,
             androidPackage
         )
+        val iosLocalizationRegion = mrExtension.iosBaseLocalizationRegion
         val features = listOf(
-            StringsGeneratorFeature(sourceInfo, mrExtension.iosBaseLocalizationRegion),
-            PluralsGeneratorFeature(sourceInfo, mrExtension.iosBaseLocalizationRegion),
-            ImagesGeneratorFeature(sourceInfo),
-            FontsGeneratorFeature(sourceInfo)
+            StringsGenerator.Feature(sourceInfo, iosLocalizationRegion),
+            PluralsGenerator.Feature(sourceInfo, iosLocalizationRegion),
+            ImagesGenerator.Feature(sourceInfo),
+            FontsGenerator.Feature(sourceInfo)
         )
         val targets: List<KotlinTarget> = multiplatformExtension.targets.toList()
 
         setupCommonGenerator(commonSourceSet, generatedDir, mrClassPackage, features, target)
         setupAndroidGenerator(targets, androidMainSourceSet, generatedDir, mrClassPackage, features, target)
-        setupIosGenerator(targets, generatedDir, mrClassPackage, features, target)
+        setupIosGenerator(targets, generatedDir, mrClassPackage, features, target, iosLocalizationRegion)
+
+        val generationTasks = target.tasks.filterIsInstance<GenerateMultiplatformResourcesTask>()
+        val commonGenerationTask = generationTasks.first { it.name == "generateMRcommonMain" }
+        generationTasks.filter { it != commonGenerationTask }
+            .forEach { it.dependsOn(commonGenerationTask) }
     }
 
     private fun setupCommonGenerator(
@@ -132,12 +139,14 @@ class MultiplatformResourcesPlugin : Plugin<Project> {
         ).apply(target)
     }
 
+    @Suppress("LongParameterList")
     private fun setupIosGenerator(
         targets: List<KotlinTarget>,
         generatedDir: File,
         mrClassPackage: String,
         features: List<ResourceGeneratorFeature>,
-        target: Project
+        target: Project,
+        iosLocalizationRegion: String
     ) {
         val compilations = targets
             .filterIsInstance<KotlinNativeTarget>()
@@ -158,7 +167,8 @@ class MultiplatformResourcesPlugin : Plugin<Project> {
                 sourceSet,
                 mrClassPackage,
                 generators = features.map { it.createIosGenerator() },
-                compilation = compilation
+                compilation = compilation,
+                baseLocalizationRegion = iosLocalizationRegion
             ).apply(target)
         }
     }

gradle-plugin/src/main/kotlin/dev/icerock/gradle/generator/BaseGenerator.kt

@@ -9,8 +9,6 @@ import com.squareup.kotlinpoet.CodeBlock
 import com.squareup.kotlinpoet.KModifier
 import com.squareup.kotlinpoet.PropertySpec
 import com.squareup.kotlinpoet.TypeSpec
-import dev.icerock.gradle.generator.strings.KeyType
-import dev.icerock.gradle.generator.strings.LanguageType
 import java.io.File
 
 abstract class BaseGenerator<T> : MRGenerator.Generator {

gradle-plugin/src/main/kotlin/dev/icerock/gradle/generator/strings/EqualStringKeysException.kt → gradle-plugin/src/main/kotlin/dev/icerock/gradle/generator/EqualStringKeysException.kt

@@ -2,7 +2,7 @@
  * Copyright 2020 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
  */
 
-package dev.icerock.gradle.generator.strings
+package dev.icerock.gradle.generator
 
 class EqualStringKeysException(
     val keys: List<String>

gradle-plugin/src/main/kotlin/dev/icerock/gradle/generator/fonts/FontsGenerator.kt → gradle-plugin/src/main/kotlin/dev/icerock/gradle/generator/FontsGenerator.kt

@@ -2,14 +2,16 @@
  * Copyright 2020 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
  */
 
-package dev.icerock.gradle.generator.fonts
+package dev.icerock.gradle.generator
 
 import com.squareup.kotlinpoet.ClassName
 import com.squareup.kotlinpoet.CodeBlock
 import com.squareup.kotlinpoet.KModifier
 import com.squareup.kotlinpoet.PropertySpec
 import com.squareup.kotlinpoet.TypeSpec
-import dev.icerock.gradle.generator.MRGenerator
+import dev.icerock.gradle.generator.android.AndroidFontsGenerator
+import dev.icerock.gradle.generator.common.CommonFontsGenerator
+import dev.icerock.gradle.generator.ios.IosFontsGenerator
 import org.gradle.api.file.FileTree
 import java.io.File
 
@@ -22,7 +24,10 @@ abstract class FontsGenerator(
     override fun generate(resourcesGenerationDir: File): TypeSpec {
         val typeSpec = createTypeSpec(inputFileTree.map { it.nameWithoutExtension }.sorted())
         generateResources(resourcesGenerationDir, inputFileTree.map {
-            FontFile(key = it.nameWithoutExtension, file = it)
+            FontFile(
+                key = it.nameWithoutExtension,
+                file = it
+            )
         })
         return typeSpec
     }
@@ -98,4 +103,25 @@ abstract class FontsGenerator(
         val key: String,
         val file: File
     )
+
+    class Feature(private val info: SourceInfo) : ResourceGeneratorFeature {
+        private val stringsFileTree = info.commonResources.matching {
+            include("MR/fonts/**.ttf")
+        }
+
+        override fun createCommonGenerator(): MRGenerator.Generator {
+            return CommonFontsGenerator(stringsFileTree)
+        }
+
+        override fun createIosGenerator(): MRGenerator.Generator {
+            return IosFontsGenerator(stringsFileTree)
+        }
+
+        override fun createAndroidGenerator(): MRGenerator.Generator {
+            return AndroidFontsGenerator(
+                stringsFileTree,
+                info.androidRClassPackage
+            )
+        }
+    }
 }

gradle-plugin/src/main/kotlin/dev/icerock/gradle/generator/GenerateMultiplatformResourcesTask.kt

@@ -0,0 +1,13 @@
+/*
+ * Copyright 2020 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package dev.icerock.gradle.generator
+
+import org.gradle.api.DefaultTask
+
+open class GenerateMultiplatformResourcesTask : DefaultTask() {
+    init {
+        group = "multiplatform"
+    }
+}

gradle-plugin/src/main/kotlin/dev/icerock/gradle/generator/image/ImagesGenerator.kt → gradle-plugin/src/main/kotlin/dev/icerock/gradle/generator/ImagesGenerator.kt

@@ -1,15 +1,17 @@
 /*
- * Copyright 2019 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright 2020 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
  */
 
-package dev.icerock.gradle.generator.image
+package dev.icerock.gradle.generator
 
 import com.squareup.kotlinpoet.ClassName
 import com.squareup.kotlinpoet.CodeBlock
 import com.squareup.kotlinpoet.KModifier
 import com.squareup.kotlinpoet.PropertySpec
 import com.squareup.kotlinpoet.TypeSpec
-import dev.icerock.gradle.generator.MRGenerator
+import dev.icerock.gradle.generator.android.AndroidImagesGenerator
+import dev.icerock.gradle.generator.common.CommonImagesGenerator
+import dev.icerock.gradle.generator.ios.IosImagesGenerator
 import org.gradle.api.file.FileTree
 import java.io.File
 
@@ -60,4 +62,25 @@ abstract class ImagesGenerator(
     abstract fun getPropertyModifiers(): Array<KModifier>
 
     abstract fun getPropertyInitializer(key: String): CodeBlock?
+
+    class Feature(private val info: SourceInfo) : ResourceGeneratorFeature {
+        private val stringsFileTree = info.commonResources.matching {
+            include("MR/images/**/*.png", "MR/images/**/*.jpg")
+        }
+
+        override fun createCommonGenerator(): MRGenerator.Generator {
+            return CommonImagesGenerator(stringsFileTree)
+        }
+
+        override fun createIosGenerator(): MRGenerator.Generator {
+            return IosImagesGenerator(stringsFileTree)
+        }
+
+        override fun createAndroidGenerator(): MRGenerator.Generator {
+            return AndroidImagesGenerator(
+                stringsFileTree,
+                info.androidRClassPackage
+            )
+        }
+    }
 }

gradle-plugin/src/main/kotlin/dev/icerock/gradle/generator/MRGenerator.kt

@@ -15,7 +15,7 @@ import java.io.File
 abstract class MRGenerator(
     generatedDir: File,
     protected val sourceSet: SourceSet,
-    private val mrClassPackage: String,
+    protected val mrClassPackage: String,
     private val generators: List<Generator>
 ) {
     private val sourcesGenerationDir = File(generatedDir, "${sourceSet.name}/src")
@@ -60,9 +60,7 @@ abstract class MRGenerator(
         val genTaskName = "generateMR$name"
         val genTask = runCatching {
             project.tasks.getByName(genTaskName)
-        }.getOrNull() ?: project.task(genTaskName) {
-            group = "multiplatform"
-
+        }.getOrNull() ?: project.tasks.create(genTaskName, GenerateMultiplatformResourcesTask::class.java) {
             doLast {
                 this@MRGenerator.generate()
             }