From 4478193d8aa36a05f4d965a794b47674404055b9 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 5 Aug 2023 13:49:45 +0600 Subject: [PATCH] update dependencies --- .../{main => androidMain}/AndroidManifest.xml | 0 .../common => androidMain/kotlin}/AlertDialog.kt | 0 .../kotlin}/CustomAlertDialog.kt | 0 .../kotlin}/SimpleTextAlert.kt | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../android/alerts/recyclerview/ActionsAlerts.kt | 0 .../alerts/recyclerview/RecyclerViewDialog.kt | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../recyclerview/AbstractStandardViewHolder.kt | 0 .../android/recyclerview/AbstractViewHolder.kt | 0 .../micro_utils/android/recyclerview/Divider.kt | 0 .../android/recyclerview/LeftItems.kt | 0 .../android/recyclerview/RecyclerViewAdapter.kt | 0 .../StateFlowBasedRecyclerViewAdapter.kt | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../common/ArgumentPropertyNullableDelegate.kt | 0 .../dev/inmo/micro_utils/common/Dimensions.kt | 0 .../inmo/micro_utils/common/ExpandCollapse.kt | 0 .../inmo/micro_utils/common/FindViewsByTag.kt | 0 .../dev/inmo/micro_utils/common/Mapping.kt | 0 .../dev/inmo/micro_utils/common/RootView.kt | 0 .../dev/inmo/micro_utils/common/ViewDisable.kt | 0 .../inmo/micro_utils/common/ViewVisibility.kt | 0 common/src/linuxX64Main/kotlin/fixed.kt | 7 +++---- common/src/mingwX64Main/kotlin/fixed.kt | 7 +++---- .../{main => androidMain}/AndroidManifest.xml | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../kotlin/FlowOnHierarchyChangeListener.kt | 0 .../kotlin/RecursiveHierarchySubscriber.kt | 0 .../{main => androidMain}/AndroidManifest.xml | 0 defaultAndroidSettings.gradle | 4 ---- .../{main => androidMain}/AndroidManifest.xml | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../{main => androidMain}/AndroidManifest.xml | 0 gradle/libs.versions.toml | 16 ++++++++-------- .../{main => androidMain}/kotlin/Processor.kt | 0 .../src/{main => androidMain}/kotlin/Provider.kt | 0 ...vtools.ksp.processing.SymbolProcessorProvider | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../src/{main => androidMain}/kotlin/Main.kt | 0 .../{main => androidMain}/AndroidManifest.xml | 0 local.migrate.folder.sh | 7 +++++++ .../{main => androidMain}/AndroidManifest.xml | 0 .../{main => androidMain}/AndroidManifest.xml | 0 mppAndroidProject.gradle | 2 +- mppProjectWithSerialization.gradle | 2 +- mppProjectWithSerializationAndCompose.gradle | 2 +- .../{main => androidMain}/AndroidManifest.xml | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../dev/inmo/micro_utils/repos/ColumnType.kt | 0 .../inmo/micro_utils/repos/ContentValuesOf.kt | 0 .../dev/inmo/micro_utils/repos/CursorIterator.kt | 0 .../dev/inmo/micro_utils/repos/CursorMapping.kt | 0 .../repos/DatabaseCoroutineContext.kt | 0 .../inmo/micro_utils/repos/DatabaseOperations.kt | 0 .../repos/DatabasePaginationExtensions.kt | 0 .../micro_utils/repos/DatabaseTransactions.kt | 0 .../dev/inmo/micro_utils/repos/InternalId.kt | 0 .../inmo/micro_utils/repos/StandardSQLHelper.kt | 0 .../repos/crud/AbstractAndroidCRUDRepo.kt | 0 .../repos/crud/AbstractMutableAndroidCRUDRepo.kt | 0 .../micro_utils/repos/keyvalue/KeyValueStore.kt | 0 .../repos/onetomany/OneToManyAndroidRepo.kt | 0 .../AndroidSQLStandardVersionsRepoProxy.kt | 0 ...SharedPreferencesStandardVersionsRepoProxy.kt | 0 .../{main => androidMain}/kotlin/Processor.kt | 0 .../src/{main => androidMain}/kotlin/Provider.kt | 0 ...vtools.ksp.processing.SymbolProcessorProvider | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../kotlin/ClientAndroidPlugin.kt | 0 .../{main => androidMain}/AndroidManifest.xml | 0 .../kotlin/CommonAndroidPlugin.kt | 0 88 files changed, 24 insertions(+), 23 deletions(-) rename android/alerts/common/src/{main => androidMain}/AndroidManifest.xml (100%) rename android/alerts/common/src/{main/kotlin/dev/inmo/micro_utils/android/alerts/common => androidMain/kotlin}/AlertDialog.kt (100%) rename android/alerts/common/src/{main/kotlin/dev/inmo/micro_utils/android/alerts/common => androidMain/kotlin}/CustomAlertDialog.kt (100%) rename android/alerts/common/src/{main/kotlin/dev/inmo/micro_utils/android/alerts/common => androidMain/kotlin}/SimpleTextAlert.kt (100%) rename android/alerts/recyclerview/src/{main => androidMain}/AndroidManifest.xml (100%) rename android/alerts/recyclerview/src/{main => androidMain}/kotlin/dev/inmo/micro_utils/android/alerts/recyclerview/ActionsAlerts.kt (100%) rename android/alerts/recyclerview/src/{main => androidMain}/kotlin/dev/inmo/micro_utils/android/alerts/recyclerview/RecyclerViewDialog.kt (100%) rename android/recyclerview/src/{main => androidMain}/AndroidManifest.xml (100%) rename android/recyclerview/src/{main => androidMain}/kotlin/dev/inmo/micro_utils/android/recyclerview/AbstractStandardViewHolder.kt (100%) rename android/recyclerview/src/{main => androidMain}/kotlin/dev/inmo/micro_utils/android/recyclerview/AbstractViewHolder.kt (100%) rename android/recyclerview/src/{main => androidMain}/kotlin/dev/inmo/micro_utils/android/recyclerview/Divider.kt (100%) rename android/recyclerview/src/{main => androidMain}/kotlin/dev/inmo/micro_utils/android/recyclerview/LeftItems.kt (100%) rename android/recyclerview/src/{main => androidMain}/kotlin/dev/inmo/micro_utils/android/recyclerview/RecyclerViewAdapter.kt (100%) rename android/recyclerview/src/{main => androidMain}/kotlin/dev/inmo/micro_utils/android/recyclerview/StateFlowBasedRecyclerViewAdapter.kt (100%) rename common/compose/src/{main => androidMain}/AndroidManifest.xml (100%) rename common/src/{main => androidMain}/AndroidManifest.xml (100%) rename common/src/{main => androidMain}/kotlin/dev/inmo/micro_utils/common/ArgumentPropertyNullableDelegate.kt (100%) rename common/src/{main => androidMain}/kotlin/dev/inmo/micro_utils/common/Dimensions.kt (100%) rename common/src/{main => androidMain}/kotlin/dev/inmo/micro_utils/common/ExpandCollapse.kt (100%) rename common/src/{main => androidMain}/kotlin/dev/inmo/micro_utils/common/FindViewsByTag.kt (100%) rename common/src/{main => androidMain}/kotlin/dev/inmo/micro_utils/common/Mapping.kt (100%) rename common/src/{main => androidMain}/kotlin/dev/inmo/micro_utils/common/RootView.kt (100%) rename common/src/{main => androidMain}/kotlin/dev/inmo/micro_utils/common/ViewDisable.kt (100%) rename common/src/{main => androidMain}/kotlin/dev/inmo/micro_utils/common/ViewVisibility.kt (100%) rename coroutines/compose/src/{main => androidMain}/AndroidManifest.xml (100%) rename coroutines/src/{main => androidMain}/AndroidManifest.xml (100%) rename coroutines/src/{main => androidMain}/kotlin/FlowOnHierarchyChangeListener.kt (100%) rename coroutines/src/{main => androidMain}/kotlin/RecursiveHierarchySubscriber.kt (100%) rename crypto/src/{main => androidMain}/AndroidManifest.xml (100%) rename dokka/src/{main => androidMain}/AndroidManifest.xml (100%) rename fsm/common/src/{main => androidMain}/AndroidManifest.xml (100%) rename fsm/repos/common/src/{main => androidMain}/AndroidManifest.xml (100%) rename koin/generator/src/{main => androidMain}/kotlin/Processor.kt (100%) rename koin/generator/src/{main => androidMain}/kotlin/Provider.kt (100%) rename koin/generator/src/{main => androidMain}/resources/META-INF/services/com.google.devtools.ksp.processing.SymbolProcessorProvider (100%) rename koin/generator/test/src/{main => androidMain}/AndroidManifest.xml (100%) rename koin/src/{main => androidMain}/AndroidManifest.xml (100%) rename ktor/client/src/{main => androidMain}/AndroidManifest.xml (100%) rename ktor/common/src/{main => androidMain}/AndroidManifest.xml (100%) rename language_codes/generator/src/{main => androidMain}/kotlin/Main.kt (100%) rename language_codes/src/{main => androidMain}/AndroidManifest.xml (100%) create mode 100755 local.migrate.folder.sh rename matrix/src/{main => androidMain}/AndroidManifest.xml (100%) rename mime_types/src/{main => androidMain}/AndroidManifest.xml (100%) rename pagination/common/src/{main => androidMain}/AndroidManifest.xml (100%) rename pagination/ktor/common/src/{main => androidMain}/AndroidManifest.xml (100%) rename repos/cache/src/{main => androidMain}/AndroidManifest.xml (100%) rename repos/common/src/{main => androidMain}/AndroidManifest.xml (100%) rename repos/common/src/{main => androidMain}/kotlin/dev/inmo/micro_utils/repos/ColumnType.kt (100%) rename repos/common/src/{main => androidMain}/kotlin/dev/inmo/micro_utils/repos/ContentValuesOf.kt (100%) rename repos/common/src/{main => androidMain}/kotlin/dev/inmo/micro_utils/repos/CursorIterator.kt (100%) rename repos/common/src/{main => androidMain}/kotlin/dev/inmo/micro_utils/repos/CursorMapping.kt (100%) rename repos/common/src/{main => androidMain}/kotlin/dev/inmo/micro_utils/repos/DatabaseCoroutineContext.kt (100%) rename repos/common/src/{main => androidMain}/kotlin/dev/inmo/micro_utils/repos/DatabaseOperations.kt (100%) rename repos/common/src/{main => androidMain}/kotlin/dev/inmo/micro_utils/repos/DatabasePaginationExtensions.kt (100%) rename repos/common/src/{main => androidMain}/kotlin/dev/inmo/micro_utils/repos/DatabaseTransactions.kt (100%) rename repos/common/src/{main => androidMain}/kotlin/dev/inmo/micro_utils/repos/InternalId.kt (100%) rename repos/common/src/{main => androidMain}/kotlin/dev/inmo/micro_utils/repos/StandardSQLHelper.kt (100%) rename repos/common/src/{main => androidMain}/kotlin/dev/inmo/micro_utils/repos/crud/AbstractAndroidCRUDRepo.kt (100%) rename repos/common/src/{main => androidMain}/kotlin/dev/inmo/micro_utils/repos/crud/AbstractMutableAndroidCRUDRepo.kt (100%) rename repos/common/src/{main => androidMain}/kotlin/dev/inmo/micro_utils/repos/keyvalue/KeyValueStore.kt (100%) rename repos/common/src/{main => androidMain}/kotlin/dev/inmo/micro_utils/repos/onetomany/OneToManyAndroidRepo.kt (100%) rename repos/common/src/{main => androidMain}/kotlin/dev/inmo/micro_utils/repos/versions/AndroidSQLStandardVersionsRepoProxy.kt (100%) rename repos/common/src/{main => androidMain}/kotlin/dev/inmo/micro_utils/repos/versions/AndroidSharedPreferencesStandardVersionsRepoProxy.kt (100%) rename repos/generator/src/{main => androidMain}/kotlin/Processor.kt (100%) rename repos/generator/src/{main => androidMain}/kotlin/Provider.kt (100%) rename repos/generator/src/{main => androidMain}/resources/META-INF/services/com.google.devtools.ksp.processing.SymbolProcessorProvider (100%) rename repos/generator/test/src/{main => androidMain}/AndroidManifest.xml (100%) rename repos/inmemory/src/{main => androidMain}/AndroidManifest.xml (100%) rename repos/ktor/client/src/{main => androidMain}/AndroidManifest.xml (100%) rename repos/ktor/common/src/{main => androidMain}/AndroidManifest.xml (100%) rename safe_wrapper/src/{main => androidMain}/AndroidManifest.xml (100%) rename selector/common/src/{main => androidMain}/AndroidManifest.xml (100%) rename serialization/base64/src/{main => androidMain}/AndroidManifest.xml (100%) rename serialization/encapsulator/src/{main => androidMain}/AndroidManifest.xml (100%) rename serialization/mapper/src/{main => androidMain}/AndroidManifest.xml (100%) rename serialization/typed_serializer/src/{main => androidMain}/AndroidManifest.xml (100%) rename startup/template/client/src/{main => androidMain}/AndroidManifest.xml (100%) rename startup/template/client/src/{main => androidMain}/kotlin/ClientAndroidPlugin.kt (100%) rename startup/template/common/src/{main => androidMain}/AndroidManifest.xml (100%) rename startup/template/common/src/{main => androidMain}/kotlin/CommonAndroidPlugin.kt (100%) diff --git a/android/alerts/common/src/main/AndroidManifest.xml b/android/alerts/common/src/androidMain/AndroidManifest.xml similarity index 100% rename from android/alerts/common/src/main/AndroidManifest.xml rename to android/alerts/common/src/androidMain/AndroidManifest.xml diff --git a/android/alerts/common/src/main/kotlin/dev/inmo/micro_utils/android/alerts/common/AlertDialog.kt b/android/alerts/common/src/androidMain/kotlin/AlertDialog.kt similarity index 100% rename from android/alerts/common/src/main/kotlin/dev/inmo/micro_utils/android/alerts/common/AlertDialog.kt rename to android/alerts/common/src/androidMain/kotlin/AlertDialog.kt diff --git a/android/alerts/common/src/main/kotlin/dev/inmo/micro_utils/android/alerts/common/CustomAlertDialog.kt b/android/alerts/common/src/androidMain/kotlin/CustomAlertDialog.kt similarity index 100% rename from android/alerts/common/src/main/kotlin/dev/inmo/micro_utils/android/alerts/common/CustomAlertDialog.kt rename to android/alerts/common/src/androidMain/kotlin/CustomAlertDialog.kt diff --git a/android/alerts/common/src/main/kotlin/dev/inmo/micro_utils/android/alerts/common/SimpleTextAlert.kt b/android/alerts/common/src/androidMain/kotlin/SimpleTextAlert.kt similarity index 100% rename from android/alerts/common/src/main/kotlin/dev/inmo/micro_utils/android/alerts/common/SimpleTextAlert.kt rename to android/alerts/common/src/androidMain/kotlin/SimpleTextAlert.kt diff --git a/android/alerts/recyclerview/src/main/AndroidManifest.xml b/android/alerts/recyclerview/src/androidMain/AndroidManifest.xml similarity index 100% rename from android/alerts/recyclerview/src/main/AndroidManifest.xml rename to android/alerts/recyclerview/src/androidMain/AndroidManifest.xml diff --git a/android/alerts/recyclerview/src/main/kotlin/dev/inmo/micro_utils/android/alerts/recyclerview/ActionsAlerts.kt b/android/alerts/recyclerview/src/androidMain/kotlin/dev/inmo/micro_utils/android/alerts/recyclerview/ActionsAlerts.kt similarity index 100% rename from android/alerts/recyclerview/src/main/kotlin/dev/inmo/micro_utils/android/alerts/recyclerview/ActionsAlerts.kt rename to android/alerts/recyclerview/src/androidMain/kotlin/dev/inmo/micro_utils/android/alerts/recyclerview/ActionsAlerts.kt diff --git a/android/alerts/recyclerview/src/main/kotlin/dev/inmo/micro_utils/android/alerts/recyclerview/RecyclerViewDialog.kt b/android/alerts/recyclerview/src/androidMain/kotlin/dev/inmo/micro_utils/android/alerts/recyclerview/RecyclerViewDialog.kt similarity index 100% rename from android/alerts/recyclerview/src/main/kotlin/dev/inmo/micro_utils/android/alerts/recyclerview/RecyclerViewDialog.kt rename to android/alerts/recyclerview/src/androidMain/kotlin/dev/inmo/micro_utils/android/alerts/recyclerview/RecyclerViewDialog.kt diff --git a/android/recyclerview/src/main/AndroidManifest.xml b/android/recyclerview/src/androidMain/AndroidManifest.xml similarity index 100% rename from android/recyclerview/src/main/AndroidManifest.xml rename to android/recyclerview/src/androidMain/AndroidManifest.xml diff --git a/android/recyclerview/src/main/kotlin/dev/inmo/micro_utils/android/recyclerview/AbstractStandardViewHolder.kt b/android/recyclerview/src/androidMain/kotlin/dev/inmo/micro_utils/android/recyclerview/AbstractStandardViewHolder.kt similarity index 100% rename from android/recyclerview/src/main/kotlin/dev/inmo/micro_utils/android/recyclerview/AbstractStandardViewHolder.kt rename to android/recyclerview/src/androidMain/kotlin/dev/inmo/micro_utils/android/recyclerview/AbstractStandardViewHolder.kt diff --git a/android/recyclerview/src/main/kotlin/dev/inmo/micro_utils/android/recyclerview/AbstractViewHolder.kt b/android/recyclerview/src/androidMain/kotlin/dev/inmo/micro_utils/android/recyclerview/AbstractViewHolder.kt similarity index 100% rename from android/recyclerview/src/main/kotlin/dev/inmo/micro_utils/android/recyclerview/AbstractViewHolder.kt rename to android/recyclerview/src/androidMain/kotlin/dev/inmo/micro_utils/android/recyclerview/AbstractViewHolder.kt diff --git a/android/recyclerview/src/main/kotlin/dev/inmo/micro_utils/android/recyclerview/Divider.kt b/android/recyclerview/src/androidMain/kotlin/dev/inmo/micro_utils/android/recyclerview/Divider.kt similarity index 100% rename from android/recyclerview/src/main/kotlin/dev/inmo/micro_utils/android/recyclerview/Divider.kt rename to android/recyclerview/src/androidMain/kotlin/dev/inmo/micro_utils/android/recyclerview/Divider.kt diff --git a/android/recyclerview/src/main/kotlin/dev/inmo/micro_utils/android/recyclerview/LeftItems.kt b/android/recyclerview/src/androidMain/kotlin/dev/inmo/micro_utils/android/recyclerview/LeftItems.kt similarity index 100% rename from android/recyclerview/src/main/kotlin/dev/inmo/micro_utils/android/recyclerview/LeftItems.kt rename to android/recyclerview/src/androidMain/kotlin/dev/inmo/micro_utils/android/recyclerview/LeftItems.kt diff --git a/android/recyclerview/src/main/kotlin/dev/inmo/micro_utils/android/recyclerview/RecyclerViewAdapter.kt b/android/recyclerview/src/androidMain/kotlin/dev/inmo/micro_utils/android/recyclerview/RecyclerViewAdapter.kt similarity index 100% rename from android/recyclerview/src/main/kotlin/dev/inmo/micro_utils/android/recyclerview/RecyclerViewAdapter.kt rename to android/recyclerview/src/androidMain/kotlin/dev/inmo/micro_utils/android/recyclerview/RecyclerViewAdapter.kt diff --git a/android/recyclerview/src/main/kotlin/dev/inmo/micro_utils/android/recyclerview/StateFlowBasedRecyclerViewAdapter.kt b/android/recyclerview/src/androidMain/kotlin/dev/inmo/micro_utils/android/recyclerview/StateFlowBasedRecyclerViewAdapter.kt similarity index 100% rename from android/recyclerview/src/main/kotlin/dev/inmo/micro_utils/android/recyclerview/StateFlowBasedRecyclerViewAdapter.kt rename to android/recyclerview/src/androidMain/kotlin/dev/inmo/micro_utils/android/recyclerview/StateFlowBasedRecyclerViewAdapter.kt diff --git a/common/compose/src/main/AndroidManifest.xml b/common/compose/src/androidMain/AndroidManifest.xml similarity index 100% rename from common/compose/src/main/AndroidManifest.xml rename to common/compose/src/androidMain/AndroidManifest.xml diff --git a/common/src/main/AndroidManifest.xml b/common/src/androidMain/AndroidManifest.xml similarity index 100% rename from common/src/main/AndroidManifest.xml rename to common/src/androidMain/AndroidManifest.xml diff --git a/common/src/main/kotlin/dev/inmo/micro_utils/common/ArgumentPropertyNullableDelegate.kt b/common/src/androidMain/kotlin/dev/inmo/micro_utils/common/ArgumentPropertyNullableDelegate.kt similarity index 100% rename from common/src/main/kotlin/dev/inmo/micro_utils/common/ArgumentPropertyNullableDelegate.kt rename to common/src/androidMain/kotlin/dev/inmo/micro_utils/common/ArgumentPropertyNullableDelegate.kt diff --git a/common/src/main/kotlin/dev/inmo/micro_utils/common/Dimensions.kt b/common/src/androidMain/kotlin/dev/inmo/micro_utils/common/Dimensions.kt similarity index 100% rename from common/src/main/kotlin/dev/inmo/micro_utils/common/Dimensions.kt rename to common/src/androidMain/kotlin/dev/inmo/micro_utils/common/Dimensions.kt diff --git a/common/src/main/kotlin/dev/inmo/micro_utils/common/ExpandCollapse.kt b/common/src/androidMain/kotlin/dev/inmo/micro_utils/common/ExpandCollapse.kt similarity index 100% rename from common/src/main/kotlin/dev/inmo/micro_utils/common/ExpandCollapse.kt rename to common/src/androidMain/kotlin/dev/inmo/micro_utils/common/ExpandCollapse.kt diff --git a/common/src/main/kotlin/dev/inmo/micro_utils/common/FindViewsByTag.kt b/common/src/androidMain/kotlin/dev/inmo/micro_utils/common/FindViewsByTag.kt similarity index 100% rename from common/src/main/kotlin/dev/inmo/micro_utils/common/FindViewsByTag.kt rename to common/src/androidMain/kotlin/dev/inmo/micro_utils/common/FindViewsByTag.kt diff --git a/common/src/main/kotlin/dev/inmo/micro_utils/common/Mapping.kt b/common/src/androidMain/kotlin/dev/inmo/micro_utils/common/Mapping.kt similarity index 100% rename from common/src/main/kotlin/dev/inmo/micro_utils/common/Mapping.kt rename to common/src/androidMain/kotlin/dev/inmo/micro_utils/common/Mapping.kt diff --git a/common/src/main/kotlin/dev/inmo/micro_utils/common/RootView.kt b/common/src/androidMain/kotlin/dev/inmo/micro_utils/common/RootView.kt similarity index 100% rename from common/src/main/kotlin/dev/inmo/micro_utils/common/RootView.kt rename to common/src/androidMain/kotlin/dev/inmo/micro_utils/common/RootView.kt diff --git a/common/src/main/kotlin/dev/inmo/micro_utils/common/ViewDisable.kt b/common/src/androidMain/kotlin/dev/inmo/micro_utils/common/ViewDisable.kt similarity index 100% rename from common/src/main/kotlin/dev/inmo/micro_utils/common/ViewDisable.kt rename to common/src/androidMain/kotlin/dev/inmo/micro_utils/common/ViewDisable.kt diff --git a/common/src/main/kotlin/dev/inmo/micro_utils/common/ViewVisibility.kt b/common/src/androidMain/kotlin/dev/inmo/micro_utils/common/ViewVisibility.kt similarity index 100% rename from common/src/main/kotlin/dev/inmo/micro_utils/common/ViewVisibility.kt rename to common/src/androidMain/kotlin/dev/inmo/micro_utils/common/ViewVisibility.kt diff --git a/common/src/linuxX64Main/kotlin/fixed.kt b/common/src/linuxX64Main/kotlin/fixed.kt index 057002f1ad4..14e0a168cba 100644 --- a/common/src/linuxX64Main/kotlin/fixed.kt +++ b/common/src/linuxX64Main/kotlin/fixed.kt @@ -1,12 +1,10 @@ package dev.inmo.micro_utils.common -import kotlinx.cinterop.ByteVar -import kotlinx.cinterop.allocArray -import kotlinx.cinterop.memScoped -import kotlinx.cinterop.toKString +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) @@ -16,6 +14,7 @@ actual fun Float.fixed(signs: Int): Float { } } +@OptIn(ExperimentalForeignApi::class) actual fun Double.fixed(signs: Int): Double { return memScoped { val buff = allocArray(Double.SIZE_BYTES * 2) diff --git a/common/src/mingwX64Main/kotlin/fixed.kt b/common/src/mingwX64Main/kotlin/fixed.kt index 057002f1ad4..14e0a168cba 100644 --- a/common/src/mingwX64Main/kotlin/fixed.kt +++ b/common/src/mingwX64Main/kotlin/fixed.kt @@ -1,12 +1,10 @@ package dev.inmo.micro_utils.common -import kotlinx.cinterop.ByteVar -import kotlinx.cinterop.allocArray -import kotlinx.cinterop.memScoped -import kotlinx.cinterop.toKString +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) @@ -16,6 +14,7 @@ actual fun Float.fixed(signs: Int): Float { } } +@OptIn(ExperimentalForeignApi::class) actual fun Double.fixed(signs: Int): Double { return memScoped { val buff = allocArray(Double.SIZE_BYTES * 2) diff --git a/coroutines/compose/src/main/AndroidManifest.xml b/coroutines/compose/src/androidMain/AndroidManifest.xml similarity index 100% rename from coroutines/compose/src/main/AndroidManifest.xml rename to coroutines/compose/src/androidMain/AndroidManifest.xml diff --git a/coroutines/src/main/AndroidManifest.xml b/coroutines/src/androidMain/AndroidManifest.xml similarity index 100% rename from coroutines/src/main/AndroidManifest.xml rename to coroutines/src/androidMain/AndroidManifest.xml diff --git a/coroutines/src/main/kotlin/FlowOnHierarchyChangeListener.kt b/coroutines/src/androidMain/kotlin/FlowOnHierarchyChangeListener.kt similarity index 100% rename from coroutines/src/main/kotlin/FlowOnHierarchyChangeListener.kt rename to coroutines/src/androidMain/kotlin/FlowOnHierarchyChangeListener.kt diff --git a/coroutines/src/main/kotlin/RecursiveHierarchySubscriber.kt b/coroutines/src/androidMain/kotlin/RecursiveHierarchySubscriber.kt similarity index 100% rename from coroutines/src/main/kotlin/RecursiveHierarchySubscriber.kt rename to coroutines/src/androidMain/kotlin/RecursiveHierarchySubscriber.kt diff --git a/crypto/src/main/AndroidManifest.xml b/crypto/src/androidMain/AndroidManifest.xml similarity index 100% rename from crypto/src/main/AndroidManifest.xml rename to crypto/src/androidMain/AndroidManifest.xml diff --git a/defaultAndroidSettings.gradle b/defaultAndroidSettings.gradle index 267a33409e6..474ce526244 100644 --- a/defaultAndroidSettings.gradle +++ b/defaultAndroidSettings.gradle @@ -29,8 +29,4 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } - - kotlinOptions { - jvmTarget = JavaVersion.VERSION_1_8.toString() - } } diff --git a/dokka/src/main/AndroidManifest.xml b/dokka/src/androidMain/AndroidManifest.xml similarity index 100% rename from dokka/src/main/AndroidManifest.xml rename to dokka/src/androidMain/AndroidManifest.xml diff --git a/fsm/common/src/main/AndroidManifest.xml b/fsm/common/src/androidMain/AndroidManifest.xml similarity index 100% rename from fsm/common/src/main/AndroidManifest.xml rename to fsm/common/src/androidMain/AndroidManifest.xml diff --git a/fsm/repos/common/src/main/AndroidManifest.xml b/fsm/repos/common/src/androidMain/AndroidManifest.xml similarity index 100% rename from fsm/repos/common/src/main/AndroidManifest.xml rename to fsm/repos/common/src/androidMain/AndroidManifest.xml diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ec9777eb8bc..3960ed514bd 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,27 +1,27 @@ [versions] -kt = "1.8.22" +kt = "1.9.0" kt-serialization = "1.5.1" kt-coroutines = "1.7.3" -kslog = "1.1.1" +kslog = "1.2.0" jb-compose = "1.4.3" -jb-exposed = "0.41.1" +jb-exposed = "0.42.0" jb-dokka = "1.8.20" -korlibs = "4.0.3" -uuid = "0.7.1" +korlibs = "4.0.9" +uuid = "0.8.0" -ktor = "2.3.2" +ktor = "2.3.3" gh-release = "2.4.1" koin = "3.4.3" -okio = "3.4.0" +okio = "3.5.0" -ksp = "1.8.22-1.0.11" +ksp = "1.9.0-1.0.13" kotlin-poet = "1.14.2" versions = "0.47.0" diff --git a/koin/generator/src/main/kotlin/Processor.kt b/koin/generator/src/androidMain/kotlin/Processor.kt similarity index 100% rename from koin/generator/src/main/kotlin/Processor.kt rename to koin/generator/src/androidMain/kotlin/Processor.kt diff --git a/koin/generator/src/main/kotlin/Provider.kt b/koin/generator/src/androidMain/kotlin/Provider.kt similarity index 100% rename from koin/generator/src/main/kotlin/Provider.kt rename to koin/generator/src/androidMain/kotlin/Provider.kt diff --git a/koin/generator/src/main/resources/META-INF/services/com.google.devtools.ksp.processing.SymbolProcessorProvider b/koin/generator/src/androidMain/resources/META-INF/services/com.google.devtools.ksp.processing.SymbolProcessorProvider similarity index 100% rename from koin/generator/src/main/resources/META-INF/services/com.google.devtools.ksp.processing.SymbolProcessorProvider rename to koin/generator/src/androidMain/resources/META-INF/services/com.google.devtools.ksp.processing.SymbolProcessorProvider diff --git a/koin/generator/test/src/main/AndroidManifest.xml b/koin/generator/test/src/androidMain/AndroidManifest.xml similarity index 100% rename from koin/generator/test/src/main/AndroidManifest.xml rename to koin/generator/test/src/androidMain/AndroidManifest.xml diff --git a/koin/src/main/AndroidManifest.xml b/koin/src/androidMain/AndroidManifest.xml similarity index 100% rename from koin/src/main/AndroidManifest.xml rename to koin/src/androidMain/AndroidManifest.xml diff --git a/ktor/client/src/main/AndroidManifest.xml b/ktor/client/src/androidMain/AndroidManifest.xml similarity index 100% rename from ktor/client/src/main/AndroidManifest.xml rename to ktor/client/src/androidMain/AndroidManifest.xml diff --git a/ktor/common/src/main/AndroidManifest.xml b/ktor/common/src/androidMain/AndroidManifest.xml similarity index 100% rename from ktor/common/src/main/AndroidManifest.xml rename to ktor/common/src/androidMain/AndroidManifest.xml diff --git a/language_codes/generator/src/main/kotlin/Main.kt b/language_codes/generator/src/androidMain/kotlin/Main.kt similarity index 100% rename from language_codes/generator/src/main/kotlin/Main.kt rename to language_codes/generator/src/androidMain/kotlin/Main.kt diff --git a/language_codes/src/main/AndroidManifest.xml b/language_codes/src/androidMain/AndroidManifest.xml similarity index 100% rename from language_codes/src/main/AndroidManifest.xml rename to language_codes/src/androidMain/AndroidManifest.xml diff --git a/local.migrate.folder.sh b/local.migrate.folder.sh new file mode 100755 index 00000000000..13642e7ff0f --- /dev/null +++ b/local.migrate.folder.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +for folder in $(find . -depth -type d -name "main"); +do + newFolder="`echo $folder | sed 's/main/androidMain/g'`" + mv $folder "$newFolder" +done diff --git a/matrix/src/main/AndroidManifest.xml b/matrix/src/androidMain/AndroidManifest.xml similarity index 100% rename from matrix/src/main/AndroidManifest.xml rename to matrix/src/androidMain/AndroidManifest.xml diff --git a/mime_types/src/main/AndroidManifest.xml b/mime_types/src/androidMain/AndroidManifest.xml similarity index 100% rename from mime_types/src/main/AndroidManifest.xml rename to mime_types/src/androidMain/AndroidManifest.xml diff --git a/mppAndroidProject.gradle b/mppAndroidProject.gradle index 1817e67049d..a03ed759f7e 100644 --- a/mppAndroidProject.gradle +++ b/mppAndroidProject.gradle @@ -4,7 +4,7 @@ project.group = "$group" apply from: "$publishGradlePath" kotlin { - android { + androidTarget { publishAllLibraryVariants() } diff --git a/mppProjectWithSerialization.gradle b/mppProjectWithSerialization.gradle index c242d24c0fb..9d508abc111 100644 --- a/mppProjectWithSerialization.gradle +++ b/mppProjectWithSerialization.gradle @@ -15,7 +15,7 @@ kotlin { browser() nodejs() } - android { + androidTarget { publishAllLibraryVariants() } linuxX64() diff --git a/mppProjectWithSerializationAndCompose.gradle b/mppProjectWithSerializationAndCompose.gradle index 222d59ae822..589aa293149 100644 --- a/mppProjectWithSerializationAndCompose.gradle +++ b/mppProjectWithSerializationAndCompose.gradle @@ -15,7 +15,7 @@ kotlin { browser() nodejs() } - android { + androidTarget { publishAllLibraryVariants() } diff --git a/pagination/common/src/main/AndroidManifest.xml b/pagination/common/src/androidMain/AndroidManifest.xml similarity index 100% rename from pagination/common/src/main/AndroidManifest.xml rename to pagination/common/src/androidMain/AndroidManifest.xml diff --git a/pagination/ktor/common/src/main/AndroidManifest.xml b/pagination/ktor/common/src/androidMain/AndroidManifest.xml similarity index 100% rename from pagination/ktor/common/src/main/AndroidManifest.xml rename to pagination/ktor/common/src/androidMain/AndroidManifest.xml diff --git a/repos/cache/src/main/AndroidManifest.xml b/repos/cache/src/androidMain/AndroidManifest.xml similarity index 100% rename from repos/cache/src/main/AndroidManifest.xml rename to repos/cache/src/androidMain/AndroidManifest.xml diff --git a/repos/common/src/main/AndroidManifest.xml b/repos/common/src/androidMain/AndroidManifest.xml similarity index 100% rename from repos/common/src/main/AndroidManifest.xml rename to repos/common/src/androidMain/AndroidManifest.xml diff --git a/repos/common/src/main/kotlin/dev/inmo/micro_utils/repos/ColumnType.kt b/repos/common/src/androidMain/kotlin/dev/inmo/micro_utils/repos/ColumnType.kt similarity index 100% rename from repos/common/src/main/kotlin/dev/inmo/micro_utils/repos/ColumnType.kt rename to repos/common/src/androidMain/kotlin/dev/inmo/micro_utils/repos/ColumnType.kt diff --git a/repos/common/src/main/kotlin/dev/inmo/micro_utils/repos/ContentValuesOf.kt b/repos/common/src/androidMain/kotlin/dev/inmo/micro_utils/repos/ContentValuesOf.kt similarity index 100% rename from repos/common/src/main/kotlin/dev/inmo/micro_utils/repos/ContentValuesOf.kt rename to repos/common/src/androidMain/kotlin/dev/inmo/micro_utils/repos/ContentValuesOf.kt diff --git a/repos/common/src/main/kotlin/dev/inmo/micro_utils/repos/CursorIterator.kt b/repos/common/src/androidMain/kotlin/dev/inmo/micro_utils/repos/CursorIterator.kt similarity index 100% rename from repos/common/src/main/kotlin/dev/inmo/micro_utils/repos/CursorIterator.kt rename to repos/common/src/androidMain/kotlin/dev/inmo/micro_utils/repos/CursorIterator.kt diff --git a/repos/common/src/main/kotlin/dev/inmo/micro_utils/repos/CursorMapping.kt b/repos/common/src/androidMain/kotlin/dev/inmo/micro_utils/repos/CursorMapping.kt similarity index 100% rename from repos/common/src/main/kotlin/dev/inmo/micro_utils/repos/CursorMapping.kt rename to repos/common/src/androidMain/kotlin/dev/inmo/micro_utils/repos/CursorMapping.kt diff --git a/repos/common/src/main/kotlin/dev/inmo/micro_utils/repos/DatabaseCoroutineContext.kt b/repos/common/src/androidMain/kotlin/dev/inmo/micro_utils/repos/DatabaseCoroutineContext.kt similarity index 100% rename from repos/common/src/main/kotlin/dev/inmo/micro_utils/repos/DatabaseCoroutineContext.kt rename to repos/common/src/androidMain/kotlin/dev/inmo/micro_utils/repos/DatabaseCoroutineContext.kt diff --git a/repos/common/src/main/kotlin/dev/inmo/micro_utils/repos/DatabaseOperations.kt b/repos/common/src/androidMain/kotlin/dev/inmo/micro_utils/repos/DatabaseOperations.kt similarity index 100% rename from repos/common/src/main/kotlin/dev/inmo/micro_utils/repos/DatabaseOperations.kt rename to repos/common/src/androidMain/kotlin/dev/inmo/micro_utils/repos/DatabaseOperations.kt diff --git a/repos/common/src/main/kotlin/dev/inmo/micro_utils/repos/DatabasePaginationExtensions.kt b/repos/common/src/androidMain/kotlin/dev/inmo/micro_utils/repos/DatabasePaginationExtensions.kt similarity index 100% rename from repos/common/src/main/kotlin/dev/inmo/micro_utils/repos/DatabasePaginationExtensions.kt rename to repos/common/src/androidMain/kotlin/dev/inmo/micro_utils/repos/DatabasePaginationExtensions.kt diff --git a/repos/common/src/main/kotlin/dev/inmo/micro_utils/repos/DatabaseTransactions.kt b/repos/common/src/androidMain/kotlin/dev/inmo/micro_utils/repos/DatabaseTransactions.kt similarity index 100% rename from repos/common/src/main/kotlin/dev/inmo/micro_utils/repos/DatabaseTransactions.kt rename to repos/common/src/androidMain/kotlin/dev/inmo/micro_utils/repos/DatabaseTransactions.kt diff --git a/repos/common/src/main/kotlin/dev/inmo/micro_utils/repos/InternalId.kt b/repos/common/src/androidMain/kotlin/dev/inmo/micro_utils/repos/InternalId.kt similarity index 100% rename from repos/common/src/main/kotlin/dev/inmo/micro_utils/repos/InternalId.kt rename to repos/common/src/androidMain/kotlin/dev/inmo/micro_utils/repos/InternalId.kt diff --git a/repos/common/src/main/kotlin/dev/inmo/micro_utils/repos/StandardSQLHelper.kt b/repos/common/src/androidMain/kotlin/dev/inmo/micro_utils/repos/StandardSQLHelper.kt similarity index 100% rename from repos/common/src/main/kotlin/dev/inmo/micro_utils/repos/StandardSQLHelper.kt rename to repos/common/src/androidMain/kotlin/dev/inmo/micro_utils/repos/StandardSQLHelper.kt diff --git a/repos/common/src/main/kotlin/dev/inmo/micro_utils/repos/crud/AbstractAndroidCRUDRepo.kt b/repos/common/src/androidMain/kotlin/dev/inmo/micro_utils/repos/crud/AbstractAndroidCRUDRepo.kt similarity index 100% rename from repos/common/src/main/kotlin/dev/inmo/micro_utils/repos/crud/AbstractAndroidCRUDRepo.kt rename to repos/common/src/androidMain/kotlin/dev/inmo/micro_utils/repos/crud/AbstractAndroidCRUDRepo.kt diff --git a/repos/common/src/main/kotlin/dev/inmo/micro_utils/repos/crud/AbstractMutableAndroidCRUDRepo.kt b/repos/common/src/androidMain/kotlin/dev/inmo/micro_utils/repos/crud/AbstractMutableAndroidCRUDRepo.kt similarity index 100% rename from repos/common/src/main/kotlin/dev/inmo/micro_utils/repos/crud/AbstractMutableAndroidCRUDRepo.kt rename to repos/common/src/androidMain/kotlin/dev/inmo/micro_utils/repos/crud/AbstractMutableAndroidCRUDRepo.kt diff --git a/repos/common/src/main/kotlin/dev/inmo/micro_utils/repos/keyvalue/KeyValueStore.kt b/repos/common/src/androidMain/kotlin/dev/inmo/micro_utils/repos/keyvalue/KeyValueStore.kt similarity index 100% rename from repos/common/src/main/kotlin/dev/inmo/micro_utils/repos/keyvalue/KeyValueStore.kt rename to repos/common/src/androidMain/kotlin/dev/inmo/micro_utils/repos/keyvalue/KeyValueStore.kt diff --git a/repos/common/src/main/kotlin/dev/inmo/micro_utils/repos/onetomany/OneToManyAndroidRepo.kt b/repos/common/src/androidMain/kotlin/dev/inmo/micro_utils/repos/onetomany/OneToManyAndroidRepo.kt similarity index 100% rename from repos/common/src/main/kotlin/dev/inmo/micro_utils/repos/onetomany/OneToManyAndroidRepo.kt rename to repos/common/src/androidMain/kotlin/dev/inmo/micro_utils/repos/onetomany/OneToManyAndroidRepo.kt diff --git a/repos/common/src/main/kotlin/dev/inmo/micro_utils/repos/versions/AndroidSQLStandardVersionsRepoProxy.kt b/repos/common/src/androidMain/kotlin/dev/inmo/micro_utils/repos/versions/AndroidSQLStandardVersionsRepoProxy.kt similarity index 100% rename from repos/common/src/main/kotlin/dev/inmo/micro_utils/repos/versions/AndroidSQLStandardVersionsRepoProxy.kt rename to repos/common/src/androidMain/kotlin/dev/inmo/micro_utils/repos/versions/AndroidSQLStandardVersionsRepoProxy.kt diff --git a/repos/common/src/main/kotlin/dev/inmo/micro_utils/repos/versions/AndroidSharedPreferencesStandardVersionsRepoProxy.kt b/repos/common/src/androidMain/kotlin/dev/inmo/micro_utils/repos/versions/AndroidSharedPreferencesStandardVersionsRepoProxy.kt similarity index 100% rename from repos/common/src/main/kotlin/dev/inmo/micro_utils/repos/versions/AndroidSharedPreferencesStandardVersionsRepoProxy.kt rename to repos/common/src/androidMain/kotlin/dev/inmo/micro_utils/repos/versions/AndroidSharedPreferencesStandardVersionsRepoProxy.kt diff --git a/repos/generator/src/main/kotlin/Processor.kt b/repos/generator/src/androidMain/kotlin/Processor.kt similarity index 100% rename from repos/generator/src/main/kotlin/Processor.kt rename to repos/generator/src/androidMain/kotlin/Processor.kt diff --git a/repos/generator/src/main/kotlin/Provider.kt b/repos/generator/src/androidMain/kotlin/Provider.kt similarity index 100% rename from repos/generator/src/main/kotlin/Provider.kt rename to repos/generator/src/androidMain/kotlin/Provider.kt diff --git a/repos/generator/src/main/resources/META-INF/services/com.google.devtools.ksp.processing.SymbolProcessorProvider b/repos/generator/src/androidMain/resources/META-INF/services/com.google.devtools.ksp.processing.SymbolProcessorProvider similarity index 100% rename from repos/generator/src/main/resources/META-INF/services/com.google.devtools.ksp.processing.SymbolProcessorProvider rename to repos/generator/src/androidMain/resources/META-INF/services/com.google.devtools.ksp.processing.SymbolProcessorProvider diff --git a/repos/generator/test/src/main/AndroidManifest.xml b/repos/generator/test/src/androidMain/AndroidManifest.xml similarity index 100% rename from repos/generator/test/src/main/AndroidManifest.xml rename to repos/generator/test/src/androidMain/AndroidManifest.xml diff --git a/repos/inmemory/src/main/AndroidManifest.xml b/repos/inmemory/src/androidMain/AndroidManifest.xml similarity index 100% rename from repos/inmemory/src/main/AndroidManifest.xml rename to repos/inmemory/src/androidMain/AndroidManifest.xml diff --git a/repos/ktor/client/src/main/AndroidManifest.xml b/repos/ktor/client/src/androidMain/AndroidManifest.xml similarity index 100% rename from repos/ktor/client/src/main/AndroidManifest.xml rename to repos/ktor/client/src/androidMain/AndroidManifest.xml diff --git a/repos/ktor/common/src/main/AndroidManifest.xml b/repos/ktor/common/src/androidMain/AndroidManifest.xml similarity index 100% rename from repos/ktor/common/src/main/AndroidManifest.xml rename to repos/ktor/common/src/androidMain/AndroidManifest.xml diff --git a/safe_wrapper/src/main/AndroidManifest.xml b/safe_wrapper/src/androidMain/AndroidManifest.xml similarity index 100% rename from safe_wrapper/src/main/AndroidManifest.xml rename to safe_wrapper/src/androidMain/AndroidManifest.xml diff --git a/selector/common/src/main/AndroidManifest.xml b/selector/common/src/androidMain/AndroidManifest.xml similarity index 100% rename from selector/common/src/main/AndroidManifest.xml rename to selector/common/src/androidMain/AndroidManifest.xml diff --git a/serialization/base64/src/main/AndroidManifest.xml b/serialization/base64/src/androidMain/AndroidManifest.xml similarity index 100% rename from serialization/base64/src/main/AndroidManifest.xml rename to serialization/base64/src/androidMain/AndroidManifest.xml diff --git a/serialization/encapsulator/src/main/AndroidManifest.xml b/serialization/encapsulator/src/androidMain/AndroidManifest.xml similarity index 100% rename from serialization/encapsulator/src/main/AndroidManifest.xml rename to serialization/encapsulator/src/androidMain/AndroidManifest.xml diff --git a/serialization/mapper/src/main/AndroidManifest.xml b/serialization/mapper/src/androidMain/AndroidManifest.xml similarity index 100% rename from serialization/mapper/src/main/AndroidManifest.xml rename to serialization/mapper/src/androidMain/AndroidManifest.xml diff --git a/serialization/typed_serializer/src/main/AndroidManifest.xml b/serialization/typed_serializer/src/androidMain/AndroidManifest.xml similarity index 100% rename from serialization/typed_serializer/src/main/AndroidManifest.xml rename to serialization/typed_serializer/src/androidMain/AndroidManifest.xml diff --git a/startup/template/client/src/main/AndroidManifest.xml b/startup/template/client/src/androidMain/AndroidManifest.xml similarity index 100% rename from startup/template/client/src/main/AndroidManifest.xml rename to startup/template/client/src/androidMain/AndroidManifest.xml diff --git a/startup/template/client/src/main/kotlin/ClientAndroidPlugin.kt b/startup/template/client/src/androidMain/kotlin/ClientAndroidPlugin.kt similarity index 100% rename from startup/template/client/src/main/kotlin/ClientAndroidPlugin.kt rename to startup/template/client/src/androidMain/kotlin/ClientAndroidPlugin.kt diff --git a/startup/template/common/src/main/AndroidManifest.xml b/startup/template/common/src/androidMain/AndroidManifest.xml similarity index 100% rename from startup/template/common/src/main/AndroidManifest.xml rename to startup/template/common/src/androidMain/AndroidManifest.xml diff --git a/startup/template/common/src/main/kotlin/CommonAndroidPlugin.kt b/startup/template/common/src/androidMain/kotlin/CommonAndroidPlugin.kt similarity index 100% rename from startup/template/common/src/main/kotlin/CommonAndroidPlugin.kt rename to startup/template/common/src/androidMain/kotlin/CommonAndroidPlugin.kt