mirror of https://github.com/usbharu/Hideout.git
chore: Kotlin 2.0に対応
This commit is contained in:
parent
d0da23ee90
commit
56389c73aa
|
@ -26,8 +26,8 @@ open class Delete : Object, HasId, HasActor {
|
|||
@JsonProperty("object")
|
||||
val apObject: Object
|
||||
val published: String
|
||||
override val actor: String
|
||||
override val id: String
|
||||
override var actor: String = ""
|
||||
override var id: String = ""
|
||||
|
||||
constructor(
|
||||
type: List<String> = emptyList(),
|
||||
|
|
|
@ -18,10 +18,10 @@ package dev.usbharu.hideout.application.infrastructure.exposed
|
|||
|
||||
import org.jetbrains.exposed.sql.*
|
||||
|
||||
fun <S> Query.withPagination(page: Page, exp: ExpressionWithColumnType<S>): PaginationList<ResultRow, S> {
|
||||
fun <S : Any> Query.withPagination(page: Page, exp: ExpressionWithColumnType<S>): PaginationList<ResultRow, S> {
|
||||
page.limit?.let { limit(it) }
|
||||
val resultRows = if (page.minId != null) {
|
||||
page.maxId?.let { andWhere { exp.less(it) } }
|
||||
page.maxId?.let { it: Long -> andWhere { exp.less(it) } }
|
||||
andWhere { exp.greater(page.minId!!) }
|
||||
reversed()
|
||||
} else {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[versions]
|
||||
|
||||
kotlin = "1.9.24"
|
||||
kotlin = "2.0.0"
|
||||
ktor = "2.3.11"
|
||||
exposed = "0.50.1"
|
||||
javacv-ffmpeg = "6.1.1-1.5.10"
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
plugins {
|
||||
alias(libs.plugins.kotlin.jvm)
|
||||
// alias(libs.plugins.kotlin.jvm)
|
||||
id("org.jetbrains.kotlin.jvm") version "1.9.24"
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -2,4 +2,4 @@ kotlin.code.style=official
|
|||
org.gradle.daemon=true
|
||||
org.gradle.parallel=true
|
||||
org.gradle.configureondemand=true
|
||||
|
||||
#ksp.useKSP2=true
|
|
@ -1,5 +1,6 @@
|
|||
plugins {
|
||||
alias(libs.plugins.kotlin.jvm)
|
||||
// alias(libs.plugins.kotlin.jvm)
|
||||
kotlin("jvm")
|
||||
id("com.google.protobuf") version "0.9.4"
|
||||
id("com.google.devtools.ksp") version "1.9.24-1.0.20"
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue