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

Merge branch 'refs/heads/develop' into feature/owl 

# Conflicts:
#	hideout-core/build.gradle.kts
#	owl/owl-broker/build.gradle.kts
#	owl/owl-broker/owl-broker-mongodb/build.gradle.kts
This commit is contained in:
usbharu 2024-05-11 22:53:48 +09:00
parent 9c7fda27ea 04410920ac
commit cd7c83b1d6
5 changed files with 38 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,13 +21,13 @@ jobs:
uses: actions/checkout@v3 uses: actions/checkout@v3
- name: Gradle Wrapper Cache - name: Gradle Wrapper Cache
uses: actions/cache@v3.3.2 uses: actions/cache@v3.3.3
with: with:
path: ~/.gradle/wrapper path: ~/.gradle/wrapper
key: gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }} key: gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
- name: Dependencies Cache - name: Dependencies Cache
uses: actions/cache@v3.3.2 uses: actions/cache@v3.3.3
with: with:
path: | path: |
~/.gradle/cache/jars-* ~/.gradle/cache/jars-*
@ -37,7 +37,7 @@ jobs:
restore-keys: gradle-dependencies- restore-keys: gradle-dependencies-
- name: Cache - name: Cache
uses: actions/cache@v3.3.2 uses: actions/cache@v3.3.3
with: with:
path: | path: |
~/.gradle/caches/build-cache-* ~/.gradle/caches/build-cache-*
@ -47,7 +47,7 @@ jobs:
restore-keys: ${{ runner.os }}-gradle-build-${{ github.workflow }}- restore-keys: ${{ runner.os }}-gradle-build-${{ github.workflow }}-
- name: Build Cache - name: Build Cache
uses: actions/cache@v3.3.2 uses: actions/cache@v3.3.3
with: with:
path: | path: |
build build
@ -72,13 +72,13 @@ jobs:
uses: actions/checkout@v3 uses: actions/checkout@v3
- name: Gradle Wrapper Cache - name: Gradle Wrapper Cache
uses: actions/cache@v3.3.2 uses: actions/cache@v3.3.3
with: with:
path: ~/.gradle/wrapper path: ~/.gradle/wrapper
key: gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }} key: gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
- name: Dependencies Cache - name: Dependencies Cache
uses: actions/cache@v3.3.2 uses: actions/cache@v3.3.3
with: with:
path: | path: |
~/.gradle/cache/jars-* ~/.gradle/cache/jars-*
@ -88,7 +88,7 @@ jobs:
restore-keys: gradle-dependencies- restore-keys: gradle-dependencies-
- name: Cache - name: Cache
uses: actions/cache@v3.3.2 uses: actions/cache@v3.3.3
with: with:
path: | path: |
~/.gradle/caches/build-cache-* ~/.gradle/caches/build-cache-*
@ -98,7 +98,7 @@ jobs:
restore-keys: ${{ runner.os }}-gradle-build-${{ github.workflow }}- restore-keys: ${{ runner.os }}-gradle-build-${{ github.workflow }}-
- name: Build Cache - name: Build Cache
uses: actions/cache@v3.3.2 uses: actions/cache@v3.3.3
with: with:
path: | path: |
build build
@ -131,13 +131,13 @@ jobs:
uses: actions/checkout@v3 uses: actions/checkout@v3
- name: Gradle Wrapper Cache - name: Gradle Wrapper Cache
uses: actions/cache@v3.3.2 uses: actions/cache@v3.3.3
with: with:
path: ~/.gradle/wrapper path: ~/.gradle/wrapper
key: gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }} key: gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
- name: Dependencies Cache - name: Dependencies Cache
uses: actions/cache@v3.3.2 uses: actions/cache@v3.3.3
with: with:
path: | path: |
~/.gradle/cache/jars-* ~/.gradle/cache/jars-*
@ -147,7 +147,7 @@ jobs:
restore-keys: gradle-dependencies- restore-keys: gradle-dependencies-
- name: Cache - name: Cache
uses: actions/cache@v3.3.2 uses: actions/cache@v3.3.3
with: with:
path: | path: |
~/.gradle/caches/build-cache-* ~/.gradle/caches/build-cache-*
@ -157,7 +157,7 @@ jobs:
restore-keys: ${{ runner.os }}-gradle-build-${{ github.workflow }}- restore-keys: ${{ runner.os }}-gradle-build-${{ github.workflow }}-
- name: Build Cache - name: Build Cache
uses: actions/cache@v3.3.2 uses: actions/cache@v3.3.3
with: with:
path: | path: |
build build
@ -195,13 +195,13 @@ jobs:
uses: actions/checkout@v3 uses: actions/checkout@v3
- name: Gradle Wrapper Cache - name: Gradle Wrapper Cache
uses: actions/cache@v3.3.2 uses: actions/cache@v3.3.3
with: with:
path: ~/.gradle/wrapper path: ~/.gradle/wrapper
key: gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }} key: gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
- name: Dependencies Cache - name: Dependencies Cache
uses: actions/cache@v3.3.2 uses: actions/cache@v3.3.3
with: with:
path: | path: |
~/.gradle/cache/jars-* ~/.gradle/cache/jars-*
@ -211,7 +211,7 @@ jobs:
restore-keys: gradle-dependencies- restore-keys: gradle-dependencies-
- name: Cache - name: Cache
uses: actions/cache@v3.3.2 uses: actions/cache@v3.3.3
with: with:
path: | path: |
~/.gradle/caches/build-cache-* ~/.gradle/caches/build-cache-*
@ -221,7 +221,7 @@ jobs:
restore-keys: ${{ runner.os }}-gradle-build-${{ github.workflow }}- restore-keys: ${{ runner.os }}-gradle-build-${{ github.workflow }}-
- name: Build Cache - name: Build Cache
uses: actions/cache@v3.3.2 uses: actions/cache@v3.3.3
with: with:
path: | path: |
build build
@ -290,13 +290,13 @@ jobs:
uses: actions/checkout@v3 uses: actions/checkout@v3
- name: Gradle Wrapper Cache - name: Gradle Wrapper Cache
uses: actions/cache@v3.3.2 uses: actions/cache@v3.3.3
with: with:
path: ~/.gradle/wrapper path: ~/.gradle/wrapper
key: gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }} key: gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
- name: Dependencies Cache - name: Dependencies Cache
uses: actions/cache@v3.3.2 uses: actions/cache@v3.3.3
with: with:
path: | path: |
~/.gradle/cache/jars-* ~/.gradle/cache/jars-*
@ -306,7 +306,7 @@ jobs:
restore-keys: gradle-dependencies- restore-keys: gradle-dependencies-
- name: Cache - name: Cache
uses: actions/cache@v3.3.2 uses: actions/cache@v3.3.3
with: with:
path: | path: |
~/.gradle/caches/build-cache-* ~/.gradle/caches/build-cache-*
@ -316,7 +316,7 @@ jobs:
restore-keys: ${{ runner.os }}-gradle-build-${{ github.workflow }}- restore-keys: ${{ runner.os }}-gradle-build-${{ github.workflow }}-
- name: Build Cache - name: Build Cache
uses: actions/cache@v3.3.2 uses: actions/cache@v3.3.3
with: with:
path: | path: |
build build
@ -329,7 +329,7 @@ jobs:
distribution: 'temurin' distribution: 'temurin'
- name: Build with Gradle - name: Build with Gradle
uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1 uses: gradle/gradle-build-action@4c39dd82cd5e1ec7c6fa0173bb41b4b6bb3b86ff
with: with:
arguments: detektMain arguments: detektMain
@ -348,13 +348,13 @@ jobs:
uses: actions/checkout@v3 uses: actions/checkout@v3
- name: Gradle Wrapper Cache - name: Gradle Wrapper Cache
uses: actions/cache@v3.3.2 uses: actions/cache@v3.3.3
with: with:
path: ~/.gradle/wrapper path: ~/.gradle/wrapper
key: gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }} key: gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
- name: Dependencies Cache - name: Dependencies Cache
uses: actions/cache@v3.3.2 uses: actions/cache@v3.3.3
with: with:
path: | path: |
~/.gradle/cache/jars-* ~/.gradle/cache/jars-*
@ -364,7 +364,7 @@ jobs:
restore-keys: gradle-dependencies- restore-keys: gradle-dependencies-
- name: Cache - name: Cache
uses: actions/cache@v3.3.2 uses: actions/cache@v3.3.3
with: with:
path: | path: |
~/.gradle/caches/build-cache-* ~/.gradle/caches/build-cache-*
@ -374,7 +374,7 @@ jobs:
restore-keys: ${{ runner.os }}-gradle-build-${{ github.workflow }}- restore-keys: ${{ runner.os }}-gradle-build-${{ github.workflow }}-
- name: Build Cache - name: Build Cache
uses: actions/cache@v3.3.2 uses: actions/cache@v3.3.3
with: with:
path: | path: |
build build

4
owl/build.gradle.kts
View File

@ -1,5 +1,5 @@
plugins { plugins {
kotlin("jvm") version "1.9.22" kotlin("jvm") version "1.9.23"
} }
@ -22,7 +22,7 @@ subprojects {
} }
dependencies { dependencies {
implementation("org.slf4j:slf4j-api:2.0.12") 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.2")

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

@ -1,7 +1,7 @@
plugins { plugins {
kotlin("jvm") kotlin("jvm")
id("com.google.protobuf") version "0.9.4" id("com.google.protobuf") version "0.9.4"
id("com.google.devtools.ksp") version "1.9.22-1.0.17" id("com.google.devtools.ksp") version "1.9.23-1.0.20"
} }
apply { apply {
@ -23,8 +23,8 @@ dependencies {
implementation("io.grpc:grpc-netty:1.61.1") implementation("io.grpc:grpc-netty:1.61.1")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0")
implementation(project(":owl-common")) implementation(project(":owl-common"))
implementation("org.apache.logging.log4j:log4j-slf4j2-impl:2.23.0") implementation("org.apache.logging.log4j:log4j-slf4j2-impl:2.23.1")
implementation(platform("io.insert-koin:koin-bom:3.5.3")) implementation(platform("io.insert-koin:koin-bom:3.5.6"))
implementation(platform("io.insert-koin:koin-annotations-bom:1.3.1")) implementation(platform("io.insert-koin:koin-annotations-bom:1.3.1"))
implementation("io.insert-koin:koin-core") implementation("io.insert-koin:koin-core")
compileOnly("io.insert-koin:koin-annotations") compileOnly("io.insert-koin:koin-annotations")

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

@ -1,7 +1,7 @@
plugins { plugins {
application application
kotlin("jvm") kotlin("jvm")
id("com.google.devtools.ksp") version "1.9.22-1.0.17" id("com.google.devtools.ksp") version "1.9.23-1.0.20"
} }
apply { apply {
@ -19,7 +19,7 @@ dependencies {
implementation("org.mongodb:mongodb-driver-kotlin-coroutine:5.0.0") implementation("org.mongodb:mongodb-driver-kotlin-coroutine:5.0.0")
implementation(project(":owl-broker")) implementation(project(":owl-broker"))
implementation(project(":owl-common")) implementation(project(":owl-common"))
implementation(platform("io.insert-koin:koin-bom:3.5.3")) implementation(platform("io.insert-koin:koin-bom:3.5.6"))
implementation(platform("io.insert-koin:koin-annotations-bom:1.3.1")) implementation(platform("io.insert-koin:koin-annotations-bom:1.3.1"))
implementation("io.insert-koin:koin-core") implementation("io.insert-koin:koin-core")
compileOnly("io.insert-koin:koin-annotations") compileOnly("io.insert-koin:koin-annotations")

6
renovate.json Normal file
View File

@ -0,0 +1,6 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"config:recommended"
]
}