Skip to content

Commit

Permalink
build: bump dependency versions
Browse files Browse the repository at this point in the history
  • Loading branch information
dragove committed Oct 28, 2024
1 parent 3457b97 commit 6b62bba
Show file tree
Hide file tree
Showing 7 changed files with 41 additions and 39 deletions.
35 changes: 18 additions & 17 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@

import org.hidetake.gradle.swagger.generator.GenerateSwaggerCode
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jlleitschuh.gradle.ktlint.reporter.ReporterType

plugins {
java
id("org.springframework.boot") version "3.2.2"
id("io.spring.dependency-management") version "1.1.4"
id("org.springdoc.openapi-gradle-plugin") version "1.8.0"
id("org.springframework.boot") version "3.3.5"
id("io.spring.dependency-management") version "1.1.6"
id("org.springdoc.openapi-gradle-plugin") version "1.9.0"
// id("org.graalvm.buildtools.native") version "0.9.28"
id("org.hidetake.swagger.generator") version "2.19.2"
id("com.gorylenko.gradle-git-properties") version "2.4.1"
id("com.gorylenko.gradle-git-properties") version "2.4.2"

kotlin("jvm") version "1.9.22"
kotlin("plugin.spring") version "1.9.22"
kotlin("kapt") version "1.9.22"
kotlin("jvm") version "1.9.25"
kotlin("plugin.spring") version "1.9.25"
kotlin("kapt") version "1.9.25"

id("org.jlleitschuh.gradle.ktlint") version "12.1.0"
id("org.jlleitschuh.gradle.ktlint") version "12.1.1"
}

group = "plus.maa"
Expand Down Expand Up @@ -43,13 +44,13 @@ repositories {
}

dependencies {
val hutoolVersion = "5.8.26"
val hutoolVersion = "5.8.32"
val mapstructVersion = "1.5.5.Final"

kapt("org.springframework.boot:spring-boot-configuration-processor")

testImplementation("io.mockk:mockk:1.13.9")
testImplementation("org.springframework.boot:spring-boot-starter-test")
testImplementation("io.mockk:mockk:1.13.13")
// testImplementation("org.springframework.boot:spring-boot-starter-test")

implementation("org.springframework.boot:spring-boot-starter-web")
implementation("org.springframework.boot:spring-boot-starter-webflux")
Expand All @@ -72,7 +73,7 @@ dependencies {
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test")

// kotlin-logging
implementation("io.github.oshai:kotlin-logging-jvm:6.0.3")
implementation("io.github.oshai:kotlin-logging-jvm:7.0.0")

// hutool 的邮箱工具类依赖
implementation("com.sun.mail:javax.mail:1.6.2")
Expand All @@ -84,19 +85,19 @@ dependencies {
implementation("org.mapstruct:mapstruct:$mapstructVersion")
kapt("org.mapstruct:mapstruct-processor:$mapstructVersion")

implementation("org.eclipse.jgit:org.eclipse.jgit:6.8.0.202311291450-r")
implementation("org.eclipse.jgit:org.eclipse.jgit.ssh.apache.agent:6.8.0.202311291450-r")
implementation("org.freemarker:freemarker:2.3.32")
implementation("org.eclipse.jgit:org.eclipse.jgit:7.0.0.202409031743-r")
implementation("org.eclipse.jgit:org.eclipse.jgit.ssh.apache.agent:7.0.0.202409031743-r")
implementation("org.freemarker:freemarker:2.3.33")
implementation("com.github.ben-manes.caffeine:caffeine:3.1.8")
implementation("com.github.erosb:everit-json-schema:1.14.4") {
exclude("commons-logging", "commons-logging")
}
implementation("com.google.guava:guava:32.1.3-jre")
implementation("com.google.guava:guava:33.3.1-jre")
implementation("org.aspectj:aspectjweaver:1.9.21")

implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")

swaggerCodegen("org.openapitools:openapi-generator-cli:7.2.0")
swaggerCodegen("org.openapitools:openapi-generator-cli:7.9.0")
}

val swaggerOutputDir = layout.buildDirectory.dir("docs")
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https://mirrors.huaweicloud.com/gradle/gradle-8.6-bin.zip
distributionUrl=https://mirrors.huaweicloud.com/gradle/gradle-8.10.2-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
17 changes: 9 additions & 8 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@ done
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
# 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
Expand Down Expand Up @@ -144,15 +145,15 @@ 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=SC3045
# 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=SC3045
# shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down Expand Up @@ -201,11 +202,11 @@ fi
# 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, 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.
# 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" \
Expand Down
20 changes: 10 additions & 10 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 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.
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

Expand All @@ -57,11 +57,11 @@ 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.
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

Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/plus/maa/backend/MainApplication.kt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import org.springframework.security.config.annotation.method.configuration.Enabl
@SpringBootApplication
@ConfigurationPropertiesScan
@EnableMethodSecurity
open class MainApplication
class MainApplication

fun main(args: Array<String>) {
runApplication<MainApplication>(*args)
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/application-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ spring:
# uri: mongodb://localhost:27017/MaaBackend
# 有密码
# uri: mongodb://用户名:密码@localhost:27017/MaaBackend
uri: mongodb://localhost/MaaBackend
uri: mongodb://127.0.0.1/MaaBackend
redis:
port: 6379
host: localhost
host: 127.0.0.1

maa-copilot:
backup:
Expand Down

0 comments on commit 6b62bba

Please sign in to comment.