Skip to content

Ensure deterministic output #883

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

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

Ensure deterministic output #883

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
bd6c032
Merge pull request #873 from icerockdev/develop
Alex009 Apr 9, 2026
52d78e7
Merge pull request #877 from icerockdev/develop
Alex009 May 6, 2026
caa01eb
ensure deterministic output
bwitt Jul 8, 2026
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
7 changes: 6 additions & 1 deletion resources-generator/src/main/kotlin/dev/icerock/gradle/generator/ResourceTypeGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import dev.icerock.gradle.metadata.container.ResourceType
import dev.icerock.gradle.metadata.resource.ResourceMetadata
import dev.icerock.gradle.utils.filterClass
import org.gradle.api.tasks.util.PatternFilterable
import java.io.File
import kotlin.reflect.KClass

@Suppress("LongParameterList", "TooManyFunctions", "UnusedPrivateMember")
Expand All @@ -28,7 +29,11 @@ internal class ResourceTypeGenerator<T : ResourceMetadata>(
private val filter: PatternFilterable.() -> Unit,
) {
fun generateMetadata(files: ResourcesFiles): List<T> {
return generator.generateMetadata(files.matching(filter).ownSourceSet.fileTree.files)
// Sort for deterministic output; FileTree.files iteration is filesystem-dependent.
val sortedFiles: Set<File> = files.matching(filter).ownSourceSet.fileTree.files
.sortedBy { it.absolutePath }
.toCollection(LinkedHashSet())
return generator.generateMetadata(sortedFiles)
}

fun getImports(): List<ClassName> = platformResourceGenerator.imports()
Expand Down
4 changes: 2 additions & 2 deletions resources-generator/src/main/kotlin/dev/icerock/gradle/metadata/resource/ResourceMetadata.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ internal data class StringMetadata(
)

@Suppress("MagicNumber")
override fun contentHash(): String = values.hashCode().toString(16)
override fun contentHash(): String = values.toString().hashCode().toString(16)
}

@Serializable
Expand Down Expand Up @@ -94,7 +94,7 @@ internal data class PluralMetadata(
}

@Suppress("MagicNumber")
override fun contentHash(): String = values.hashCode().toString(16)
override fun contentHash(): String = values.toString().hashCode().toString(16)
}

@Serializable
Expand Down
9 changes: 6 additions & 3 deletions ...-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 @@ -155,9 +155,12 @@ abstract class GenerateMultiplatformResourcesTask : DefaultTask() {
)
val serializer: KSerializer<List<ContainerMetadata>> =
ListSerializer(ContainerMetadata.serializer())
val inputMetadata: List<ContainerMetadata> = inputMetadataFiles.files.flatMap { file ->
json.decodeFromString(serializer, file.readText())
}
// Sort for deterministic output.
val inputMetadata: List<ContainerMetadata> = inputMetadataFiles.files
.sortedBy { it.absolutePath }
.flatMap { file ->
json.decodeFromString(serializer, file.readText())
}

val outputMetadata: List<ContainerMetadata> = if (kotlinPlatformType.isCommon) {
generator.generateCommonKotlin(files, inputMetadata)
Expand Down
3 changes: 3 additions & 0 deletions resources-generator/src/main/kotlin/dev/icerock/gradle/utils/calcHash.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,11 @@ import java.io.InputStream
import java.io.SequenceInputStream

internal fun File.calculateResourcesHash(): String {
val root: File = this
// Sort for deterministic output; walkTopDown() order is filesystem-dependent.
val inputStreams: List<InputStream> = walkTopDown()
.filterNot { it.isDirectory }
.sortedBy { it.relativeTo(root).path }
.map { it.inputStream() }.toList()
val singleInputStream: InputStream = SequenceInputStream(inputStreams.toEnumeration())

Expand Down
Loading