Use custom resource directories for font variants

The font files are now downloaded to the build directory and directly used from there.
tclement0922 · Oct 19, 2024 · 25d63dc · 25d63dc
1 parent 028b514
commit 25d63dc
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 14 deletions.
diff --git a/font-fa/.gitignore b/font-fa/.gitignore
@@ -1,3 +1,2 @@
 /build
-/*/build
-*.otf
+/*/build
diff --git a/font-fa/build.gradle.kts b/font-fa/build.gradle.kts
@@ -55,7 +55,7 @@ val downloadFiles by tasks.creating(Download::class) {
         path = if (name.endsWith(".json")) {
             "build/icons.json"
         } else {
-            fonts[name] + "/src/commonMain/composeResources/font/fontawesome_${fonts[name]}.otf"
+            "${fonts[name]}/build/composeResources/font/fontawesome_${fonts[name]}.otf"
         }
     }
     overwrite(false)
@@ -120,10 +120,6 @@ val createFAFile by tasks.creating(Task::class) {
     }
 }
 
-tasks.clean {
-    delete.add(downloadFiles.outputs.files)
-}
-
 childProjects.forEach { (_, child) ->
     child.afterEvaluate {
         child.tasks.named("copyNonXmlValueResourcesForCommonMain") { dependsOn(downloadFiles) }

diff --git a/font-symbols/.gitignore b/font-symbols/.gitignore
@@ -1,3 +1,2 @@
 /build
-/*/build
-*.ttf
+/*/build
diff --git a/font-symbols/build.gradle.kts b/font-symbols/build.gradle.kts
@@ -62,7 +62,7 @@ val downloadFiles by tasks.creating(Download::class) {
             "build/$name"
         } else {
             val variant = fonts[name.removeSuffix(".ttf")]
-            "$variant/src/commonMain/composeResources/font/material_symbols_$variant.ttf"
+            "$variant/build/composeResources/font/material_symbols_$variant.ttf"
         }
     }
     overwrite(false)
@@ -137,10 +137,6 @@ val createSymbolsFile by tasks.creating(Task::class) {
     }
 }
 
-tasks.clean {
-    delete.add(downloadFiles.outputs.files)
-}
-
 childProjects.forEach { (_, child) ->
     child.afterEvaluate {
         child.tasks.named("copyNonXmlValueResourcesForCommonMain") { dependsOn(downloadFiles) }

diff --git a/plugins/src/main/kotlin/dev/tclement/fonticons/FAVariant.kt b/plugins/src/main/kotlin/dev/tclement/fonticons/FAVariant.kt
@@ -26,8 +26,11 @@ import org.gradle.api.provider.Property
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.OutputDirectory
 import org.gradle.api.tasks.TaskAction
+import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.create
 import org.gradle.kotlin.dsl.support.uppercaseFirstChar
+import org.jetbrains.compose.ComposeExtension
+import org.jetbrains.compose.resources.ResourcesExtension
 import org.jetbrains.kotlin.gradle.dsl.kotlinExtension
 
 private const val TARGET_PACKAGE = "dev.tclement.fonticons.fa"
@@ -81,4 +84,10 @@ fun Project.setupSourcesForFAVariant(variant: String) {
     kotlinExtension.sourceSets.named("commonMain") {
         kotlin.srcDir(createFAVariantFiles.output)
     }
+
+    configure<ComposeExtension> {
+        configure<ResourcesExtension> {
+            customDirectory("commonMain", project.layout.buildDirectory.dir("composeResources"))
+        }
+    }
 }
diff --git a/plugins/src/main/kotlin/dev/tclement/fonticons/SymbolsVariant.kt b/plugins/src/main/kotlin/dev/tclement/fonticons/SymbolsVariant.kt
@@ -24,8 +24,11 @@ import org.gradle.api.provider.Property
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.OutputDirectory
 import org.gradle.api.tasks.TaskAction
+import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.create
 import org.gradle.kotlin.dsl.support.uppercaseFirstChar
+import org.jetbrains.compose.ComposeExtension
+import org.jetbrains.compose.resources.ResourcesExtension
 import org.jetbrains.kotlin.gradle.dsl.kotlinExtension
 
 private const val TARGET_PACKAGE = "dev.tclement.fonticons.symbols"
@@ -161,4 +164,10 @@ fun Project.setupSourcesForSymbolsVariant(variant: String) {
     kotlinExtension.sourceSets.named("androidMain") {
         kotlin.srcDir(createSymbolsVariantFiles.androidOutput)
     }
+
+    configure<ComposeExtension> {
+        configure<ResourcesExtension> {
+            customDirectory("commonMain", project.layout.buildDirectory.dir("composeResources"))
+        }
+    }
 }