From b8c7e581a1a3fe048131f6a604412fe49e18dfb0 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Fri, 20 Oct 2023 21:53:27 +0600 Subject: [PATCH] add support of linuxArm64 target --- CHANGELOG.md | 2 + common/build.gradle | 7 +- .../linuxArm64Main/kotlin/ActualMPPFile.kt | 36 ++++++ common/src/linuxArm64Main/kotlin/fixed.kt | 25 ++++ coroutines/build.gradle | 2 +- crypto/build.gradle | 2 +- extensions.gradle | 4 +- fsm/common/build.gradle | 2 +- fsm/repos/common/build.gradle | 2 +- ktor/client/build.gradle | 8 +- .../kotlin/ActualTemporalUpload.kt | 40 +++++++ .../linuxArm64Main/kotlin/ActualUniUpload.kt | 107 ++++++++++++++++++ ktor/common/build.gradle | 2 +- .../kotlin/ActualMPPFileInput.kt | 11 ++ language_codes/build.gradle | 2 +- matrix/build.gradle | 2 +- mime_types/build.gradle | 2 +- ...sAndroidLinuxMingwLinuxArm64Project.gradle | 66 +++++++++++ ...on.gradle => mppJvmJsAndroidProject.gradle | 0 mppJvmJsLinuxMingwLinuxArm64Project.gradle | 54 +++++++++ mppJvmJsLinuxMingwProject.gradle | 13 +++ pagination/common/build.gradle | 2 +- pagination/ktor/common/build.gradle | 2 +- repos/cache/build.gradle | 2 +- repos/common/build.gradle | 2 +- repos/generator/test/build.gradle | 2 +- repos/inmemory/build.gradle | 2 +- repos/ktor/client/build.gradle | 2 +- repos/ktor/common/build.gradle | 2 +- safe_wrapper/build.gradle | 2 +- selector/common/build.gradle | 2 +- serialization/base64/build.gradle | 2 +- serialization/encapsulator/build.gradle | 2 +- serialization/mapper/build.gradle | 2 +- serialization/typed_serializer/build.gradle | 2 +- startup/plugin/build.gradle | 1 - startup/template/client/build.gradle | 2 +- startup/template/common/build.gradle | 2 +- 38 files changed, 394 insertions(+), 28 deletions(-) create mode 100644 common/src/linuxArm64Main/kotlin/ActualMPPFile.kt create mode 100644 common/src/linuxArm64Main/kotlin/fixed.kt create mode 100644 ktor/client/src/linuxArm64Main/kotlin/ActualTemporalUpload.kt create mode 100644 ktor/client/src/linuxArm64Main/kotlin/ActualUniUpload.kt create mode 100644 ktor/common/src/linuxArm64Main/kotlin/ActualMPPFileInput.kt create mode 100644 mppJvmJsAndroidLinuxMingwLinuxArm64Project.gradle rename mppProjectWithSerialization.gradle => mppJvmJsAndroidProject.gradle (100%) create mode 100644 mppJvmJsLinuxMingwLinuxArm64Project.gradle diff --git a/CHANGELOG.md b/CHANGELOG.md index aff3e6da252..3861d09f4c4 100644 --- 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** diff --git a/common/build.gradle b/common/build.gradle index ad1081a6a29..ba6963d2308 100644 --- 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 + } + } } } diff --git a/common/src/linuxArm64Main/kotlin/ActualMPPFile.kt b/common/src/linuxArm64Main/kotlin/ActualMPPFile.kt new file mode 100644 index 00000000000..ff5f9619c53 --- /dev/null +++ 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() + } diff --git a/common/src/linuxArm64Main/kotlin/fixed.kt b/common/src/linuxArm64Main/kotlin/fixed.kt new file mode 100644 index 00000000000..14e0a168cba --- /dev/null +++ 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(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(Double.SIZE_BYTES * 2) + + sprintf(buff, "%.${signs}f", this@fixed) + buff.toKString().toDouble() + } +} diff --git a/coroutines/build.gradle b/coroutines/build.gradle index 3dc3c1d4121..91a9ff9f65f 100644 --- 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 { diff --git a/crypto/build.gradle b/crypto/build.gradle index 686093b86f0..649a79fba9e 100644 --- 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 { diff --git a/extensions.gradle b/extensions.gradle index 7cc0fcefac7..d782e25b3ec 100644 --- 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" diff --git a/fsm/common/build.gradle b/fsm/common/build.gradle index 6b6b040f3cf..9f1a514dbaa 100644 --- 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 { diff --git a/fsm/repos/common/build.gradle b/fsm/repos/common/build.gradle index d20bb3f38a4..a1011624ad7 100644 --- 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 { diff --git a/ktor/client/build.gradle b/ktor/client/build.gradle index 3387bb81ef2..bea1eee5581 100644 --- 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") + } + } } } diff --git a/ktor/client/src/linuxArm64Main/kotlin/ActualTemporalUpload.kt b/ktor/client/src/linuxArm64Main/kotlin/ActualTemporalUpload.kt new file mode 100644 index 00000000000..8dc14e5f7c0 --- /dev/null +++ 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) +} diff --git a/ktor/client/src/linuxArm64Main/kotlin/ActualUniUpload.kt b/ktor/client/src/linuxArm64Main/kotlin/ActualUniUpload.kt new file mode 100644 index 00000000000..4da3d874f80 --- /dev/null +++ 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 HttpClient.uniUpload( + url: String, + data: Map, + resultDeserializer: DeserializationStrategy, + 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, 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 + } +} diff --git a/ktor/common/build.gradle b/ktor/common/build.gradle index e9b164d47d1..80f20448b09 100644 --- 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 { diff --git a/ktor/common/src/linuxArm64Main/kotlin/ActualMPPFileInput.kt b/ktor/common/src/linuxArm64Main/kotlin/ActualMPPFileInput.kt new file mode 100644 index 00000000000..482635d4e6a --- /dev/null +++ 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()) +} + diff --git a/language_codes/build.gradle b/language_codes/build.gradle index 8515ddb2e83..41e41961f03 100644 --- 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 { diff --git a/matrix/build.gradle b/matrix/build.gradle index 7c54502f100..d425197852e 100644 --- a/matrix/build.gradle +++ b/matrix/build.gradle @@ -4,4 +4,4 @@ plugins { id "com.android.library" } -apply from: "$mppProjectWithSerializationPresetPath" +apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath" diff --git a/mime_types/build.gradle b/mime_types/build.gradle index 7c54502f100..d425197852e 100644 --- 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" diff --git a/mppJvmJsAndroidLinuxMingwLinuxArm64Project.gradle b/mppJvmJsAndroidLinuxMingwLinuxArm64Project.gradle new file mode 100644 index 00000000000..87411c4cb90 --- /dev/null +++ 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 +} diff --git a/mppProjectWithSerialization.gradle b/mppJvmJsAndroidProject.gradle similarity index 100% rename from mppProjectWithSerialization.gradle rename to mppJvmJsAndroidProject.gradle diff --git a/mppJvmJsLinuxMingwLinuxArm64Project.gradle b/mppJvmJsLinuxMingwLinuxArm64Project.gradle new file mode 100644 index 00000000000..84159c1e5a5 --- /dev/null +++ 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 +} diff --git a/mppJvmJsLinuxMingwProject.gradle b/mppJvmJsLinuxMingwProject.gradle index a38f9435da1..345a091e672 100644 --- 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 } } diff --git a/pagination/common/build.gradle b/pagination/common/build.gradle index 082ce99346a..0fc4ffcfccf 100644 --- 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 { diff --git a/pagination/ktor/common/build.gradle b/pagination/ktor/common/build.gradle index 9eb226de884..1934dde2b24 100644 --- 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 { diff --git a/repos/cache/build.gradle b/repos/cache/build.gradle index 1ca610cbfdf..bd1e28bffc0 100644 --- 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 { diff --git a/repos/common/build.gradle b/repos/common/build.gradle index b5ae4333470..bf9c4a857da 100644 --- 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 { diff --git a/repos/generator/test/build.gradle b/repos/generator/test/build.gradle index 84a7b71ace9..60490b485b7 100644 --- 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 { diff --git a/repos/inmemory/build.gradle b/repos/inmemory/build.gradle index 01f0a6f24ea..7de5521c228 100644 --- 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 { diff --git a/repos/ktor/client/build.gradle b/repos/ktor/client/build.gradle index 9d6e599d90c..70f7fee9073 100644 --- 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 { diff --git a/repos/ktor/common/build.gradle b/repos/ktor/common/build.gradle index 79002ed147b..f66aa9f0f4d 100644 --- 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 { diff --git a/safe_wrapper/build.gradle b/safe_wrapper/build.gradle index 854f51c5dfb..4de292973e2 100644 --- 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 { diff --git a/selector/common/build.gradle b/selector/common/build.gradle index 988d2067495..2cca2f38c6f 100644 --- 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 { diff --git a/serialization/base64/build.gradle b/serialization/base64/build.gradle index 403f8887d7b..7a6e3883145 100644 --- 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 { diff --git a/serialization/encapsulator/build.gradle b/serialization/encapsulator/build.gradle index 7c54502f100..d425197852e 100644 --- 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" diff --git a/serialization/mapper/build.gradle b/serialization/mapper/build.gradle index 7c54502f100..d425197852e 100644 --- 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" diff --git a/serialization/typed_serializer/build.gradle b/serialization/typed_serializer/build.gradle index 7c54502f100..d425197852e 100644 --- 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" diff --git a/startup/plugin/build.gradle b/startup/plugin/build.gradle index 97fc6fe3f86..6da68fd5aec 100644 --- 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") diff --git a/startup/template/client/build.gradle b/startup/template/client/build.gradle index 55e19ae7cc0..6f67e36c1df 100644 --- 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 { diff --git a/startup/template/common/build.gradle b/startup/template/common/build.gradle index 7c54502f100..d425197852e 100644 --- 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"