mirror of
https://github.com/gotson/komga.git
synced 2025-01-08 11:47:47 +08:00
build: update dependencies
This commit is contained in:
parent
c1e48ada08
commit
9934a2fc36
@ -1,11 +1,12 @@
|
||||
plugins {
|
||||
run {
|
||||
val kotlinVersion = "1.4.20"
|
||||
val kotlinVersion = "1.4.31"
|
||||
kotlin("jvm") version kotlinVersion
|
||||
kotlin("plugin.spring") version kotlinVersion
|
||||
kotlin("kapt") version kotlinVersion
|
||||
}
|
||||
id("org.jlleitschuh.gradle.ktlint") version "9.4.1"
|
||||
id("org.jlleitschuh.gradle.ktlint") version "10.0.0"
|
||||
id("com.github.ben-manes.versions") version "0.38.0"
|
||||
}
|
||||
|
||||
allprojects {
|
||||
@ -13,6 +14,7 @@ allprojects {
|
||||
mavenCentral()
|
||||
}
|
||||
apply(plugin = "org.jlleitschuh.gradle.ktlint")
|
||||
apply(plugin = "com.github.ben-manes.versions")
|
||||
}
|
||||
|
||||
tasks.wrapper {
|
||||
|
@ -10,18 +10,16 @@ import org.springframework.boot.gradle.tasks.bundling.BootJar
|
||||
|
||||
plugins {
|
||||
run {
|
||||
val kotlinVersion = "1.4.20"
|
||||
kotlin("jvm")
|
||||
kotlin("plugin.spring")
|
||||
kotlin("kapt")
|
||||
}
|
||||
id("org.springframework.boot") version "2.4.3"
|
||||
id("com.github.ben-manes.versions") version "0.36.0"
|
||||
id("com.gorylenko.gradle-git-properties") version "2.2.4"
|
||||
id("com.rohanprabhu.kotlin-dsl-jooq") version "0.4.6"
|
||||
id("org.flywaydb.flyway") version "7.3.2"
|
||||
id("org.flywaydb.flyway") version "7.5.4"
|
||||
id("com.github.johnrengelman.processes") version "0.5.0"
|
||||
id("org.springdoc.openapi-gradle-plugin") version "1.3.0"
|
||||
id("org.springdoc.openapi-gradle-plugin") version "1.3.1"
|
||||
jacoco
|
||||
}
|
||||
|
||||
@ -48,12 +46,12 @@ dependencies {
|
||||
|
||||
implementation("org.flywaydb:flyway-core")
|
||||
|
||||
implementation("io.github.microutils:kotlin-logging-jvm:2.0.4")
|
||||
implementation("io.github.microutils:kotlin-logging-jvm:2.0.5")
|
||||
implementation("io.micrometer:micrometer-registry-influx")
|
||||
implementation("io.hawt:hawtio-springboot:2.12.1")
|
||||
implementation("io.hawt:hawtio-springboot:2.13.0")
|
||||
|
||||
run {
|
||||
val springdocVersion = "1.5.2"
|
||||
val springdocVersion = "1.5.5"
|
||||
implementation("org.springdoc:springdoc-openapi-ui:$springdocVersion")
|
||||
implementation("org.springdoc:springdoc-openapi-security:$springdocVersion")
|
||||
implementation("org.springdoc:springdoc-openapi-kotlin:$springdocVersion")
|
||||
@ -63,8 +61,8 @@ dependencies {
|
||||
implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
|
||||
implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-xml")
|
||||
|
||||
implementation("commons-io:commons-io:2.7")
|
||||
implementation("org.apache.commons:commons-lang3:3.11")
|
||||
implementation("commons-io:commons-io:2.8.0")
|
||||
implementation("org.apache.commons:commons-lang3:3.12.0")
|
||||
|
||||
implementation("com.ibm.icu:icu4j:68.2")
|
||||
|
||||
@ -76,8 +74,8 @@ dependencies {
|
||||
implementation("org.jsoup:jsoup:1.13.1")
|
||||
|
||||
implementation("net.coobird:thumbnailator:0.4.13")
|
||||
runtimeOnly("com.twelvemonkeys.imageio:imageio-jpeg:3.6.1")
|
||||
runtimeOnly("com.twelvemonkeys.imageio:imageio-tiff:3.6.1")
|
||||
runtimeOnly("com.twelvemonkeys.imageio:imageio-jpeg:3.6.3")
|
||||
runtimeOnly("com.twelvemonkeys.imageio:imageio-tiff:3.6.3")
|
||||
runtimeOnly(files("$projectDir/libs/webp-imageio-decoder-plugin-0.2.jar"))
|
||||
implementation("com.github.gotson:webp-imageio:0.2.0")
|
||||
// support for jpeg2000
|
||||
@ -86,7 +84,7 @@ dependencies {
|
||||
|
||||
implementation("com.jakewharton.byteunits:byteunits:0.9.1")
|
||||
|
||||
implementation("com.github.f4b6a3:tsid-creator:2.4.4")
|
||||
implementation("com.github.f4b6a3:tsid-creator:3.0.1")
|
||||
|
||||
runtimeOnly("com.h2database:h2:1.4.200")
|
||||
|
||||
@ -101,10 +99,10 @@ dependencies {
|
||||
}
|
||||
testImplementation("org.springframework.security:spring-security-test")
|
||||
testImplementation("com.ninja-squad:springmockk:3.0.1")
|
||||
testImplementation("io.mockk:mockk:1.10.4")
|
||||
testImplementation("com.google.jimfs:jimfs:1.1")
|
||||
testImplementation("io.mockk:mockk:1.10.6")
|
||||
testImplementation("com.google.jimfs:jimfs:1.2")
|
||||
|
||||
testImplementation("com.tngtech.archunit:archunit-junit5:0.15.0")
|
||||
testImplementation("com.tngtech.archunit:archunit-junit5:0.17.0")
|
||||
|
||||
developmentOnly("org.springframework.boot:spring-boot-devtools:2.4.3")
|
||||
}
|
||||
|
@ -16,7 +16,7 @@ class V20200810154730__thumbnails_part_2 : BaseJavaMigration() {
|
||||
|
||||
if (thumbnails.isNotEmpty()) {
|
||||
val parameters = thumbnails.map {
|
||||
arrayOf(TsidCreator.getTsidString256(), it["THUMBNAIL"], it["BOOK_ID"])
|
||||
arrayOf(TsidCreator.getTsid256().toString(), it["THUMBNAIL"], it["BOOK_ID"])
|
||||
}
|
||||
|
||||
jdbcTemplate.batchUpdate(
|
||||
|
@ -19,22 +19,22 @@ left join BOOK B on B.ID = m.BOOK_ID"""
|
||||
val parameters = bookMetadata
|
||||
.groupBy { it["SERIES_ID"] }
|
||||
.map { (seriesId, v) ->
|
||||
val ageRating = v.mapNotNull { it["AGE_RATING"] as Int? }.max()
|
||||
val ageRatingLock = v.mapNotNull { it["AGE_RATING_LOCK"] as Int? }.max()
|
||||
val ageRating = v.mapNotNull { it["AGE_RATING"] as Int? }.maxOrNull()
|
||||
val ageRatingLock = v.mapNotNull { it["AGE_RATING_LOCK"] as Int? }.maxOrNull()
|
||||
|
||||
val publisher =
|
||||
v.filter { (it["PUBLISHER"] as String).isNotEmpty() }
|
||||
.sortedByDescending { it["NUMBER_SORT"] as Double? }
|
||||
.map { it["PUBLISHER"] as String }
|
||||
.firstOrNull() ?: ""
|
||||
val publisherLock = v.mapNotNull { it["PUBLISHER_LOCK"] as Int? }.max()
|
||||
val publisherLock = v.mapNotNull { it["PUBLISHER_LOCK"] as Int? }.maxOrNull()
|
||||
|
||||
val readingDir =
|
||||
v.mapNotNull { it["READING_DIRECTION"] as String? }
|
||||
.groupingBy { it }
|
||||
.eachCount()
|
||||
.maxBy { it.value }?.key
|
||||
val readingDirLock = v.mapNotNull { it["READING_DIRECTION_LOCK"] as Int? }.max()
|
||||
.maxByOrNull { it.value }?.key
|
||||
val readingDirLock = v.mapNotNull { it["READING_DIRECTION_LOCK"] as Int? }.maxOrNull()
|
||||
|
||||
arrayOf(ageRating, ageRatingLock, publisher, publisherLock, readingDir, readingDirLock, seriesId)
|
||||
}
|
||||
|
@ -15,7 +15,7 @@ data class Book(
|
||||
val fileSize: Long = 0,
|
||||
val number: Int = 0,
|
||||
|
||||
val id: String = TsidCreator.getTsidString256(),
|
||||
val id: String = TsidCreator.getTsid256().toString(),
|
||||
val seriesId: String = "",
|
||||
val libraryId: String = "",
|
||||
|
||||
|
@ -21,7 +21,7 @@ data class KomgaUser(
|
||||
val rolePageStreaming: Boolean = true,
|
||||
val sharedLibrariesIds: Set<String> = emptySet(),
|
||||
val sharedAllLibraries: Boolean = true,
|
||||
val id: String = TsidCreator.getTsidString256(),
|
||||
val id: String = TsidCreator.getTsid256().toString(),
|
||||
override val createdDate: LocalDateTime = LocalDateTime.now(),
|
||||
override val lastModifiedDate: LocalDateTime = LocalDateTime.now()
|
||||
) : Auditable() {
|
||||
|
@ -19,7 +19,7 @@ data class Library(
|
||||
val scanForceModifiedTime: Boolean = false,
|
||||
val scanDeep: Boolean = false,
|
||||
|
||||
val id: String = TsidCreator.getTsidString256(),
|
||||
val id: String = TsidCreator.getTsid256().toString(),
|
||||
|
||||
override val createdDate: LocalDateTime = LocalDateTime.now(),
|
||||
override val lastModifiedDate: LocalDateTime = LocalDateTime.now()
|
||||
|
@ -9,7 +9,7 @@ data class ReadList(
|
||||
|
||||
val bookIds: SortedMap<Int, String> = sortedMapOf(),
|
||||
|
||||
val id: String = TsidCreator.getTsidString256(),
|
||||
val id: String = TsidCreator.getTsid256().toString(),
|
||||
|
||||
override val createdDate: LocalDateTime = LocalDateTime.now(),
|
||||
override val lastModifiedDate: LocalDateTime = LocalDateTime.now(),
|
||||
|
@ -11,7 +11,7 @@ data class Series(
|
||||
val url: URL,
|
||||
val fileLastModified: LocalDateTime,
|
||||
|
||||
val id: String = TsidCreator.getTsidString256(),
|
||||
val id: String = TsidCreator.getTsid256().toString(),
|
||||
val libraryId: String = "",
|
||||
|
||||
override val createdDate: LocalDateTime = LocalDateTime.now(),
|
||||
|
@ -9,7 +9,7 @@ data class SeriesCollection(
|
||||
|
||||
val seriesIds: List<String> = emptyList(),
|
||||
|
||||
val id: String = TsidCreator.getTsidString256(),
|
||||
val id: String = TsidCreator.getTsid256().toString(),
|
||||
|
||||
override val createdDate: LocalDateTime = LocalDateTime.now(),
|
||||
override val lastModifiedDate: LocalDateTime = LocalDateTime.now(),
|
||||
|
@ -10,7 +10,7 @@ data class ThumbnailBook(
|
||||
val selected: Boolean = false,
|
||||
val type: Type,
|
||||
|
||||
val id: String = TsidCreator.getTsidString256(),
|
||||
val id: String = TsidCreator.getTsid256().toString(),
|
||||
val bookId: String = "",
|
||||
|
||||
override val createdDate: LocalDateTime = LocalDateTime.now(),
|
||||
|
@ -8,7 +8,7 @@ data class ThumbnailSeries(
|
||||
val url: URL,
|
||||
val selected: Boolean = false,
|
||||
|
||||
val id: String = TsidCreator.getTsidString256(),
|
||||
val id: String = TsidCreator.getTsid256().toString(),
|
||||
val seriesId: String = "",
|
||||
|
||||
override val createdDate: LocalDateTime = LocalDateTime.now(),
|
||||
|
@ -25,7 +25,7 @@ fun makeSeries(name: String, libraryId: String = ""): Series {
|
||||
)
|
||||
}
|
||||
|
||||
fun makeLibrary(name: String = "default", url: String = "file:/$name", id: String = TsidCreator.getTsidString256()): Library {
|
||||
fun makeLibrary(name: String = "default", url: String = "file:/$name", id: String = TsidCreator.getTsid256().toString()): Library {
|
||||
return Library(name, URL(url), id = id)
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user