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 auth

This commit is contained in:
usbharu 2024-08-06 00:05:52 +09:00 committed by GitHub
parent f5fc4fd0ee 547ce1ae19
commit 488ca1018d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,7 +29,7 @@ jobs:
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Gradle Wrapper Validation - name: Gradle Wrapper Validation
uses: gradle/actions/wrapper-validation@v3 uses: gradle/actions/wrapper-validation@v4
- name: Set up JDK 21 - name: Set up JDK 21
uses: actions/setup-java@v4 uses: actions/setup-java@v4
@ -38,7 +38,7 @@ jobs:
distribution: 'temurin' distribution: 'temurin'
- name: Setup Gradle - name: Setup Gradle
uses: gradle/actions/setup-gradle@v3 uses: gradle/actions/setup-gradle@v4
with: with:
cache-read-only: false cache-read-only: false
gradle-home-cache-cleanup: true gradle-home-cache-cleanup: true
@ -61,7 +61,7 @@ jobs:
distribution: 'temurin' distribution: 'temurin'
- name: Setup Gradle - name: Setup Gradle
uses: gradle/actions/setup-gradle@v3 uses: gradle/actions/setup-gradle@v4
with: with:
cache-read-only: false cache-read-only: false
gradle-home-cache-cleanup: true gradle-home-cache-cleanup: true
@ -103,7 +103,7 @@ jobs:
distribution: 'temurin' distribution: 'temurin'
- name: Setup Gradle - name: Setup Gradle
uses: gradle/actions/setup-gradle@v3 uses: gradle/actions/setup-gradle@v4
with: with:
cache-read-only: false cache-read-only: false
gradle-home-cache-cleanup: true gradle-home-cache-cleanup: true

4
libs.versions.toml
View File

@ -2,7 +2,7 @@
kotlin = "2.0.0" kotlin = "2.0.0"
ktor = "2.3.12" ktor = "2.3.12"
exposed = "0.51.1" exposed = "0.53.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"
@ -69,7 +69,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.26.26" } aws-s3 = { module = "software.amazon.awssdk:s3", version = "2.26.29" }
jsoup = { module = "org.jsoup:jsoup", version = "1.18.1" } jsoup = { module = "org.jsoup:jsoup", version = "1.18.1" }

4
owl/owl-broker/build.gradle.kts
View File

@ -14,7 +14,7 @@ repositories {
dependencies { dependencies {
implementation("io.grpc:grpc-kotlin-stub:1.4.1") implementation("io.grpc:grpc-kotlin-stub:1.4.1")
implementation("io.grpc:grpc-protobuf:1.65.1") implementation("io.grpc:grpc-protobuf:1.65.1")
implementation("com.google.protobuf:protobuf-kotlin:4.27.2") implementation("com.google.protobuf:protobuf-kotlin:4.27.3")
implementation("io.grpc:grpc-netty:1.65.1") implementation("io.grpc:grpc-netty:1.65.1")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1")
implementation(project(":owl-common")) implementation(project(":owl-common"))
@ -32,7 +32,7 @@ kotlin {
protobuf { protobuf {
protoc { protoc {
artifact = "com.google.protobuf:protoc:4.27.1" artifact = "com.google.protobuf:protoc:4.27.3"
} }
plugins { plugins {
create("grpc") { create("grpc") {

4
owl/owl-consumer/build.gradle.kts
View File

@ -14,7 +14,7 @@ dependencies {
testImplementation("org.jetbrains.kotlin:kotlin-test") testImplementation("org.jetbrains.kotlin:kotlin-test")
implementation("io.grpc:grpc-kotlin-stub:1.4.1") implementation("io.grpc:grpc-kotlin-stub:1.4.1")
implementation("io.grpc:grpc-protobuf:1.65.1") implementation("io.grpc:grpc-protobuf:1.65.1")
implementation("com.google.protobuf:protobuf-kotlin:4.27.2") implementation("com.google.protobuf:protobuf-kotlin:4.27.3")
implementation("io.grpc:grpc-netty:1.65.1") implementation("io.grpc:grpc-netty:1.65.1")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1")
implementation(project(":owl-common")) implementation(project(":owl-common"))
@ -30,7 +30,7 @@ kotlin {
protobuf { protobuf {
protoc { protoc {
artifact = "com.google.protobuf:protoc:4.27.1" artifact = "com.google.protobuf:protoc:4.27.3"
} }
plugins { plugins {
create("grpc") { create("grpc") {

4
owl/owl-producer/owl-producer-default/build.gradle.kts
View File

@ -15,7 +15,7 @@ dependencies {
api(project(":owl-producer:owl-producer-api")) api(project(":owl-producer:owl-producer-api"))
implementation("io.grpc:grpc-kotlin-stub:1.4.1") implementation("io.grpc:grpc-kotlin-stub:1.4.1")
implementation("io.grpc:grpc-protobuf:1.65.1") implementation("io.grpc:grpc-protobuf:1.65.1")
implementation("com.google.protobuf:protobuf-kotlin:4.27.2") implementation("com.google.protobuf:protobuf-kotlin:4.27.3")
implementation("io.grpc:grpc-netty:1.65.1") implementation("io.grpc:grpc-netty:1.65.1")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1")
implementation(project(":owl-common")) implementation(project(":owl-common"))
@ -31,7 +31,7 @@ kotlin {
protobuf { protobuf {
protoc { protoc {
artifact = "com.google.protobuf:protoc:4.27.1" artifact = "com.google.protobuf:protoc:4.27.3"
} }
plugins { plugins {
create("grpc") { create("grpc") {