#535 fix apple targets for colors and image generators

icerockdev · Dec 21, 2023 · 3239efc · 3239efc
1 parent ec6de52
commit 3239efc
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 15 deletions.
diff --git a/resources-generator/src/main/kotlin/dev/icerock/gradle/generator/ColorsGenerator.kt b/resources-generator/src/main/kotlin/dev/icerock/gradle/generator/ColorsGenerator.kt
@@ -110,7 +110,13 @@ abstract class ColorsGenerator(
             generatedProperties.add(generatedProperty)
         }
 
-        generateResources(project, resourcesGenerationDir, allColors)
+        generateResources(
+            project = project,
+            assetsGenerationDir = assetsGenerationDir,
+            resourcesGenerationDir = resourcesGenerationDir,
+            colors = allColors
+        )
+
         extendObjectBodyAtEnd(objectBuilder)
 
         return if (generatedProperties.isNotEmpty()) {
@@ -154,6 +160,7 @@ abstract class ColorsGenerator(
 
     protected open fun generateResources(
         project: Project,
+        assetsGenerationDir: File,
         resourcesGenerationDir: File,
         colors: List<ColorNode>,
     ) = Unit

diff --git a/resources-generator/src/main/kotlin/dev/icerock/gradle/generator/FontsGenerator.kt b/resources-generator/src/main/kotlin/dev/icerock/gradle/generator/FontsGenerator.kt
@@ -71,7 +71,6 @@ abstract class FontsGenerator(
         beforeGenerateResources(objectBuilder, allFontFiles)
 
         val typeSpec = createTypeSpec(
-            project = project,
             inputMetadata = inputMetadata,
             generatedObjects = generatedObjects,
             targetObject = targetObject,
@@ -123,7 +122,6 @@ abstract class FontsGenerator(
     @param keys: names of files like anastasia-regular.ttf
      */
     private fun createTypeSpec(
-        project: Project,
         inputMetadata: MutableList<GeneratedObject>,
         generatedObjects: MutableList<GeneratedObject>,
         targetObject: GeneratedObject,
@@ -161,7 +159,6 @@ abstract class FontsGenerator(
 
             var generatedProperty = GeneratedProperty(
                 modifier = addObjectActualOverrideModifier(
-                    project = project,
                     propertyName = propertyName,
                     property = property,
                     inputMetadata = inputMetadata,
@@ -216,7 +213,6 @@ abstract class FontsGenerator(
     }
 
     private fun addObjectActualOverrideModifier(
-        project: Project,
         propertyName: String,
         property: TypeSpec.Builder,
         inputMetadata: List<GeneratedObject>,

diff --git a/resources-generator/src/main/kotlin/dev/icerock/gradle/generator/ImagesGenerator.kt b/resources-generator/src/main/kotlin/dev/icerock/gradle/generator/ImagesGenerator.kt
@@ -82,6 +82,7 @@ abstract class ImagesGenerator(
         )
 
         generateResources(
+            assetsGenerationDir = assetsGenerationDir,
             resourcesGenerationDir = resourcesGenerationDir,
             keyFileMap = allImagesMap.mapKeys { (key, _) ->
                 key.substringBeforeLast(".") // Remove file extension from keys
@@ -233,14 +234,13 @@ abstract class ImagesGenerator(
     protected open fun beforeGenerateResources(
         objectBuilder: TypeSpec.Builder,
         keys: List<String>,
-    ) {
-    }
+    ) = Unit
 
     protected open fun generateResources(
+        assetsGenerationDir: File,
         resourcesGenerationDir: File,
         keyFileMap: Map<String, List<File>>,
-    ) {
-    }
+    ) = Unit
 
     abstract fun getClassModifiers(): Array<KModifier>
 
@@ -254,12 +254,10 @@ abstract class ImagesGenerator(
     ) : ResourceGeneratorFeature<ImagesGenerator> {
         override fun createCommonGenerator(): ImagesGenerator = CommonImagesGenerator(
             ownInputFileTree = settings.ownResourcesFileTree,
-            upperInputFileTree = settings.upperResourcesFileTree
         )
 
         override fun createAppleGenerator(): ImagesGenerator = AppleImagesGenerator(
             ownInputFileTree = settings.ownResourcesFileTree,
-            lowerInputFileTree = settings.lowerResourcesFileTree,
         )
 
         override fun createAndroidGenerator(): ImagesGenerator = AndroidImagesGenerator(

diff --git a/...-generator/src/main/kotlin/dev/icerock/gradle/generator/android/AndroidColorsGenerator.kt b/...-generator/src/main/kotlin/dev/icerock/gradle/generator/android/AndroidColorsGenerator.kt
@@ -27,6 +27,7 @@ class AndroidColorsGenerator(
 
     override fun generateResources(
         project: Project,
+        assetsGenerationDir: File,
         resourcesGenerationDir: File,
         colors: List<ColorNode>
     ) {

diff --git a/...-generator/src/main/kotlin/dev/icerock/gradle/generator/android/AndroidImagesGenerator.kt b/...-generator/src/main/kotlin/dev/icerock/gradle/generator/android/AndroidImagesGenerator.kt
@@ -41,6 +41,7 @@ class AndroidImagesGenerator(
     )
 
     override fun generateResources(
+        assetsGenerationDir: File,
         resourcesGenerationDir: File,
         keyFileMap: Map<String, List<File>>
     ) {

diff --git a/...rces-generator/src/main/kotlin/dev/icerock/gradle/generator/apple/AppleColorsGenerator.kt b/...rces-generator/src/main/kotlin/dev/icerock/gradle/generator/apple/AppleColorsGenerator.kt
@@ -34,10 +34,11 @@ class AppleColorsGenerator(
 
     override fun generateResources(
         project: Project,
+        assetsGenerationDir: File,
         resourcesGenerationDir: File,
         colors: List<ColorNode>
     ) {
-        val assetsDirectory = File(resourcesGenerationDir, ASSETS_DIR_NAME)
+        val assetsDirectory = File(assetsGenerationDir, ASSETS_DIR_NAME)
 
         colors.forEach { colorNode ->
             val assetDir = File(assetsDirectory, "${colorNode.name}.colorset")

diff --git a/...rces-generator/src/main/kotlin/dev/icerock/gradle/generator/apple/AppleImagesGenerator.kt b/...rces-generator/src/main/kotlin/dev/icerock/gradle/generator/apple/AppleImagesGenerator.kt
@@ -20,7 +20,6 @@ import java.io.File
 
 class AppleImagesGenerator(
     ownInputFileTree: FileTree,
-    lowerInputFileTree: FileTree,
 ) : ImagesGenerator(resourcesFileTree = ownInputFileTree), ObjectBodyExtendable by AppleGeneratorHelper() {
 
     override fun getClassModifiers(): Array<KModifier> = arrayOf(KModifier.ACTUAL)
@@ -35,10 +34,11 @@ class AppleImagesGenerator(
     }
 
     override fun generateResources(
+        assetsGenerationDir: File,
         resourcesGenerationDir: File,
         keyFileMap: Map<String, List<File>>
     ) {
-        val assetsDirectory = File(resourcesGenerationDir, ASSETS_DIR_NAME)
+        val assetsDirectory = File(assetsGenerationDir, ASSETS_DIR_NAME)
 
         keyFileMap.forEach { (key, files) ->
             val assetDir = File(assetsDirectory, "$key.imageset")

diff --git a/...or/src/main/kotlin/dev/icerock/gradle/generator/apple/action/PackResourcesToKLibAction.kt b/...or/src/main/kotlin/dev/icerock/gradle/generator/apple/action/PackResourcesToKLibAction.kt
@@ -7,6 +7,7 @@ package dev.icerock.gradle.generator.apple.action
 import dev.icerock.gradle.generator.apple.LoadableBundle
 import dev.icerock.gradle.utils.unzipTo
 import org.gradle.api.Action
+import org.gradle.api.GradleException
 import org.gradle.api.Task
 import org.gradle.api.provider.Provider
 import org.jetbrains.kotlin.gradle.tasks.KotlinNativeCompile
@@ -67,6 +68,7 @@ internal class PackResourcesToKLibAction(
             task.logger.error("can't compile assets - $result")
             task.logger.info(input)
             task.logger.error(errors)
+            throw GradleException("Assets compilation failed: $errors")
         } else {
             task.logger.info("assets compiled")
             assetsDirectory.deleteRecursively()

diff --git a/...es-generator/src/main/kotlin/dev/icerock/gradle/generator/common/CommonImagesGenerator.kt b/...es-generator/src/main/kotlin/dev/icerock/gradle/generator/common/CommonImagesGenerator.kt
@@ -13,7 +13,6 @@ import org.gradle.api.file.FileTree
 
 class CommonImagesGenerator(
     ownInputFileTree: FileTree,
-    upperInputFileTree: FileTree,
 ) : ImagesGenerator(ownInputFileTree), ObjectBodyExtendable by NOPObjectBodyExtendable() {
     override fun getClassModifiers(): Array<KModifier> = emptyArray()
 

diff --git a/resources-generator/src/main/kotlin/dev/icerock/gradle/generator/js/JsImagesGenerator.kt b/resources-generator/src/main/kotlin/dev/icerock/gradle/generator/js/JsImagesGenerator.kt
@@ -51,6 +51,7 @@ class JsImagesGenerator(
     }
 
     override fun generateResources(
+        assetsGenerationDir: File,
         resourcesGenerationDir: File,
         keyFileMap: Map<String, List<File>>
     ) {

diff --git a/resources-generator/src/main/kotlin/dev/icerock/gradle/generator/jvm/JvmImagesGenerator.kt b/resources-generator/src/main/kotlin/dev/icerock/gradle/generator/jvm/JvmImagesGenerator.kt
@@ -30,6 +30,7 @@ class JvmImagesGenerator(
         )
 
     override fun generateResources(
+        assetsGenerationDir: File,
         resourcesGenerationDir: File,
         keyFileMap: Map<String, List<File>>
     ) {