nick/amethyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Make the libsodium cinterop file generation more reliable. Add in(and comment out) some test code for extracting the libsodium headers from zip file.

Browse Source
This commit is contained in:
KotlinGeekDev
2026-03-12 20:28:02 +01:00
parent 527130a53c
commit 0b928d29a6
1 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quartz/build.gradle.kts
+24 -24
View File
@@ -5,7 +5,6 @@ import io.github.frankois944.spmForKmp.swiftPackageConfig
import io.github.frankois944.spmForKmp.utils.ExperimentalSpmForKmpFeature import io.github.frankois944.spmForKmp.utils.ExperimentalSpmForKmpFeature
import org.jetbrains.kotlin.gradle.dsl.JvmTarget import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.targets.native.tasks.KotlinNativeTest import org.jetbrains.kotlin.gradle.targets.native.tasks.KotlinNativeTest
import org.jetbrains.kotlin.gradle.tasks.KotlinNativeCompile
plugins { plugins {
alias(libs.plugins.kotlinMultiplatform) alias(libs.plugins.kotlinMultiplatform)
@@ -62,7 +61,24 @@ kotlin {
// project can be found here: // project can be found here:
// https://developer.android.com/kotlin/multiplatform/migrate // https://developer.android.com/kotlin/multiplatform/migrate
val xcfName = "quartz-kmpKit" val xcfName = "quartz-kmpKit"
val libsodiumPath = project.file("src/nativeInterop/libsodium").toString() val libsodiumPath = project.file("src/nativeInterop/libsodium")
val libsodiumHeaderFilesPath = project.file("$libsodiumPath/include/sodium")
// This generates the Libsodium definition file, necessary for creating native bindings(a Kotlin API) for libsodium(for iOS).
// val headersTask = tasks.register<Exec>("ExtractLibsodiumHeaders") {
// val unpackDirectory = "$libsodiumPath/include"
// unzipTo(
// project.file(unpackDirectory),
// project.file("$unpackDirectory/sodium.zip")
// )
// }
val libsodiumDefFileGeneration = tasks.register<Exec>("GenerateSodiumCinteropFile") {
val definitionFile = project.file("src/nativeInterop/cinterop/Clibsodium.def")
definitionFile.writeText("package = Clibsodium")
definitionFile.appendText("\n" + "staticLibraries = libsodium.a libsodium-simulator.a")
definitionFile.appendText("\n" + "libraryPaths = ${libsodiumPath}/ios/lib ${libsodiumPath}/ios-simulators/lib")
}
listOf( listOf(
iosArm64(), iosArm64(),
@@ -71,17 +87,18 @@ kotlin {
).forEach { target -> ).forEach { target ->
target.compilations.getByName("main") { target.compilations.getByName("main") {
val headerFilesPath = "$libsodiumPath/include/sodium" // headersTask.get()
libsodiumDefFileGeneration.get()
val Clibsodium by cinterops.creating { val Clibsodium by cinterops.creating {
assert(project.file("Clibsodium.def").exists())
definitionFile.set(project.file("Clibsodium.def")) definitionFile.set(project.file("Clibsodium.def"))
includeDirs("${libsodiumPath}/ios-simulators/lib") includeDirs("${libsodiumPath}/ios-simulators/lib")
//compilerOpts("-I${libsodiumPath}/ios-simulators/lib") //compilerOpts("-I${libsodiumPath}/ios-simulators/lib")
headers( headers(
"$headerFilesPath/crypto_aead_xchacha20poly1305.h", "$libsodiumHeaderFilesPath/crypto_aead_xchacha20poly1305.h",
"$headerFilesPath/crypto_core_hchacha20.h", "$libsodiumHeaderFilesPath/crypto_core_hchacha20.h",
"$headerFilesPath/crypto_stream_chacha20.h" "$libsodiumHeaderFilesPath/crypto_stream_chacha20.h"
) )
} }
} }
@@ -119,23 +136,6 @@ kotlin {
baseName = xcfName baseName = xcfName
} }
} }
// This generates the Libsodium definition file, necessary for creating native bindings(a Kotlin API) for libsodium(for iOS).
val libsodiumDefFileGeneration = tasks.register<Exec>("GenerateSodiumCinteropFile") {
val libsodiumPath = project.file("src/nativeInterop/libsodium").toString()
val definitionFile = project.file("src/nativeInterop/cinterop/Clibsodium.def")
definitionFile.writeText("package = Clibsodium")
definitionFile.appendText("\n" + "staticLibraries = libsodium.a libsodium-simulator.a")
definitionFile.appendText("\n" + "libraryPaths = ${libsodiumPath}/ios/lib ${libsodiumPath}/ios-simulators/lib")
doLast {
executionResult.get().assertNormalExitValue()
}
}
tasks.withType<KotlinNativeCompile>().configureEach {
// doFirst { libsodiumDefFileGeneration.get() }
dependsOn(libsodiumDefFileGeneration)
}
// This makes sure that the resource file directory is visible for iOS tests. // This makes sure that the resource file directory is visible for iOS tests.
val rootDir = "${rootProject.rootDir.path}/quartz/src/iosTest/resources" val rootDir = "${rootProject.rootDir.path}/quartz/src/iosTest/resources"