Merge branch 'refs/heads/develop' into timeline

This commit is contained in:
usbharu 2024-06-28 18:10:08 +09:00
commit 88775f50fe
Signed by: usbharu
GPG Key ID: 6556747BF94EEBC8
5 changed files with 20 additions and 14 deletions

View File

@ -24,7 +24,7 @@ subprojects {
dependencies {
implementation("org.slf4j:slf4j-api:2.0.13")
testImplementation("org.junit.jupiter:junit-jupiter:5.10.2")
testImplementation("org.junit.jupiter:junit-jupiter:5.10.3")
}

View File

@ -19,9 +19,9 @@ repositories {
dependencies {
implementation("io.grpc:grpc-kotlin-stub:1.4.1")
implementation("io.grpc:grpc-protobuf:1.64.0")
implementation("com.google.protobuf:protobuf-kotlin:4.27.1")
implementation("io.grpc:grpc-netty:1.64.0")
implementation("io.grpc:grpc-protobuf:1.65.0")
implementation("com.google.protobuf:protobuf-kotlin:4.27.2")
implementation("io.grpc:grpc-netty:1.65.0")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1")
implementation(project(":owl-common"))
implementation("org.apache.logging.log4j:log4j-slf4j2-impl:2.23.1")
@ -45,7 +45,7 @@ protobuf {
}
plugins {
create("grpc") {
artifact = "io.grpc:protoc-gen-grpc-java:1.64.0"
artifact = "io.grpc:protoc-gen-grpc-java:1.65.0"
}
create("grpckt") {
artifact = "io.grpc:protoc-gen-grpc-kotlin:1.4.1:jdk8@jar"

View File

@ -13,9 +13,9 @@ repositories {
dependencies {
testImplementation("org.jetbrains.kotlin:kotlin-test")
implementation("io.grpc:grpc-kotlin-stub:1.4.1")
implementation("io.grpc:grpc-protobuf:1.64.0")
implementation("com.google.protobuf:protobuf-kotlin:4.27.1")
implementation("io.grpc:grpc-netty:1.64.0")
implementation("io.grpc:grpc-protobuf:1.65.0")
implementation("com.google.protobuf:protobuf-kotlin:4.27.2")
implementation("io.grpc:grpc-netty:1.65.0")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1")
implementation(project(":owl-common"))
protobuf(files(project(":owl-broker").dependencyProject.projectDir.toString() + "/src/main/proto"))
@ -34,7 +34,7 @@ protobuf {
}
plugins {
create("grpc") {
artifact = "io.grpc:protoc-gen-grpc-java:1.64.0"
artifact = "io.grpc:protoc-gen-grpc-java:1.65.0"
}
create("grpckt") {
artifact = "io.grpc:protoc-gen-grpc-kotlin:1.4.1:jdk8@jar"

View File

@ -14,9 +14,9 @@ dependencies {
testImplementation("org.jetbrains.kotlin:kotlin-test")
api(project(":owl-producer:owl-producer-api"))
implementation("io.grpc:grpc-kotlin-stub:1.4.1")
implementation("io.grpc:grpc-protobuf:1.64.0")
implementation("com.google.protobuf:protobuf-kotlin:4.27.1")
implementation("io.grpc:grpc-netty:1.64.0")
implementation("io.grpc:grpc-protobuf:1.65.0")
implementation("com.google.protobuf:protobuf-kotlin:4.27.2")
implementation("io.grpc:grpc-netty:1.65.0")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1")
implementation(project(":owl-common"))
protobuf(files(project(":owl-broker").dependencyProject.projectDir.toString() + "/src/main/proto"))
@ -35,7 +35,7 @@ protobuf {
}
plugins {
create("grpc") {
artifact = "io.grpc:protoc-gen-grpc-java:1.64.0"
artifact = "io.grpc:protoc-gen-grpc-java:1.65.0"
}
create("grpckt") {
artifact = "io.grpc:protoc-gen-grpc-kotlin:1.4.1:jdk8@jar"

View File

@ -10,5 +10,11 @@
"dependencies",
"renovate"
],
"prConcurrentLimit": 5
"prConcurrentLimit": 5,
"packageRules": [
{
"matchUpdateTypes": ["patch","minor"],
"automerge": true
}
]
}