From 1fbff53dbd2c6afe55efd5eac1d4f7869e492a5b Mon Sep 17 00:00:00 2001 From: Infendro Date: Fri, 12 Dec 2025 21:59:18 +0100 Subject: [PATCH] refactor --- build.gradle.kts | 2 +- gradle/libs.versions.toml | 7 +++---- settings.gradle.kts | 2 +- src/main/kotlin/com/infendro/ktor/migration/Plugin.kt | 5 +---- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index c335732..3492295 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -12,9 +12,9 @@ plugins { } dependencies { + implementation(libs.migration) implementation(libs.ktor.server) implementation(libs.exposed) - implementation(libs.migration) } publishing { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1b5723f..e1f4550 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,13 +2,12 @@ kotlin = "2.2.10" ktor = "3.2.3" exposed = "0.61.0" -migration = "1.1.0" +migration = "1.1.1" [plugins] kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } [libraries] -ktor-server = { module = "io.ktor:ktor-server-core-jvm", version.ref = "ktor" } - -exposed = { module = "org.jetbrains.exposed:exposed-core", version.ref = "exposed" } migration = { module = "com.infendro:migration", version.ref = "migration" } +ktor-server = { module = "io.ktor:ktor-server-core-jvm", version.ref = "ktor" } +exposed = { module = "org.jetbrains.exposed:exposed-core", version.ref = "exposed" } diff --git a/settings.gradle.kts b/settings.gradle.kts index edad8fe..019a2ce 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1 +1 @@ -rootProject.name = "ktor-migration" +rootProject.name = "migration-ktor" diff --git a/src/main/kotlin/com/infendro/ktor/migration/Plugin.kt b/src/main/kotlin/com/infendro/ktor/migration/Plugin.kt index fe18fe0..028ea7c 100644 --- a/src/main/kotlin/com/infendro/ktor/migration/Plugin.kt +++ b/src/main/kotlin/com/infendro/ktor/migration/Plugin.kt @@ -1,11 +1,9 @@ package com.infendro.ktor.migration -import com.infendro.migration.Config import com.infendro.migration.migrate import io.ktor.server.application.* import org.jetbrains.exposed.sql.Transaction -@Suppress("UNUSED") val Migration = createApplicationPlugin( name = "Migration", createConfiguration = { MigrationConfig() }, @@ -14,9 +12,8 @@ val Migration = createApplicationPlugin( } class MigrationConfig { - internal val config = Config() + internal val config = com.infendro.migration.MigrationConfig() - @Suppress("UNUSED") fun migration( name: String, migrate: Transaction.() -> Unit,