Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add boolean property to allow webp format export #757

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Add boolean property to allow webp format export #757

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4fefda5
Merge pull request #756 from icerockdev/develop
Alex009 Aug 23, 2024
8a1baf5
Add boolean property to allow webp format export
Aug 26, 2024
dd81d53
Put the prperty optional
Aug 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ...ces-generator/src/main/kotlin/dev/icerock/gradle/MultiplatformResourcesPluginExtension.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ abstract class MultiplatformResourcesPluginExtension {
abstract val resourcesVisibility: Property<MRVisibility>
abstract val iosMinimalDeploymentTarget: Property<String>
abstract val resourcesSourceSets: NamedDomainObjectContainer<SourceDirectorySet>
abstract val allowWebpImageFormat: Property<Boolean>

fun Project.configureCopyXCFrameworkResources(xcFrameworkName: String = name) {
NativeBuildType.values()
Expand All @@ -35,4 +36,5 @@ internal fun MultiplatformResourcesPluginExtension.setupConvention(project: Proj
iosBaseLocalizationRegion.convention("en")
resourcesVisibility.convention(MRVisibility.Public)
iosMinimalDeploymentTarget.convention("9.0")
allowWebpImageFormat.convention(false)
}
7 changes: 6 additions & 1 deletion ...s-generator/src/main/kotlin/dev/icerock/gradle/generator/factory/ImageGeneratorFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ internal class ImageGeneratorFactory(
private val outputAssetsDir: File,
private val kotlinPlatformType: KotlinPlatformType,
private val kotlinKonanTarget: () -> KonanTarget,
private val allowWebpImageFormat: Boolean,
private val androidRClassPackage: () -> String,
private val logger: Logger
) {
Expand All @@ -44,7 +45,11 @@ internal class ImageGeneratorFactory(
generator = ImageResourceGenerator(),
platformResourceGenerator = createPlatformImageGenerator(),
filter = {
include("images/**/*.png", "images/**/*.jpg", "images/**/*.svg")
val formats = mutableListOf("images/**/*.png", "images/**/*.jpg", "images/**/*.svg")
if (allowWebpImageFormat) {
formats.add("images/**/*.webp")
}
Comment on lines +49 to +51
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if it will be allowed - how it will works on platforms? sample should be added in resources-gallery and compose-resources-gallery samples

include(formats)
}
)
}
Expand Down
7 changes: 6 additions & 1 deletion ...-generator/src/main/kotlin/dev/icerock/gradle/tasks/GenerateMultiplatformResourcesTask.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,10 @@ abstract class GenerateMultiplatformResourcesTask : DefaultTask() {
@get:Input
abstract val strictLineBreaks: Property<Boolean>

@get:Optional
@get:Input
abstract val allowWebpImageFormat: Property<Boolean>

@get:Optional
@get:PathSensitive(PathSensitivity.RELATIVE)
@get:InputFiles
Expand Down Expand Up @@ -229,8 +233,9 @@ abstract class GenerateMultiplatformResourcesTask : DefaultTask() {
outputAssetsDir = outputAssetsDir.get().asFile,
kotlinPlatformType = kotlinPlatformType,
kotlinKonanTarget = ::kotlinKonanTarget,
allowWebpImageFormat = allowWebpImageFormat.get(),
androidRClassPackage = androidRClassPackage::get,
logger = logger
logger = logger,
).create(),
ColorGeneratorFactory(
resourcesVisibility = resourcesVisibility.get(),
Expand Down
Loading