diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/CompositeMetadataArtifact.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/CompositeMetadataArtifact.kt index 45d7159e86a..6c1d0385306 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/CompositeMetadataArtifact.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/CompositeMetadataArtifact.kt @@ -14,8 +14,7 @@ internal interface CompositeMetadataArtifact { val artifactContent: ArtifactContent val sourceSet: SourceSet val archiveExtension: String - val checksum: Int - val checksumString: String + val checksum: String /** * The proposed file-output path. diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/CompositeMetadataArtifactImpl.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/CompositeMetadataArtifactImpl.kt index ce5961d7d37..d62fe0592d5 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/CompositeMetadataArtifactImpl.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/CompositeMetadataArtifactImpl.kt @@ -108,12 +108,9 @@ internal class CompositeMetadataArtifactImpl( get() = kotlinProjectStructureMetadata.sourceSetBinaryLayout[sourceSet.sourceSetName]?.archiveExtension ?: SourceSetMetadataLayout.METADATA.archiveExtension - override val checksum: Int + override val checksum: String get() = artifactFile.checksum - override val checksumString: String - get() = artifactFile.checksumString - /** * Example: * org.jetbrains.sample-sampleLibrary-1.0.0-SNAPSHOT-appleAndLinuxMain-Vk5pxQ.klib @@ -125,7 +122,7 @@ internal class CompositeMetadataArtifactImpl( append("-") append(sourceSet.sourceSetName) append("-") - append(checksumString) + append(this@MetadataLibraryImpl.checksum) append(".") append(archiveExtension) }) @@ -154,12 +151,9 @@ internal class CompositeMetadataArtifactImpl( override val archiveExtension: String get() = SourceSetMetadataLayout.KLIB.archiveExtension - override val checksum: Int + override val checksum: String get() = artifactFile.checksum - override val checksumString: String - get() = artifactFile.checksumString - /** * Example: * org.jetbrains.sample-sampleLibrary-1.0.0-SNAPSHOT-appleAndLinuxMain-cinterop/ @@ -172,7 +166,7 @@ internal class CompositeMetadataArtifactImpl( append("-") append(sourceSet.sourceSetName) append("-cinterop") - }).resolve("$cinteropLibraryName-${checksumString}.${archiveExtension}") + }).resolve("$cinteropLibraryName-${this.checksum}.${archiveExtension}") override fun copyTo(file: File): Boolean { require(file.extension == archiveExtension) { @@ -216,14 +210,10 @@ internal class CompositeMetadataArtifactImpl( zip.entries().toList() } - val checksum: Int by lazy(LazyThreadSafetyMode.NONE) { + val checksum: String by lazy(LazyThreadSafetyMode.NONE) { val crc32 = CRC32() entries.forEach { entry -> crc32.update(entry.crc.toInt()) } - crc32.value.toInt() - } - - val checksumString: String by lazy(LazyThreadSafetyMode.NONE) { - checksumStringEncoder.encodeToString(ByteBuffer.allocate(4).putInt(checksum).array()) + checksumStringEncoder.encodeToString(ByteBuffer.allocate(4).putInt(crc32.value.toInt()).array()) } /**