diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 222575e..930832b 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -7,22 +7,27 @@ on: jobs: build: runs-on: ubuntu-latest + timeout-minutes: 30 steps: - name: "git / checkout" - uses: actions/checkout@v6 + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 + - name: "docker / login" - uses: docker/login-action@v4 + uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0 with: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} + - name: "java / setup" - uses: actions/setup-java@v5 + uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5.7.0 with: check-latest: true distribution: zulu java-version: 25 + - name: "gradle / setup" - uses: gradle/actions/setup-gradle@v6 + uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # 6.3.0 + - name: "gradle / build" run: ./gradlew jib -Djib.console=plain --stacktrace diff --git a/build.gradle.kts b/build.gradle.kts index e0cb8b9..81b3f3d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -84,6 +84,7 @@ spotless { tasks.named("sourcesJar") { dependsOn(tasks.named("collectExternalDependenciesForSentry")) + dependsOn(tasks.named("generateGitProperties")) dependsOn(tasks.named("generateSentryDebugMetaPropertiesjava")) } @@ -99,12 +100,12 @@ repositories { dependencies { annotationProcessor("org.springframework.boot:spring-boot-configuration-processor") - compileOnlyApi("org.jspecify:jspecify:1.0.0") + compileOnlyApi("org.jspecify:jspecify:1.0.1") developmentOnly("org.springframework.boot:spring-boot-devtools") - implementation("com.bucket4j:bucket4j_jdk17-caffeine:8.18.0") - implementation("com.bucket4j:bucket4j_jdk17-core:8.18.0") + implementation("com.bucket4j:bucket4j_jdk17-caffeine:8.19.0") + implementation("com.bucket4j:bucket4j_jdk17-core:8.19.0") implementation("com.discord4j:discord4j-core:3.3.2") implementation("com.github.ben-manes.caffeine:caffeine:3.2.4") implementation("com.google.guava:guava:33.6.0-jre") @@ -114,7 +115,7 @@ dependencies { implementation("io.jsonwebtoken:jjwt-jackson:0.13.0") implementation("io.micrometer:micrometer-registry-prometheus") implementation("org.apache.commons:commons-text:1.15.0") - implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:3.0.3") + implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:3.1.0") implementation("org.springframework.boot:spring-boot-starter-actuator") implementation("org.springframework.boot:spring-boot-starter-data-mongodb") implementation("org.springframework.boot:spring-boot-starter-graphql") @@ -122,7 +123,7 @@ dependencies { implementation("org.springframework.boot:spring-boot-starter-security") implementation("org.springframework.boot:spring-boot-starter-validation") implementation("org.springframework.boot:spring-boot-starter-web") - implementation("software.amazon.awssdk:s3:2.44.2") + implementation("software.amazon.awssdk:s3:2.53.1") testImplementation("org.springframework.boot:spring-boot-starter-test") testImplementation("org.springframework.graphql:spring-graphql-test") diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0aa2df7..1a8b68b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,13 +1,13 @@ [versions] -indra = "4.0.0" +indra = "4.1.0" [plugins] -gradleGitProperties = { id = "com.gorylenko.gradle-git-properties", version = "2.5.7" } +gradleGitProperties = { id = "com.gorylenko.gradle-git-properties", version = "4.0.1" } indra = { id = "net.kyori.indra", version.ref = "indra" } indra-checkstyle = { id = "net.kyori.indra.checkstyle", version.ref = "indra" } indra-git = { id = "net.kyori.indra.git", version.ref = "indra" } -jib = { id = "com.google.cloud.tools.jib", version = "3.5.3" } -sentry = { id = "io.sentry.jvm.gradle", version = "6.3.0" } -spotless = { id = "com.diffplug.spotless", version = "8.4.0" } -spring-boot = { id = "org.springframework.boot", version = "4.0.6" } +jib = { id = "com.google.cloud.tools.jib", version = "3.5.4" } +sentry = { id = "io.sentry.jvm.gradle", version = "6.19.0" } +spotless = { id = "com.diffplug.spotless", version = "8.9.0" } +spring-boot = { id = "org.springframework.boot", version = "4.1.0" } spring-deps = { id = "io.spring.dependency-management", version = "1.1.7" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d997cfc..b1b8ef5 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1a70468..69dd0d0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,9 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip networkTimeout=10000 +retries=0 +retryBackOffMs=500 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 739907d..b9bb139 100755 --- a/gradlew +++ b/gradlew @@ -57,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/2d6327017519d23b96af35865dc997fcb544fb40/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. diff --git a/gradlew.bat b/gradlew.bat index c4bdd3a..24c62d5 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -23,8 +23,8 @@ @rem @rem ########################################################################## -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal +@rem Set local scope for the variables, and ensure extensions are enabled +setlocal EnableExtensions set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. @@ -51,7 +51,7 @@ 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 +"%COMSPEC%" /c exit 1 :findJavaFromJavaHome set JAVA_HOME=%JAVA_HOME:"=% @@ -65,7 +65,7 @@ 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 +"%COMSPEC%" /c exit 1 :execute @rem Setup the command line @@ -73,21 +73,10 @@ goto fail @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* +@rem endlocal doesn't take effect until after the line is parsed and variables are expanded +@rem which allows us to clear the local environment before executing the java command +endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel -: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 +:exitWithErrorLevel +@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts +"%COMSPEC%" /c exit %ERRORLEVEL%