add support of linuxArm64 target

2023-10-20 21:53:27 +06:00 · 2023-10-20 21:53:27 +06:00 · b8c7e581a1
parent 8281259179
commit b8c7e581a1
38 changed files with 394 additions and 28 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -2,6 +2,8 @@

 ## 0.20.9

+* Most of common modules now supports `linuxArm64` target
+
 ## 0.20.8

 **THIS VERSION CONTAINS UPDATES OF DEPENDENCIES UP TO RC VERSIONS. USE WITH CAUTION**
--- a/common/build.gradle
+++ b/common/build.gradle
@ -4,7 +4,7 @@ plugins {
    id "com.android.library"
 }

-apply from: "$mppProjectWithSerializationPresetPath"
+apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath"

 kotlin {
    sourceSets {
@ -31,5 +31,10 @@ kotlin {
                api libs.okio
            }
        }
+        linuxArm64Main {
+            dependencies {
+                api libs.okio
+            }
+        }
    }
 }
--- a/common/src/linuxArm64Main/kotlin/ActualMPPFile.kt
+++ b/common/src/linuxArm64Main/kotlin/ActualMPPFile.kt
@ -0,0 +1,36 @@
+package dev.inmo.micro_utils.common
+
+import okio.FileSystem
+import okio.Path
+import okio.use
+
+actual typealias MPPFile = Path
+
+/**
+ * @suppress
+ */
+actual val MPPFile.filename: FileName
+    get() = FileName(toString())
+/**
+ * @suppress
+ */
+actual val MPPFile.filesize: Long
+    get() = FileSystem.SYSTEM.openReadOnly(this).use {
+        it.size()
+    }
+/**
+ * @suppress
+ */
+actual val MPPFile.bytesAllocatorSync: ByteArrayAllocator
+    get() = {
+        FileSystem.SYSTEM.read(this) {
+            readByteArray()
+        }
+    }
+/**
+ * @suppress
+ */
+actual val MPPFile.bytesAllocator: SuspendByteArrayAllocator
+    get() = {
+        bytesAllocatorSync()
+    }
--- a/common/src/linuxArm64Main/kotlin/fixed.kt
+++ b/common/src/linuxArm64Main/kotlin/fixed.kt
@ -0,0 +1,25 @@
+package dev.inmo.micro_utils.common
+
+import kotlinx.cinterop.*
+import platform.posix.snprintf
+import platform.posix.sprintf
+
+@OptIn(ExperimentalForeignApi::class)
+actual fun Float.fixed(signs: Int): Float {
+    return memScoped {
+        val buff = allocArray<ByteVar>(Float.SIZE_BYTES * 2)
+
+        sprintf(buff, "%.${signs}f", this@fixed)
+        buff.toKString().toFloat()
+    }
+}
+
+@OptIn(ExperimentalForeignApi::class)
+actual fun Double.fixed(signs: Int): Double {
+    return memScoped {
+        val buff = allocArray<ByteVar>(Double.SIZE_BYTES * 2)
+
+        sprintf(buff, "%.${signs}f", this@fixed)
+        buff.toKString().toDouble()
+    }
+}
--- a/coroutines/build.gradle
+++ b/coroutines/build.gradle
@ -4,7 +4,7 @@ plugins {
    id "com.android.library"
 }

-apply from: "$mppProjectWithSerializationPresetPath"
+apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath"

 kotlin {
    sourceSets {
--- a/crypto/build.gradle
+++ b/crypto/build.gradle
@ -4,7 +4,7 @@ plugins {
    id "com.android.library"
 }

-apply from: "$mppProjectWithSerializationPresetPath"
+apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath"

 kotlin {
    sourceSets {
--- a/extensions.gradle
+++ b/extensions.gradle
@ -26,10 +26,12 @@ allprojects {
 //            composePluginKotlinVersion = compilerPluginVersionFromLibrariesVersions
 //        }

-        mppProjectWithSerializationPresetPath = "${rootProject.projectDir.absolutePath}/mppProjectWithSerialization.gradle"
+        mppProjectWithSerializationPresetPath = "${rootProject.projectDir.absolutePath}/mppJvmJsAndroidProject.gradle"
        mppProjectWithSerializationAndComposePresetPath = "${rootProject.projectDir.absolutePath}/mppProjectWithSerializationAndCompose.gradle"
        mppJavaProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJavaProject.gradle"
        mppJvmJsLinuxMingwProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJvmJsLinuxMingwProject.gradle"
+        mppJvmJsLinuxMingwLinuxArm64ProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJvmJsLinuxMingwLinuxArm64Project.gradle"
+        mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJvmJsAndroidLinuxMingwLinuxArm64Project.gradle"
        mppAndroidProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppAndroidProject.gradle"

        defaultAndroidSettingsPresetPath = "${rootProject.projectDir.absolutePath}/defaultAndroidSettings.gradle"
--- a/fsm/common/build.gradle
+++ b/fsm/common/build.gradle
@ -4,7 +4,7 @@ plugins {
    id "com.android.library"
 }

-apply from: "$mppProjectWithSerializationPresetPath"
+apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath"

 kotlin {
    sourceSets {
--- a/fsm/repos/common/build.gradle
+++ b/fsm/repos/common/build.gradle
@ -4,7 +4,7 @@ plugins {
    id "com.android.library"
 }

-apply from: "$mppProjectWithSerializationPresetPath"
+apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath"

 kotlin {
    sourceSets {
--- a/ktor/client/build.gradle
+++ b/ktor/client/build.gradle
@ -4,7 +4,7 @@ plugins {
    id "com.android.library"
 }

-apply from: "$mppProjectWithSerializationPresetPath"
+apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath"

 kotlin {
    sourceSets {
@ -30,5 +30,11 @@ kotlin {
                api internalProject("micro_utils.mime_types")
            }
        }
+
+        linuxArm64Main {
+            dependencies {
+                api internalProject("micro_utils.mime_types")
+            }
+        }
    }
 }
--- a/ktor/client/src/linuxArm64Main/kotlin/ActualTemporalUpload.kt
+++ b/ktor/client/src/linuxArm64Main/kotlin/ActualTemporalUpload.kt
@ -0,0 +1,40 @@
+package dev.inmo.micro_utils.ktor.client
+
+import dev.inmo.micro_utils.common.MPPFile
+import dev.inmo.micro_utils.common.filename
+import dev.inmo.micro_utils.ktor.common.TemporalFileId
+import dev.inmo.micro_utils.mime_types.getMimeTypeOrAny
+import io.ktor.client.HttpClient
+import io.ktor.client.plugins.onUpload
+import io.ktor.client.request.forms.formData
+import io.ktor.client.request.forms.submitFormWithBinaryData
+import io.ktor.client.statement.bodyAsText
+import io.ktor.http.Headers
+import io.ktor.http.HttpHeaders
+
+internal val MPPFile.mimeType: String
+    get() = getMimeTypeOrAny(filename.extension).raw
+
+actual suspend fun HttpClient.tempUpload(
+    fullTempUploadDraftPath: String,
+    file: MPPFile,
+    onUpload: OnUploadCallback
+): TemporalFileId {
+    val inputProvider = file.inputProvider()
+    val fileId = submitFormWithBinaryData(
+        fullTempUploadDraftPath,
+        formData = formData {
+            append(
+                "data",
+                inputProvider,
+                Headers.build {
+                    append(HttpHeaders.ContentType, file.mimeType)
+                    append(HttpHeaders.ContentDisposition, "filename=\"${file.filename.string}\"")
+                }
+            )
+        }
+    ) {
+        onUpload(onUpload)
+    }.bodyAsText()
+    return TemporalFileId(fileId)
+}
--- a/ktor/client/src/linuxArm64Main/kotlin/ActualUniUpload.kt
+++ b/ktor/client/src/linuxArm64Main/kotlin/ActualUniUpload.kt
@ -0,0 +1,107 @@
+package dev.inmo.micro_utils.ktor.client
+
+import dev.inmo.micro_utils.common.MPPFile
+import dev.inmo.micro_utils.common.Progress
+import io.ktor.client.HttpClient
+import io.ktor.client.engine.mergeHeaders
+import io.ktor.client.plugins.onUpload
+import io.ktor.client.request.HttpRequestBuilder
+import io.ktor.client.request.forms.InputProvider
+import io.ktor.client.request.forms.formData
+import io.ktor.client.request.forms.submitForm
+import io.ktor.client.request.forms.submitFormWithBinaryData
+import io.ktor.client.request.headers
+import io.ktor.client.statement.bodyAsText
+import io.ktor.http.Headers
+import io.ktor.http.HttpHeaders
+import io.ktor.http.HttpStatusCode
+import io.ktor.http.Parameters
+import io.ktor.http.content.PartData
+import kotlinx.serialization.DeserializationStrategy
+import kotlinx.serialization.InternalSerializationApi
+import kotlinx.serialization.SerializationStrategy
+import kotlinx.serialization.StringFormat
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.serializer
+
+/**
+ * Will execute submitting of multipart data request
+ *
+ * @param data [Map] where keys will be used as names for multipart parts and values as values. If you will pass
+ * [dev.inmo.micro_utils.common.MPPFile] (File from JS or JVM platform). Also you may pass [UniUploadFileInfo] as value
+ * in case you wish to pass other source of multipart binary data than regular file
+ * @suppress
+ */
+@OptIn(InternalSerializationApi::class)
+actual suspend fun <T> HttpClient.uniUpload(
+    url: String,
+    data: Map<String, Any>,
+    resultDeserializer: DeserializationStrategy<T>,
+    headers: Headers,
+    stringFormat: StringFormat,
+    onUpload: OnUploadCallback
+): T? {
+    val withBinary = data.values.any { it is MPPFile || it is UniUploadFileInfo }
+
+    val formData = formData {
+        for (k in data.keys) {
+            val v = data[k] ?: continue
+            when (v) {
+                is MPPFile -> append(
+                    k,
+                    v.inputProvider(),
+                    Headers.build {
+                        append(HttpHeaders.ContentType, v.mimeType)
+                        append(HttpHeaders.ContentDisposition, "filename=\"${v.name}\"")
+                    }
+                )
+                is UniUploadFileInfo -> append(
+                    k,
+                    InputProvider(block = v.inputAllocator),
+                    Headers.build {
+                        append(HttpHeaders.ContentType, v.mimeType)
+                        append(HttpHeaders.ContentDisposition, "filename=\"${v.fileName.name}\"")
+                    }
+                )
+                else -> append(
+                    k,
+                    stringFormat.encodeToString(v::class.serializer() as SerializationStrategy<in Any>, v)
+                )
+            }
+        }
+    }
+
+    val requestBuilder: HttpRequestBuilder.() -> Unit = {
+        headers {
+            appendAll(headers)
+        }
+        onUpload { bytesSentTotal, contentLength ->
+            onUpload(bytesSentTotal, contentLength)
+        }
+    }
+
+    val response = if (withBinary) {
+        submitFormWithBinaryData(
+            url,
+            formData,
+            block = requestBuilder
+        )
+    } else {
+        submitForm(
+            url,
+            Parameters.build {
+                for (it in formData) {
+                    val formItem = (it as PartData.FormItem)
+                    append(it.name!!, it.value)
+                }
+            },
+            block = requestBuilder
+        )
+    }
+
+    return if (response.status == HttpStatusCode.OK) {
+        stringFormat.decodeFromString(resultDeserializer, response.bodyAsText())
+    } else {
+        null
+    }
+}
--- a/ktor/common/build.gradle
+++ b/ktor/common/build.gradle
@ -4,7 +4,7 @@ plugins {
    id "com.android.library"
 }

-apply from: "$mppProjectWithSerializationPresetPath"
+apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath"

 kotlin {
    sourceSets {
--- a/ktor/common/src/linuxArm64Main/kotlin/ActualMPPFileInput.kt
+++ b/ktor/common/src/linuxArm64Main/kotlin/ActualMPPFileInput.kt
@ -0,0 +1,11 @@
+package dev.inmo.micro_utils.ktor.common
+
+import dev.inmo.micro_utils.common.MPPFile
+import dev.inmo.micro_utils.common.bytesAllocatorSync
+import io.ktor.utils.io.core.ByteReadPacket
+import io.ktor.utils.io.core.Input
+
+actual fun MPPFile.input(): Input {
+    return ByteReadPacket(bytesAllocatorSync())
+}
+
--- a/language_codes/build.gradle
+++ b/language_codes/build.gradle
@ -4,7 +4,7 @@ plugins {
    id "com.android.library"
 }

-apply from: "$mppProjectWithSerializationPresetPath"
+apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath"

 kotlin {
    sourceSets {
--- a/matrix/build.gradle
+++ b/matrix/build.gradle
@ -4,4 +4,4 @@ plugins {
    id "com.android.library"
 }

-apply from: "$mppProjectWithSerializationPresetPath"
+apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath"
--- a/mime_types/build.gradle
+++ b/mime_types/build.gradle
@ -4,4 +4,4 @@ plugins {
    id "com.android.library"
 }

-apply from: "$mppProjectWithSerializationPresetPath"
+apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath"
--- a/mppJvmJsAndroidLinuxMingwLinuxArm64Project.gradle
+++ b/mppJvmJsAndroidLinuxMingwLinuxArm64Project.gradle
@ -0,0 +1,66 @@
+project.version = "$version"
+project.group = "$group"
+
+apply from: "$publishGradlePath"
+
+kotlin {
+    jvm {
+        compilations.main {
+            kotlinOptions {
+                jvmTarget = "1.8"
+            }
+        }
+    }
+    js (IR) {
+        browser()
+        nodejs()
+    }
+    androidTarget {
+        publishAllLibraryVariants()
+    }
+    linuxX64()
+    mingwX64()
+    linuxArm64()
+
+    sourceSets {
+        commonMain {
+            dependencies {
+                implementation kotlin('stdlib')
+                api libs.kt.serialization
+            }
+        }
+        commonTest {
+            dependencies {
+                implementation kotlin('test-common')
+                implementation kotlin('test-annotations-common')
+                implementation libs.kt.coroutines.test
+            }
+        }
+
+        androidUnitTest {
+            dependencies {
+                implementation kotlin('test-junit')
+                implementation libs.android.test.junit
+                implementation libs.android.espresso
+            }
+        }
+        jvmTest {
+            dependencies {
+                implementation kotlin('test-junit')
+            }
+        }
+        jsTest {
+            dependencies {
+                implementation kotlin('test-js')
+                implementation kotlin('test-junit')
+            }
+        }
+    }
+}
+
+apply from: "$defaultAndroidSettingsPresetPath"
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
--- a/mppProjectWithSerialization.gradle
+++ b/mppProjectWithSerialization.gradle
--- a/mppJvmJsLinuxMingwLinuxArm64Project.gradle
+++ b/mppJvmJsLinuxMingwLinuxArm64Project.gradle
@ -0,0 +1,54 @@
+project.version = "$version"
+project.group = "$group"
+
+apply from: "$publishGradlePath"
+
+kotlin {
+    jvm {
+        compilations.main {
+            kotlinOptions {
+                jvmTarget = "1.8"
+            }
+        }
+    }
+    js (IR) {
+        browser()
+        nodejs()
+    }
+    linuxX64()
+    mingwX64()
+    linuxArm64()
+
+    sourceSets {
+        commonMain {
+            dependencies {
+                implementation kotlin('stdlib')
+                api libs.kt.serialization
+            }
+        }
+        commonTest {
+            dependencies {
+                implementation kotlin('test-common')
+                implementation kotlin('test-annotations-common')
+                implementation libs.kt.coroutines.test
+            }
+        }
+
+        jvmTest {
+            dependencies {
+                implementation kotlin('test-junit')
+            }
+        }
+        jsTest {
+            dependencies {
+                implementation kotlin('test-js')
+                implementation kotlin('test-junit')
+            }
+        }
+    }
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
--- a/mppJvmJsLinuxMingwProject.gradle
+++ b/mppJvmJsLinuxMingwProject.gradle
@ -22,6 +22,7 @@ kotlin {
        commonMain {
            dependencies {
                implementation kotlin('stdlib')
+                api libs.kt.serialization
            }
        }
        commonTest {
@ -43,6 +44,18 @@ kotlin {
                implementation kotlin('test-junit')
            }
        }
+        mingwX64Test {
+            dependencies {
+                implementation kotlin('test-junit')
+            }
+        }
+        linuxX64Test {
+            dependencies {
+                implementation kotlin('test-junit')
+            }
+        }
+
+        androidMain.dependsOn jvmMain
    }
 }

--- a/pagination/common/build.gradle
+++ b/pagination/common/build.gradle
@ -4,7 +4,7 @@ plugins {
    id "com.android.library"
 }

-apply from: "$mppProjectWithSerializationPresetPath"
+apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath"

 kotlin {
    sourceSets {
--- a/pagination/ktor/common/build.gradle
+++ b/pagination/ktor/common/build.gradle
@ -4,7 +4,7 @@ plugins {
    id "com.android.library"
 }

-apply from: "$mppProjectWithSerializationPresetPath"
+apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath"

 kotlin {
    sourceSets {
--- a/repos/cache/build.gradle
+++ b/repos/cache/build.gradle
@ -4,7 +4,7 @@ plugins {
    id "com.android.library"
 }

-apply from: "$mppProjectWithSerializationPresetPath"
+apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath"

 kotlin {
    sourceSets {
--- a/repos/common/build.gradle
+++ b/repos/common/build.gradle
@ -4,7 +4,7 @@ plugins {
    id "com.android.library"
 }

-apply from: "$mppProjectWithSerializationPresetPath"
+apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath"

 kotlin {
    sourceSets {
--- a/repos/generator/test/build.gradle
+++ b/repos/generator/test/build.gradle
@ -5,7 +5,7 @@ plugins {
    id "com.google.devtools.ksp"
 }

-apply from: "$mppProjectWithSerializationPresetPath"
+apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath"


 kotlin {
--- a/repos/inmemory/build.gradle
+++ b/repos/inmemory/build.gradle
@ -4,7 +4,7 @@ plugins {
    id "com.android.library"
 }

-apply from: "$mppProjectWithSerializationPresetPath"
+apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath"

 kotlin {
    sourceSets {
--- a/repos/ktor/client/build.gradle
+++ b/repos/ktor/client/build.gradle
@ -4,7 +4,7 @@ plugins {
    id "com.android.library"
 }

-apply from: "$mppProjectWithSerializationPresetPath"
+apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath"

 kotlin {
    sourceSets {
--- a/repos/ktor/common/build.gradle
+++ b/repos/ktor/common/build.gradle
@ -4,7 +4,7 @@ plugins {
    id "com.android.library"
 }

-apply from: "$mppProjectWithSerializationPresetPath"
+apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath"

 kotlin {
    sourceSets {
--- a/safe_wrapper/build.gradle
+++ b/safe_wrapper/build.gradle
@ -4,7 +4,7 @@ plugins {
    id "com.android.library"
 }

-apply from: "$mppProjectWithSerializationPresetPath"
+apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath"

 kotlin {
    sourceSets {
--- a/selector/common/build.gradle
+++ b/selector/common/build.gradle
@ -4,7 +4,7 @@ plugins {
    id "com.android.library"
 }

-apply from: "$mppProjectWithSerializationPresetPath"
+apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath"

 kotlin {
    sourceSets {
--- a/serialization/base64/build.gradle
+++ b/serialization/base64/build.gradle
@ -4,7 +4,7 @@ plugins {
    id "com.android.library"
 }

-apply from: "$mppProjectWithSerializationPresetPath"
+apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath"

 kotlin {
    sourceSets {
--- a/serialization/encapsulator/build.gradle
+++ b/serialization/encapsulator/build.gradle
@ -4,4 +4,4 @@ plugins {
    id "com.android.library"
 }

-apply from: "$mppProjectWithSerializationPresetPath"
+apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath"
--- a/serialization/mapper/build.gradle
+++ b/serialization/mapper/build.gradle
@ -4,4 +4,4 @@ plugins {
    id "com.android.library"
 }

-apply from: "$mppProjectWithSerializationPresetPath"
+apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath"
--- a/serialization/typed_serializer/build.gradle
+++ b/serialization/typed_serializer/build.gradle
@ -4,4 +4,4 @@ plugins {
    id "com.android.library"
 }

-apply from: "$mppProjectWithSerializationPresetPath"
+apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath"
--- a/startup/plugin/build.gradle
+++ b/startup/plugin/build.gradle
@ -10,7 +10,6 @@ kotlin {
        commonMain {
            dependencies {
                api libs.koin
-                api libs.kt.serialization
                api libs.kslog
                api libs.kt.reflect
                api project(":micro_utils.coroutines")
--- a/startup/template/client/build.gradle
+++ b/startup/template/client/build.gradle
@ -5,7 +5,7 @@ plugins {
    alias(libs.plugins.compose)
 }

-apply from: "$mppProjectWithSerializationPresetPath"
+apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath"

 kotlin {
    sourceSets {
--- a/startup/template/common/build.gradle
+++ b/startup/template/common/build.gradle
@ -4,4 +4,4 @@ plugins {
    id "com.android.library"
 }

-apply from: "$mppProjectWithSerializationPresetPath"
+apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath"