diff --git a/.github/workflows/pull-request-merge-check.yml b/.github/workflows/pull-request-merge-check.yml index ec1940f0..d2082154 100644 --- a/.github/workflows/pull-request-merge-check.yml +++ b/.github/workflows/pull-request-merge-check.yml @@ -18,16 +18,16 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Gradle Wrapper Cache - uses: actions/cache@v3.3.3 + uses: actions/cache@v4.0.2 with: path: ~/.gradle/wrapper key: gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }} - name: Dependencies Cache - uses: actions/cache@v3.3.3 + uses: actions/cache@v4.0.2 with: path: | ~/.gradle/cache/jars-* @@ -37,7 +37,7 @@ jobs: restore-keys: gradle-dependencies- - name: Cache - uses: actions/cache@v3.3.3 + uses: actions/cache@v4.0.2 with: path: | ~/.gradle/caches/build-cache-* @@ -47,19 +47,19 @@ jobs: restore-keys: ${{ runner.os }}-gradle-build-${{ github.workflow }}- - name: Build Cache - uses: actions/cache@v3.3.3 + uses: actions/cache@v4.0.2 with: path: | build key: gradle-build-${{ hashFiles('**/*.gradle.kts') }}-${{ hashFiles('**/*.kt') }}-${{ github.sha }} - name: Set up JDK 21 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: '21' distribution: 'temurin' - name: Build - uses: gradle/gradle-build-action@v2.8.1 + uses: gradle/gradle-build-action@v3.3.2 with: arguments: testClasses @@ -69,16 +69,16 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Gradle Wrapper Cache - uses: actions/cache@v3.3.3 + uses: actions/cache@v4.0.2 with: path: ~/.gradle/wrapper key: gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }} - name: Dependencies Cache - uses: actions/cache@v3.3.3 + uses: actions/cache@v4.0.2 with: path: | ~/.gradle/cache/jars-* @@ -88,7 +88,7 @@ jobs: restore-keys: gradle-dependencies- - name: Cache - uses: actions/cache@v3.3.3 + uses: actions/cache@v4.0.2 with: path: | ~/.gradle/caches/build-cache-* @@ -98,26 +98,26 @@ jobs: restore-keys: ${{ runner.os }}-gradle-build-${{ github.workflow }}- - name: Build Cache - uses: actions/cache@v3.3.3 + uses: actions/cache@v4.0.2 with: path: | build key: gradle-build-${{ hashFiles('**/*.gradle.kts') }}-${{ hashFiles('src') }}-${{ github.sha }} - name: Set up JDK 21 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: '21' distribution: 'temurin' - name: Unit Test - uses: gradle/gradle-build-action@v2.8.1 + uses: gradle/gradle-build-action@v3.3.2 with: arguments: test - name: Save Test Report if: always() - uses: actions/cache/save@v3 + uses: actions/cache/save@v4 with: path: build/test-results key: unit-test-report-${{ github.sha }} @@ -128,16 +128,16 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Gradle Wrapper Cache - uses: actions/cache@v3.3.3 + uses: actions/cache@v4.0.2 with: path: ~/.gradle/wrapper key: gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }} - name: Dependencies Cache - uses: actions/cache@v3.3.3 + uses: actions/cache@v4.0.2 with: path: | ~/.gradle/cache/jars-* @@ -147,7 +147,7 @@ jobs: restore-keys: gradle-dependencies- - name: Cache - uses: actions/cache@v3.3.3 + uses: actions/cache@v4.0.2 with: path: | ~/.gradle/caches/build-cache-* @@ -157,14 +157,14 @@ jobs: restore-keys: ${{ runner.os }}-gradle-build-${{ github.workflow }}- - name: Build Cache - uses: actions/cache@v3.3.3 + uses: actions/cache@v4.0.2 with: path: | build key: gradle-build-${{ hashFiles('**/*.gradle.kts') }}-${{ hashFiles('src') }}-${{ github.sha }} - name: Set up JDK 21 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: '21' distribution: 'temurin' @@ -175,13 +175,13 @@ jobs: mongodb-version: latest - name: Unit Test - uses: gradle/gradle-build-action@v2.8.1 + uses: gradle/gradle-build-action@v3.3.2 with: arguments: integrationTest - name: Save Test Report if: always() - uses: actions/cache/save@v3 + uses: actions/cache/save@v4 with: path: build/test-results key: integration-test-report-${{ github.sha }} @@ -192,16 +192,16 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Gradle Wrapper Cache - uses: actions/cache@v3.3.3 + uses: actions/cache@v4.0.2 with: path: ~/.gradle/wrapper key: gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }} - name: Dependencies Cache - uses: actions/cache@v3.3.3 + uses: actions/cache@v4.0.2 with: path: | ~/.gradle/cache/jars-* @@ -211,7 +211,7 @@ jobs: restore-keys: gradle-dependencies- - name: Cache - uses: actions/cache@v3.3.3 + uses: actions/cache@v4.0.2 with: path: | ~/.gradle/caches/build-cache-* @@ -221,20 +221,20 @@ jobs: restore-keys: ${{ runner.os }}-gradle-build-${{ github.workflow }}- - name: Build Cache - uses: actions/cache@v3.3.3 + uses: actions/cache@v4.0.2 with: path: | build key: gradle-build-${{ hashFiles('**/*.gradle.kts') }}-${{ hashFiles('src') }}-${{ github.sha }} - name: Set up JDK 21 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: '21' distribution: 'temurin' - name: Run Kover - uses: gradle/gradle-build-action@v2.8.1 + uses: gradle/gradle-build-action@v3.3.2 with: arguments: koverXmlReport -x integrationTest -x e2eTest --rerun-tasks @@ -259,25 +259,25 @@ jobs: runs-on: ubuntu-latest steps: - name: Restore Test Report - uses: actions/cache/restore@v3 + uses: actions/cache/restore@v4 with: path: build/test-results key: unit-test-report-${{ github.sha }} - name: Restore Test Report - uses: actions/cache/restore@v3 + uses: actions/cache/restore@v4 with: path: build/test-results key: integration-test-report-${{ github.sha }} - name: Restore Test Report - uses: actions/cache/restore@v3 + uses: actions/cache/restore@v4 with: path: build/test-results key: e2e-test-report-${{ github.sha }} - name: JUnit Test Report - uses: mikepenz/action-junit-report@v2 + uses: mikepenz/action-junit-report@v4 with: report_paths: '**/TEST-*.xml' @@ -287,16 +287,16 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Gradle Wrapper Cache - uses: actions/cache@v3.3.3 + uses: actions/cache@v4.0.2 with: path: ~/.gradle/wrapper key: gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }} - name: Dependencies Cache - uses: actions/cache@v3.3.3 + uses: actions/cache@v4.0.2 with: path: | ~/.gradle/cache/jars-* @@ -306,7 +306,7 @@ jobs: restore-keys: gradle-dependencies- - name: Cache - uses: actions/cache@v3.3.3 + uses: actions/cache@v4.0.2 with: path: | ~/.gradle/caches/build-cache-* @@ -316,14 +316,14 @@ jobs: restore-keys: ${{ runner.os }}-gradle-build-${{ github.workflow }}- - name: Build Cache - uses: actions/cache@v3.3.3 + uses: actions/cache@v4.0.2 with: path: | build key: gradle-build-${{ hashFiles('**/*.gradle.kts') }}-${{ hashFiles('src') }}-${{ github.sha }} - name: Set up JDK 21 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: '21' distribution: 'temurin' @@ -345,16 +345,16 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Gradle Wrapper Cache - uses: actions/cache@v3.3.3 + uses: actions/cache@v4.0.2 with: path: ~/.gradle/wrapper key: gradle-wrapper-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }} - name: Dependencies Cache - uses: actions/cache@v3.3.3 + uses: actions/cache@v4.0.2 with: path: | ~/.gradle/cache/jars-* @@ -364,7 +364,7 @@ jobs: restore-keys: gradle-dependencies- - name: Cache - uses: actions/cache@v3.3.3 + uses: actions/cache@v4.0.2 with: path: | ~/.gradle/caches/build-cache-* @@ -374,14 +374,14 @@ jobs: restore-keys: ${{ runner.os }}-gradle-build-${{ github.workflow }}- - name: Build Cache - uses: actions/cache@v3.3.3 + uses: actions/cache@v4.0.2 with: path: | build key: gradle-build-${{ hashFiles('**/*.gradle.kts') }}-${{ hashFiles('src') }}-${{ github.sha }} - name: Set up JDK 21 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: '21' distribution: 'temurin' @@ -393,20 +393,20 @@ jobs: - name: setup-chrome id: setup-chrome - uses: browser-actions/setup-chrome@v1.4.0 + uses: browser-actions/setup-chrome@v1.6.1 - name: Add Path run: echo ${{ steps.setup-chrome.outputs.chrome-path }} >> $GITHUB_PATH - name: E2E Test - uses: gradle/gradle-build-action@v2.8.1 + uses: gradle/gradle-build-action@v3.3.2 with: arguments: e2eTest - name: Save Test Report if: always() - uses: actions/cache/save@v3 + uses: actions/cache/save@v4 with: path: build/test-results key: e2e-test-report-${{ github.sha }} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 00000000..89909840 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,4 @@ +org.gradle.parallel=true +org.gradle.configureondemand=true +org.gradle.caching=true +org.gradle.jvmargs=-Xmx4096m -XX:+HeapDumpOnOutOfMemoryError -XX:+UseParallelGC \ No newline at end of file diff --git a/hideout-core/build.gradle.kts b/hideout-core/build.gradle.kts index e13545a9..f371f43b 100644 --- a/hideout-core/build.gradle.kts +++ b/hideout-core/build.gradle.kts @@ -241,16 +241,16 @@ dependencies { testImplementation("io.ktor:ktor-client-mock:$ktor_version") testImplementation("com.h2database:h2:$h2_version") - testImplementation("org.mockito.kotlin:mockito-kotlin:5.2.1") + testImplementation("org.mockito.kotlin:mockito-kotlin:5.3.1") testImplementation("org.mockito:mockito-inline:5.2.0") - testImplementation("nl.jqno.equalsverifier:equalsverifier:3.15.6") + testImplementation("nl.jqno.equalsverifier:equalsverifier:3.16.1") testImplementation("com.jparams:to-string-verifier:1.4.8") intTestImplementation("org.springframework.boot:spring-boot-starter-test") intTestImplementation("org.springframework.security:spring-security-test") intTestImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version") intTestImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines_version") - intTestImplementation("org.mockito.kotlin:mockito-kotlin:5.2.1") + intTestImplementation("org.mockito.kotlin:mockito-kotlin:5.3.1") intTestImplementation("com.h2database:h2:$h2_version") e2eTestImplementation("org.springframework.boot:spring-boot-starter-test") diff --git a/hideout-worker/gradle/wrapper/gradle-wrapper.properties b/hideout-worker/gradle/wrapper/gradle-wrapper.properties index 87fc5420..cb13ebfe 100644 --- a/hideout-worker/gradle/wrapper/gradle-wrapper.properties +++ b/hideout-worker/gradle/wrapper/gradle-wrapper.properties @@ -2,5 +2,8 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/owl/build.gradle.kts b/owl/build.gradle.kts index 4f4311b7..36e9a22a 100644 --- a/owl/build.gradle.kts +++ b/owl/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - kotlin("jvm") version "1.9.23" + kotlin("jvm") version "1.9.24" } diff --git a/owl/gradle/wrapper/gradle-wrapper.jar b/owl/gradle/wrapper/gradle-wrapper.jar index 249e5832..e6441136 100644 Binary files a/owl/gradle/wrapper/gradle-wrapper.jar and b/owl/gradle/wrapper/gradle-wrapper.jar differ diff --git a/owl/gradle/wrapper/gradle-wrapper.properties b/owl/gradle/wrapper/gradle-wrapper.properties index c3806883..b82aa23a 100644 --- a/owl/gradle/wrapper/gradle-wrapper.properties +++ b/owl/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ -#Sun Feb 18 23:33:24 JST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/owl/gradlew b/owl/gradlew index 1b6c7873..1aa94a42 100644 --- a/owl/gradlew +++ b/owl/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,13 +80,11 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,22 +131,29 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then done fi -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ @@ -205,6 +214,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/owl/gradlew.bat b/owl/gradlew.bat index 107acd32..7101f8e4 100644 --- a/owl/gradlew.bat +++ b/owl/gradlew.bat @@ -1,89 +1,92 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/owl/owl-broker/build.gradle.kts b/owl/owl-broker/build.gradle.kts index 4b899ab2..df56c538 100644 --- a/owl/owl-broker/build.gradle.kts +++ b/owl/owl-broker/build.gradle.kts @@ -18,9 +18,9 @@ repositories { dependencies { implementation("io.grpc:grpc-kotlin-stub:1.4.1") - implementation("io.grpc:grpc-protobuf:1.61.1") - implementation("com.google.protobuf:protobuf-kotlin:3.25.3") - implementation("io.grpc:grpc-netty:1.61.1") + implementation("io.grpc:grpc-protobuf:1.63.0") + implementation("com.google.protobuf:protobuf-kotlin:4.26.1") + implementation("io.grpc:grpc-netty:1.63.0") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0") implementation(project(":owl-common")) implementation("org.apache.logging.log4j:log4j-slf4j2-impl:2.23.1") @@ -40,11 +40,11 @@ kotlin { protobuf { protoc { - artifact = "com.google.protobuf:protoc:3.25.3" + artifact = "com.google.protobuf:protoc:4.26.1" } plugins { create("grpc") { - artifact = "io.grpc:protoc-gen-grpc-java:1.61.1" + artifact = "io.grpc:protoc-gen-grpc-java:1.63.0" } create("grpckt") { artifact = "io.grpc:protoc-gen-grpc-kotlin:1.4.1:jdk8@jar" diff --git a/owl/owl-broker/owl-broker-mongodb/build.gradle.kts b/owl/owl-broker/owl-broker-mongodb/build.gradle.kts index a58eed2d..2d5c4723 100644 --- a/owl/owl-broker/owl-broker-mongodb/build.gradle.kts +++ b/owl/owl-broker/owl-broker-mongodb/build.gradle.kts @@ -16,7 +16,7 @@ repositories { } dependencies { - implementation("org.mongodb:mongodb-driver-kotlin-coroutine:5.0.0") + implementation("org.mongodb:mongodb-driver-kotlin-coroutine:5.1.0") implementation(project(":owl-broker")) implementation(project(":owl-common")) implementation(platform("io.insert-koin:koin-bom:3.5.6")) diff --git a/owl/owl-consumer/build.gradle.kts b/owl/owl-consumer/build.gradle.kts index a2e2fe0e..a5f74c04 100644 --- a/owl/owl-consumer/build.gradle.kts +++ b/owl/owl-consumer/build.gradle.kts @@ -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.61.1") - implementation("com.google.protobuf:protobuf-kotlin:3.25.3") - implementation("io.grpc:grpc-netty:1.61.1") + implementation("io.grpc:grpc-protobuf:1.63.0") + implementation("com.google.protobuf:protobuf-kotlin:4.26.1") + implementation("io.grpc:grpc-netty:1.63.0") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0") implementation(project(":owl-common")) protobuf(files(project(":owl-broker").dependencyProject.projectDir.toString() + "/src/main/proto")) @@ -30,11 +30,11 @@ kotlin { protobuf { protoc { - artifact = "com.google.protobuf:protoc:3.25.3" + artifact = "com.google.protobuf:protoc:4.26.1" } plugins { create("grpc") { - artifact = "io.grpc:protoc-gen-grpc-java:1.61.1" + artifact = "io.grpc:protoc-gen-grpc-java:1.63.0" } create("grpckt") { artifact = "io.grpc:protoc-gen-grpc-kotlin:1.4.1:jdk8@jar" diff --git a/owl/owl-producer/owl-producer-default/build.gradle.kts b/owl/owl-producer/owl-producer-default/build.gradle.kts index 5763484c..f2c86431 100644 --- a/owl/owl-producer/owl-producer-default/build.gradle.kts +++ b/owl/owl-producer/owl-producer-default/build.gradle.kts @@ -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.61.1") - implementation("com.google.protobuf:protobuf-kotlin:3.25.3") - implementation("io.grpc:grpc-netty:1.61.1") + implementation("io.grpc:grpc-protobuf:1.63.0") + implementation("com.google.protobuf:protobuf-kotlin:4.26.1") + implementation("io.grpc:grpc-netty:1.63.0") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0") implementation(project(":owl-common")) protobuf(files(project(":owl-broker").dependencyProject.projectDir.toString() + "/src/main/proto")) @@ -31,11 +31,11 @@ kotlin { protobuf { protoc { - artifact = "com.google.protobuf:protoc:3.25.3" + artifact = "com.google.protobuf:protoc:4.26.1" } plugins { create("grpc") { - artifact = "io.grpc:protoc-gen-grpc-java:1.61.1" + artifact = "io.grpc:protoc-gen-grpc-java:1.63.0" } create("grpckt") { artifact = "io.grpc:protoc-gen-grpc-kotlin:1.4.1:jdk8@jar" diff --git a/owl/settings.gradle.kts b/owl/settings.gradle.kts index 01bd9628..b78e970f 100644 --- a/owl/settings.gradle.kts +++ b/owl/settings.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("org.gradle.toolchains.foojay-resolver-convention") version "0.5.0" + id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0" } dependencyResolutionManagement { repositories {