diff --git a/src/main/kotlin/app/revanced/api/command/StartAPICommand.kt b/src/main/kotlin/app/revanced/api/command/StartAPICommand.kt index f337ce5..826a1eb 100644 --- a/src/main/kotlin/app/revanced/api/command/StartAPICommand.kt +++ b/src/main/kotlin/app/revanced/api/command/StartAPICommand.kt @@ -2,9 +2,9 @@ package app.revanced.api.command import app.revanced.api.configuration.configureDependencies import app.revanced.api.configuration.configureHTTP +import app.revanced.api.configuration.configureRouting import app.revanced.api.configuration.configureSecurity import app.revanced.api.configuration.configureSerialization -import app.revanced.api.configuration.routing.configureRouting import io.ktor.server.engine.* import io.ktor.server.jetty.* import picocli.CommandLine diff --git a/src/main/kotlin/app/revanced/api/configuration/routing/Routing.kt b/src/main/kotlin/app/revanced/api/configuration/Routing.kt similarity index 61% rename from src/main/kotlin/app/revanced/api/configuration/routing/Routing.kt rename to src/main/kotlin/app/revanced/api/configuration/Routing.kt index 61e1edb..1aee522 100644 --- a/src/main/kotlin/app/revanced/api/configuration/routing/Routing.kt +++ b/src/main/kotlin/app/revanced/api/configuration/Routing.kt @@ -1,10 +1,10 @@ -package app.revanced.api.configuration.routing +package app.revanced.api.configuration import app.revanced.api.configuration.repository.ConfigurationRepository -import app.revanced.api.configuration.routing.routes.announcementsRoute -import app.revanced.api.configuration.routing.routes.oldApiRoute -import app.revanced.api.configuration.routing.routes.patchesRoute -import app.revanced.api.configuration.routing.routes.rootRoute +import app.revanced.api.configuration.routes.announcementsRoute +import app.revanced.api.configuration.routes.oldApiRoute +import app.revanced.api.configuration.routes.patchesRoute +import app.revanced.api.configuration.routes.rootRoute import io.ktor.server.application.* import io.ktor.server.routing.* import org.koin.ktor.ext.get diff --git a/src/main/kotlin/app/revanced/api/configuration/routing/routes/Announcements.kt b/src/main/kotlin/app/revanced/api/configuration/routes/Announcements.kt similarity index 98% rename from src/main/kotlin/app/revanced/api/configuration/routing/routes/Announcements.kt rename to src/main/kotlin/app/revanced/api/configuration/routes/Announcements.kt index 2901942..7630b6b 100644 --- a/src/main/kotlin/app/revanced/api/configuration/routing/routes/Announcements.kt +++ b/src/main/kotlin/app/revanced/api/configuration/routes/Announcements.kt @@ -1,4 +1,4 @@ -package app.revanced.api.configuration.routing.routes +package app.revanced.api.configuration.routes import app.revanced.api.configuration.respondOrNotFound import app.revanced.api.configuration.schema.APIAnnouncement diff --git a/src/main/kotlin/app/revanced/api/configuration/routing/routes/ApiRoute.kt b/src/main/kotlin/app/revanced/api/configuration/routes/ApiRoute.kt similarity index 96% rename from src/main/kotlin/app/revanced/api/configuration/routing/routes/ApiRoute.kt rename to src/main/kotlin/app/revanced/api/configuration/routes/ApiRoute.kt index 2e1ede3..3271b81 100644 --- a/src/main/kotlin/app/revanced/api/configuration/routing/routes/ApiRoute.kt +++ b/src/main/kotlin/app/revanced/api/configuration/routes/ApiRoute.kt @@ -1,4 +1,4 @@ -package app.revanced.api.configuration.routing.routes +package app.revanced.api.configuration.routes import app.revanced.api.configuration.respondOrNotFound import app.revanced.api.configuration.services.ApiService diff --git a/src/main/kotlin/app/revanced/api/configuration/routing/routes/OldApi.kt b/src/main/kotlin/app/revanced/api/configuration/routes/OldApi.kt similarity index 89% rename from src/main/kotlin/app/revanced/api/configuration/routing/routes/OldApi.kt rename to src/main/kotlin/app/revanced/api/configuration/routes/OldApi.kt index f214f26..e72f470 100644 --- a/src/main/kotlin/app/revanced/api/configuration/routing/routes/OldApi.kt +++ b/src/main/kotlin/app/revanced/api/configuration/routes/OldApi.kt @@ -1,4 +1,4 @@ -package app.revanced.api.configuration.routing.routes +package app.revanced.api.configuration.routes import app.revanced.api.configuration.services.OldApiService import io.ktor.server.application.* diff --git a/src/main/kotlin/app/revanced/api/configuration/routing/routes/PatchesRoute.kt b/src/main/kotlin/app/revanced/api/configuration/routes/PatchesRoute.kt similarity index 93% rename from src/main/kotlin/app/revanced/api/configuration/routing/routes/PatchesRoute.kt rename to src/main/kotlin/app/revanced/api/configuration/routes/PatchesRoute.kt index ac3445f..a5811bf 100644 --- a/src/main/kotlin/app/revanced/api/configuration/routing/routes/PatchesRoute.kt +++ b/src/main/kotlin/app/revanced/api/configuration/routes/PatchesRoute.kt @@ -1,4 +1,4 @@ -package app.revanced.api.configuration.routing.routes +package app.revanced.api.configuration.routes import app.revanced.api.configuration.services.PatchesService import io.ktor.http.*