usbharu
/
Hideout
mirror of https://github.com/usbharu/Hideout.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into ssr-client

This commit is contained in:
usbharu 2024-09-06 00:30:28 +09:00 committed by GitHub
parent c8a8e77021 fc8cb156da
commit ed41c025cf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/pull-request-merge-check.yml vendored
View File

@ -78,7 +78,7 @@ jobs:
- name: Add coverage report to PR - name: Add coverage report to PR
if: always() if: always()
id: kover id: kover
uses: madrapps/jacoco-report@v1.6.1 uses: madrapps/jacoco-report@v1.7.0
with: with:
paths: | paths: |
${{ github.workspace }}/hideout-core/build/reports/kover/report.xml ${{ github.workspace }}/hideout-core/build/reports/kover/report.xml

2
docker-compose.yml
View File

@ -11,6 +11,6 @@ services:
POSTGRES_DB: "hideout" POSTGRES_DB: "hideout"
mongodb: mongodb:
image: mongo:7.0.12 image: mongo:7.0.14
ports: ports:
- "27017:27017" - "27017:27017"

12
libs.versions.toml
View File

@ -2,15 +2,15 @@
kotlin = "2.0.20" kotlin = "2.0.20"
ktor = "2.3.12" ktor = "2.3.12"
exposed = "0.53.0" exposed = "0.54.0"
javacv-ffmpeg = "6.1.1-1.5.10" javacv-ffmpeg = "6.1.1-1.5.10"
detekt = "1.23.6" detekt = "1.23.6"
coroutines = "1.8.1" coroutines = "1.8.1"
swagger = "2.2.22" swagger = "2.2.23"
tika = "2.9.2" tika = "2.9.2"
owl = "0.0.1" owl = "0.0.1"
jackson = "2.17.2" jackson = "2.17.2"
protobuf = "4.27.3" protobuf = "4.28.0"
grpc-java = "1.66.0" grpc-java = "1.66.0"
grpc-kotlin = "1.4.1" grpc-kotlin = "1.4.1"
@ -65,7 +65,7 @@ jackson-module-kotlin = { module = "com.fasterxml.jackson.module:jackson-module-
blurhash = { module = "io.trbl:blurhash", version = "1.0.0" } blurhash = { module = "io.trbl:blurhash", version = "1.0.0" }
aws-s3 = { module = "software.amazon.awssdk:s3", version = "2.27.12" } aws-s3 = { module = "software.amazon.awssdk:s3", version = "2.27.19" }
jsoup = { module = "org.jsoup:jsoup", version = "1.18.1" } jsoup = { module = "org.jsoup:jsoup", version = "1.18.1" }
@ -78,7 +78,7 @@ imageio-webp = { module = "com.twelvemonkeys.imageio:imageio-webp", version = "3
thumbnailator = { module = "net.coobird:thumbnailator", version = "0.4.20" } thumbnailator = { module = "net.coobird:thumbnailator", version = "0.4.20" }
flyway-core = { module = "org.flywaydb:flyway-core" } flyway-core = { module = "org.flywaydb:flyway-core" }
flyway-postgresql = { module = "org.flywaydb:flyway-database-postgresql", version = "10.17.2" } flyway-postgresql = { module = "org.flywaydb:flyway-database-postgresql", version = "10.17.3" }
h2db = { module = "com.h2database:h2", version = "2.3.232" } h2db = { module = "com.h2database:h2", version = "2.3.232" }
@ -98,7 +98,7 @@ koin-core = { module = "io.insert-koin:koin-core" }
log4j2-slf4j = { module = "org.apache.logging.log4j:log4j-slf4j2-impl", version = "2.23.1" } log4j2-slf4j = { module = "org.apache.logging.log4j:log4j-slf4j2-impl", version = "2.23.1" }
mongodb-kotlin-coroutine = { module = "org.mongodb:mongodb-driver-kotlin-coroutine", version = "5.1.3" } mongodb-kotlin-coroutine = { module = "org.mongodb:mongodb-driver-kotlin-coroutine", version = "5.1.4" }
mockito-kotlin = { module = "org.mockito.kotlin:mockito-kotlin", version = "5.4.0" } mockito-kotlin = { module = "org.mockito.kotlin:mockito-kotlin", version = "5.4.0" }