mirror of https://github.com/usbharu/Hideout.git
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:
commit
cd7c83b1d6
|
@ -21,13 +21,13 @@ jobs:
|
|||
uses: actions/checkout@v3
|
||||
|
||||
- name: Gradle Wrapper Cache
|
||||
uses: actions/cache@v3.3.2
|
||||
uses: actions/cache@v3.3.3
|
||||
with:
|
||||
path: ~/.gradle/wrapper
|
||||
key: gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
|
||||
|
||||
- name: Dependencies Cache
|
||||
uses: actions/cache@v3.3.2
|
||||
uses: actions/cache@v3.3.3
|
||||
with:
|
||||
path: |
|
||||
~/.gradle/cache/jars-*
|
||||
|
@ -37,7 +37,7 @@ jobs:
|
|||
restore-keys: gradle-dependencies-
|
||||
|
||||
- name: Cache
|
||||
uses: actions/cache@v3.3.2
|
||||
uses: actions/cache@v3.3.3
|
||||
with:
|
||||
path: |
|
||||
~/.gradle/caches/build-cache-*
|
||||
|
@ -47,7 +47,7 @@ jobs:
|
|||
restore-keys: ${{ runner.os }}-gradle-build-${{ github.workflow }}-
|
||||
|
||||
- name: Build Cache
|
||||
uses: actions/cache@v3.3.2
|
||||
uses: actions/cache@v3.3.3
|
||||
with:
|
||||
path: |
|
||||
build
|
||||
|
@ -72,13 +72,13 @@ jobs:
|
|||
uses: actions/checkout@v3
|
||||
|
||||
- name: Gradle Wrapper Cache
|
||||
uses: actions/cache@v3.3.2
|
||||
uses: actions/cache@v3.3.3
|
||||
with:
|
||||
path: ~/.gradle/wrapper
|
||||
key: gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
|
||||
|
||||
- name: Dependencies Cache
|
||||
uses: actions/cache@v3.3.2
|
||||
uses: actions/cache@v3.3.3
|
||||
with:
|
||||
path: |
|
||||
~/.gradle/cache/jars-*
|
||||
|
@ -88,7 +88,7 @@ jobs:
|
|||
restore-keys: gradle-dependencies-
|
||||
|
||||
- name: Cache
|
||||
uses: actions/cache@v3.3.2
|
||||
uses: actions/cache@v3.3.3
|
||||
with:
|
||||
path: |
|
||||
~/.gradle/caches/build-cache-*
|
||||
|
@ -98,7 +98,7 @@ jobs:
|
|||
restore-keys: ${{ runner.os }}-gradle-build-${{ github.workflow }}-
|
||||
|
||||
- name: Build Cache
|
||||
uses: actions/cache@v3.3.2
|
||||
uses: actions/cache@v3.3.3
|
||||
with:
|
||||
path: |
|
||||
build
|
||||
|
@ -131,13 +131,13 @@ jobs:
|
|||
uses: actions/checkout@v3
|
||||
|
||||
- name: Gradle Wrapper Cache
|
||||
uses: actions/cache@v3.3.2
|
||||
uses: actions/cache@v3.3.3
|
||||
with:
|
||||
path: ~/.gradle/wrapper
|
||||
key: gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
|
||||
|
||||
- name: Dependencies Cache
|
||||
uses: actions/cache@v3.3.2
|
||||
uses: actions/cache@v3.3.3
|
||||
with:
|
||||
path: |
|
||||
~/.gradle/cache/jars-*
|
||||
|
@ -147,7 +147,7 @@ jobs:
|
|||
restore-keys: gradle-dependencies-
|
||||
|
||||
- name: Cache
|
||||
uses: actions/cache@v3.3.2
|
||||
uses: actions/cache@v3.3.3
|
||||
with:
|
||||
path: |
|
||||
~/.gradle/caches/build-cache-*
|
||||
|
@ -157,7 +157,7 @@ jobs:
|
|||
restore-keys: ${{ runner.os }}-gradle-build-${{ github.workflow }}-
|
||||
|
||||
- name: Build Cache
|
||||
uses: actions/cache@v3.3.2
|
||||
uses: actions/cache@v3.3.3
|
||||
with:
|
||||
path: |
|
||||
build
|
||||
|
@ -195,13 +195,13 @@ jobs:
|
|||
uses: actions/checkout@v3
|
||||
|
||||
- name: Gradle Wrapper Cache
|
||||
uses: actions/cache@v3.3.2
|
||||
uses: actions/cache@v3.3.3
|
||||
with:
|
||||
path: ~/.gradle/wrapper
|
||||
key: gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
|
||||
|
||||
- name: Dependencies Cache
|
||||
uses: actions/cache@v3.3.2
|
||||
uses: actions/cache@v3.3.3
|
||||
with:
|
||||
path: |
|
||||
~/.gradle/cache/jars-*
|
||||
|
@ -211,7 +211,7 @@ jobs:
|
|||
restore-keys: gradle-dependencies-
|
||||
|
||||
- name: Cache
|
||||
uses: actions/cache@v3.3.2
|
||||
uses: actions/cache@v3.3.3
|
||||
with:
|
||||
path: |
|
||||
~/.gradle/caches/build-cache-*
|
||||
|
@ -221,7 +221,7 @@ jobs:
|
|||
restore-keys: ${{ runner.os }}-gradle-build-${{ github.workflow }}-
|
||||
|
||||
- name: Build Cache
|
||||
uses: actions/cache@v3.3.2
|
||||
uses: actions/cache@v3.3.3
|
||||
with:
|
||||
path: |
|
||||
build
|
||||
|
@ -290,13 +290,13 @@ jobs:
|
|||
uses: actions/checkout@v3
|
||||
|
||||
- name: Gradle Wrapper Cache
|
||||
uses: actions/cache@v3.3.2
|
||||
uses: actions/cache@v3.3.3
|
||||
with:
|
||||
path: ~/.gradle/wrapper
|
||||
key: gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
|
||||
|
||||
- name: Dependencies Cache
|
||||
uses: actions/cache@v3.3.2
|
||||
uses: actions/cache@v3.3.3
|
||||
with:
|
||||
path: |
|
||||
~/.gradle/cache/jars-*
|
||||
|
@ -306,7 +306,7 @@ jobs:
|
|||
restore-keys: gradle-dependencies-
|
||||
|
||||
- name: Cache
|
||||
uses: actions/cache@v3.3.2
|
||||
uses: actions/cache@v3.3.3
|
||||
with:
|
||||
path: |
|
||||
~/.gradle/caches/build-cache-*
|
||||
|
@ -316,7 +316,7 @@ jobs:
|
|||
restore-keys: ${{ runner.os }}-gradle-build-${{ github.workflow }}-
|
||||
|
||||
- name: Build Cache
|
||||
uses: actions/cache@v3.3.2
|
||||
uses: actions/cache@v3.3.3
|
||||
with:
|
||||
path: |
|
||||
build
|
||||
|
@ -329,7 +329,7 @@ jobs:
|
|||
distribution: 'temurin'
|
||||
|
||||
- name: Build with Gradle
|
||||
uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1
|
||||
uses: gradle/gradle-build-action@4c39dd82cd5e1ec7c6fa0173bb41b4b6bb3b86ff
|
||||
with:
|
||||
arguments: detektMain
|
||||
|
||||
|
@ -348,13 +348,13 @@ jobs:
|
|||
uses: actions/checkout@v3
|
||||
|
||||
- name: Gradle Wrapper Cache
|
||||
uses: actions/cache@v3.3.2
|
||||
uses: actions/cache@v3.3.3
|
||||
with:
|
||||
path: ~/.gradle/wrapper
|
||||
key: gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
|
||||
|
||||
- name: Dependencies Cache
|
||||
uses: actions/cache@v3.3.2
|
||||
uses: actions/cache@v3.3.3
|
||||
with:
|
||||
path: |
|
||||
~/.gradle/cache/jars-*
|
||||
|
@ -364,7 +364,7 @@ jobs:
|
|||
restore-keys: gradle-dependencies-
|
||||
|
||||
- name: Cache
|
||||
uses: actions/cache@v3.3.2
|
||||
uses: actions/cache@v3.3.3
|
||||
with:
|
||||
path: |
|
||||
~/.gradle/caches/build-cache-*
|
||||
|
@ -374,7 +374,7 @@ jobs:
|
|||
restore-keys: ${{ runner.os }}-gradle-build-${{ github.workflow }}-
|
||||
|
||||
- name: Build Cache
|
||||
uses: actions/cache@v3.3.2
|
||||
uses: actions/cache@v3.3.3
|
||||
with:
|
||||
path: |
|
||||
build
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
plugins {
|
||||
kotlin("jvm") version "1.9.22"
|
||||
kotlin("jvm") version "1.9.23"
|
||||
}
|
||||
|
||||
|
||||
|
@ -22,7 +22,7 @@ subprojects {
|
|||
}
|
||||
|
||||
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")
|
||||
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
plugins {
|
||||
kotlin("jvm")
|
||||
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 {
|
||||
|
@ -23,8 +23,8 @@ dependencies {
|
|||
implementation("io.grpc:grpc-netty:1.61.1")
|
||||
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0")
|
||||
implementation(project(":owl-common"))
|
||||
implementation("org.apache.logging.log4j:log4j-slf4j2-impl:2.23.0")
|
||||
implementation(platform("io.insert-koin:koin-bom:3.5.3"))
|
||||
implementation("org.apache.logging.log4j:log4j-slf4j2-impl:2.23.1")
|
||||
implementation(platform("io.insert-koin:koin-bom:3.5.6"))
|
||||
implementation(platform("io.insert-koin:koin-annotations-bom:1.3.1"))
|
||||
implementation("io.insert-koin:koin-core")
|
||||
compileOnly("io.insert-koin:koin-annotations")
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
plugins {
|
||||
application
|
||||
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 {
|
||||
|
@ -19,7 +19,7 @@ dependencies {
|
|||
implementation("org.mongodb:mongodb-driver-kotlin-coroutine:5.0.0")
|
||||
implementation(project(":owl-broker"))
|
||||
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("io.insert-koin:koin-core")
|
||||
compileOnly("io.insert-koin:koin-annotations")
|
||||
|
|
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
|
||||
"extends": [
|
||||
"config:recommended"
|
||||
]
|
||||
}
|
Loading…
Reference in New Issue