diff --git a/build.gradle.kts b/build.gradle.kts index 25ac1ba437..7c48c106c0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,7 +4,6 @@ import org.jetbrains.exposed.gradle.configureMavenCentralMetadata import org.jetbrains.exposed.gradle.testDb plugins { - kotlin("jvm") apply true id(libs.plugins.detekt.get().pluginId) apply true alias(libs.plugins.binary.compatibility.validator) id(libs.plugins.docker.compose.get().pluginId) @@ -72,6 +71,7 @@ subprojects { subprojects { if (name == "exposed-bom") return@subprojects + if (name == "exposed-core") return@subprojects apply(plugin = rootProject.libs.plugins.jvm.get().pluginId) testDb("h2_v2") { diff --git a/exposed-core/build.gradle.kts b/exposed-core/build.gradle.kts index d9c294c735..0e753630e1 100644 --- a/exposed-core/build.gradle.kts +++ b/exposed-core/build.gradle.kts @@ -1,6 +1,5 @@ plugins { - kotlin("jvm") - + kotlin("multiplatform") alias(libs.plugins.dokka) } @@ -8,18 +7,28 @@ repositories { mavenCentral() } -kotlin { +kotlin{ jvmToolchain(8) - - compilerOptions { - optIn.add("kotlin.time.ExperimentalTime") + jvm { + compilerOptions { + optIn.add("kotlin.time.ExperimentalTime") + } } -} + applyDefaultHierarchyTemplate() -dependencies { - api(kotlin("stdlib")) - api(kotlin("reflect")) - api(libs.kotlinx.coroutines) - api(libs.kotlinx.jvm.datetime) - api(libs.slf4j) + sourceSets { + val commonMain by getting { + dependencies { + api(kotlin("stdlib")) + api(libs.kotlinx.coroutines) + } + } + val jvmMain by getting { + dependencies { + api(kotlin("reflect")) + api(libs.kotlinx.jvm.datetime) + api(libs.slf4j) + } + } + } } diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/Annotations.kt b/exposed-core/src/commonMain/kotlin/org/jetbrains/exposed/v1/core/Annotations.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/Annotations.kt rename to exposed-core/src/commonMain/kotlin/org/jetbrains/exposed/v1/core/Annotations.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/ColumnDiff.kt b/exposed-core/src/commonMain/kotlin/org/jetbrains/exposed/v1/core/ColumnDiff.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/ColumnDiff.kt rename to exposed-core/src/commonMain/kotlin/org/jetbrains/exposed/v1/core/ColumnDiff.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/AbstractQuery.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/AbstractQuery.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/AbstractQuery.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/AbstractQuery.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/Alias.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/Alias.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/Alias.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/Alias.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/Column.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/Column.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/Column.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/Column.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/ColumnType.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/ColumnType.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/ColumnType.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/ColumnType.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/CompositeColumn.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/CompositeColumn.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/CompositeColumn.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/CompositeColumn.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/Constraints.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/Constraints.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/Constraints.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/Constraints.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/DatabaseApi.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/DatabaseApi.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/DatabaseApi.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/DatabaseApi.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/DatabaseConfig.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/DatabaseConfig.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/DatabaseConfig.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/DatabaseConfig.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/Exceptions.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/Exceptions.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/Exceptions.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/Exceptions.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/ExplainQuery.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/ExplainQuery.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/ExplainQuery.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/ExplainQuery.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/Expression.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/Expression.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/Expression.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/Expression.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/Function.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/Function.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/Function.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/Function.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/FunctionBuilder.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/FunctionBuilder.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/FunctionBuilder.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/FunctionBuilder.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/LiteralOp.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/LiteralOp.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/LiteralOp.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/LiteralOp.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/Op.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/Op.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/Op.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/Op.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/OpBuilder.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/OpBuilder.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/OpBuilder.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/OpBuilder.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/QueryParameter.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/QueryParameter.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/QueryParameter.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/QueryParameter.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/ResultRow.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/ResultRow.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/ResultRow.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/ResultRow.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/SQLExpressionBuilder.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/SQLExpressionBuilder.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/SQLExpressionBuilder.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/SQLExpressionBuilder.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/SQLLog.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/SQLLog.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/SQLLog.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/SQLLog.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/Schema.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/Schema.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/Schema.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/Schema.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/SchemaUtilityApi.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/SchemaUtilityApi.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/SchemaUtilityApi.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/SchemaUtilityApi.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/Sequence.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/Sequence.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/Sequence.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/Sequence.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/SortOrder.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/SortOrder.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/SortOrder.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/SortOrder.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/Table.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/Table.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/Table.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/Table.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/TableDepthGraph.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/TableDepthGraph.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/TableDepthGraph.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/TableDepthGraph.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/Transaction.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/Transaction.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/Transaction.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/Transaction.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/Version.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/Version.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/Version.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/Version.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/WindowFunction.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/WindowFunction.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/WindowFunction.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/WindowFunction.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/WindowFunctionBuilder.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/WindowFunctionBuilder.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/WindowFunctionBuilder.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/WindowFunctionBuilder.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/dao/id/CompositeID.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/dao/id/CompositeID.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/dao/id/CompositeID.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/dao/id/CompositeID.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/dao/id/EntityID.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/dao/id/EntityID.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/dao/id/EntityID.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/dao/id/EntityID.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/dao/id/IdTable.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/dao/id/IdTable.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/dao/id/IdTable.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/dao/id/IdTable.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/datetime/DurationColumnType.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/datetime/DurationColumnType.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/datetime/DurationColumnType.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/datetime/DurationColumnType.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/datetime/InstantColumnType.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/datetime/InstantColumnType.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/datetime/InstantColumnType.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/datetime/InstantColumnType.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/datetime/LocalDateColumnType.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/datetime/LocalDateColumnType.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/datetime/LocalDateColumnType.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/datetime/LocalDateColumnType.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/datetime/LocalDateTimeColumnType.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/datetime/LocalDateTimeColumnType.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/datetime/LocalDateTimeColumnType.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/datetime/LocalDateTimeColumnType.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/datetime/LocalTimeColumnType.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/datetime/LocalTimeColumnType.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/datetime/LocalTimeColumnType.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/datetime/LocalTimeColumnType.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/datetime/OffsetDateTimeColumnType.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/datetime/OffsetDateTimeColumnType.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/datetime/OffsetDateTimeColumnType.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/datetime/OffsetDateTimeColumnType.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/functions/array/ArrayFunctions.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/functions/array/ArrayFunctions.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/functions/array/ArrayFunctions.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/functions/array/ArrayFunctions.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/functions/math/MathFunctions.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/functions/math/MathFunctions.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/functions/math/MathFunctions.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/functions/math/MathFunctions.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/functions/math/TrigonometricalFunctions.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/functions/math/TrigonometricalFunctions.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/functions/math/TrigonometricalFunctions.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/functions/math/TrigonometricalFunctions.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/ops/AllAnyOps.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/ops/AllAnyOps.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/ops/AllAnyOps.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/ops/AllAnyOps.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/ops/InListOps.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/ops/InListOps.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/ops/InListOps.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/ops/InListOps.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/ops/InTableOp.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/ops/InTableOp.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/ops/InTableOp.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/ops/InTableOp.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/statements/BatchInsertStatement.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/statements/BatchInsertStatement.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/statements/BatchInsertStatement.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/statements/BatchInsertStatement.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/statements/BatchReplaceStatement.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/statements/BatchReplaceStatement.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/statements/BatchReplaceStatement.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/statements/BatchReplaceStatement.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/statements/BatchUpdateStatement.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/statements/BatchUpdateStatement.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/statements/BatchUpdateStatement.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/statements/BatchUpdateStatement.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/statements/BatchUpsertStatement.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/statements/BatchUpsertStatement.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/statements/BatchUpsertStatement.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/statements/BatchUpsertStatement.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/statements/DeleteStatement.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/statements/DeleteStatement.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/statements/DeleteStatement.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/statements/DeleteStatement.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/statements/InsertSelectStatement.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/statements/InsertSelectStatement.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/statements/InsertSelectStatement.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/statements/InsertSelectStatement.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/statements/InsertStatement.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/statements/InsertStatement.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/statements/InsertStatement.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/statements/InsertStatement.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/statements/MergeStatement.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/statements/MergeStatement.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/statements/MergeStatement.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/statements/MergeStatement.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/statements/ReplaceStatement.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/statements/ReplaceStatement.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/statements/ReplaceStatement.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/statements/ReplaceStatement.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/statements/ReturningStatement.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/statements/ReturningStatement.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/statements/ReturningStatement.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/statements/ReturningStatement.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/statements/SQLServerBatchInsertStatement.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/statements/SQLServerBatchInsertStatement.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/statements/SQLServerBatchInsertStatement.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/statements/SQLServerBatchInsertStatement.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/statements/Statement.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/statements/Statement.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/statements/Statement.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/statements/Statement.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/statements/StatementBuilder.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/statements/StatementBuilder.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/statements/StatementBuilder.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/statements/StatementBuilder.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/statements/StatementInterceptor.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/statements/StatementInterceptor.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/statements/StatementInterceptor.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/statements/StatementInterceptor.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/statements/UpdateBuilder.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/statements/UpdateBuilder.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/statements/UpdateBuilder.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/statements/UpdateBuilder.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/statements/UpdateStatement.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/statements/UpdateStatement.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/statements/UpdateStatement.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/statements/UpdateStatement.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/statements/UpsertStatement.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/statements/UpsertStatement.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/statements/UpsertStatement.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/statements/UpsertStatement.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/statements/api/ExposedBlob.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/statements/api/ExposedBlob.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/statements/api/ExposedBlob.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/statements/api/ExposedBlob.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/statements/api/ExposedDatabaseMetadata.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/statements/api/ExposedDatabaseMetadata.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/statements/api/ExposedDatabaseMetadata.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/statements/api/ExposedDatabaseMetadata.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/statements/api/ExposedMetadataUtils.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/statements/api/ExposedMetadataUtils.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/statements/api/ExposedMetadataUtils.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/statements/api/ExposedMetadataUtils.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/statements/api/ExposedSavepoint.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/statements/api/ExposedSavepoint.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/statements/api/ExposedSavepoint.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/statements/api/ExposedSavepoint.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/statements/api/IdentifierManagerApi.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/statements/api/IdentifierManagerApi.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/statements/api/IdentifierManagerApi.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/statements/api/IdentifierManagerApi.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/statements/api/PreparedStatementApi.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/statements/api/PreparedStatementApi.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/statements/api/PreparedStatementApi.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/statements/api/PreparedStatementApi.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/statements/api/ResultApi.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/statements/api/ResultApi.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/statements/api/ResultApi.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/statements/api/ResultApi.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/transactions/CoreTransactionManager.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/transactions/CoreTransactionManager.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/transactions/CoreTransactionManager.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/transactions/CoreTransactionManager.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/transactions/TransactionInterface.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/transactions/TransactionInterface.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/transactions/TransactionInterface.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/transactions/TransactionInterface.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/transactions/TransactionManagerApi.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/transactions/TransactionManagerApi.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/transactions/TransactionManagerApi.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/transactions/TransactionManagerApi.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/transactions/TransactionScope.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/transactions/TransactionScope.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/transactions/TransactionScope.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/transactions/TransactionScope.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/utils/CachableMapWithDefault.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/utils/CachableMapWithDefault.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/utils/CachableMapWithDefault.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/utils/CachableMapWithDefault.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/utils/CachableMapWithSuspendableDefault.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/utils/CachableMapWithSuspendableDefault.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/utils/CachableMapWithSuspendableDefault.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/utils/CachableMapWithSuspendableDefault.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/vendors/ColumnMetadata.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/vendors/ColumnMetadata.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/vendors/ColumnMetadata.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/vendors/ColumnMetadata.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/vendors/DataTypeProvider.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/vendors/DataTypeProvider.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/vendors/DataTypeProvider.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/vendors/DataTypeProvider.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/vendors/DatabaseDialect.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/vendors/DatabaseDialect.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/vendors/DatabaseDialect.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/vendors/DatabaseDialect.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/vendors/ForUpdateOption.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/vendors/ForUpdateOption.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/vendors/ForUpdateOption.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/vendors/ForUpdateOption.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/vendors/FunctionProvider.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/vendors/FunctionProvider.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/vendors/FunctionProvider.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/vendors/FunctionProvider.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/vendors/H2.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/vendors/H2.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/vendors/H2.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/vendors/H2.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/vendors/Keywords.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/vendors/Keywords.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/vendors/Keywords.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/vendors/Keywords.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/vendors/MariaDBDialect.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/vendors/MariaDBDialect.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/vendors/MariaDBDialect.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/vendors/MariaDBDialect.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/vendors/MysqlDialect.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/vendors/MysqlDialect.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/vendors/MysqlDialect.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/vendors/MysqlDialect.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/vendors/OracleDialect.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/vendors/OracleDialect.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/vendors/OracleDialect.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/vendors/OracleDialect.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/vendors/PostgreSQL.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/vendors/PostgreSQL.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/vendors/PostgreSQL.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/vendors/PostgreSQL.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/vendors/PrimaryKeyMetadata.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/vendors/PrimaryKeyMetadata.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/vendors/PrimaryKeyMetadata.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/vendors/PrimaryKeyMetadata.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/vendors/SQLServerDialect.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/vendors/SQLServerDialect.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/vendors/SQLServerDialect.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/vendors/SQLServerDialect.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/vendors/SQLiteDialect.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/vendors/SQLiteDialect.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/vendors/SQLiteDialect.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/vendors/SQLiteDialect.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/vendors/SchemaMetadata.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/vendors/SchemaMetadata.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/vendors/SchemaMetadata.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/vendors/SchemaMetadata.kt diff --git a/exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/vendors/VendorDialect.kt b/exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/vendors/VendorDialect.kt similarity index 100% rename from exposed-core/src/main/kotlin/org/jetbrains/exposed/v1/core/vendors/VendorDialect.kt rename to exposed-core/src/jvmMain/kotlin/org/jetbrains/exposed/v1/core/vendors/VendorDialect.kt