Skip to content

Commit

Permalink
fix(deps): update non-major
Browse files Browse the repository at this point in the history
  • Loading branch information
renovate[bot] authored Apr 6, 2024
1 parent b8af69d commit 5d3eae1
Show file tree
Hide file tree
Showing 10 changed files with 1,964 additions and 1,386 deletions.
20 changes: 10 additions & 10 deletions backend/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,14 @@ dependencies {
kapt("org.springframework.boot:spring-boot-configuration-processor")

// OpenAPI generation and Swagger UI https://springdoc.org/
implementation("org.springdoc:springdoc-openapi-ui:1.7.0")
implementation("org.springdoc:springdoc-openapi-kotlin:1.7.0")
implementation("org.springdoc:springdoc-openapi-ui:1.8.0")
implementation("org.springdoc:springdoc-openapi-kotlin:1.8.0")

// Serialization
implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.16.1")
implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.17.0")

// Postgres Database
implementation("org.postgresql:postgresql:42.7.1")
implementation("org.postgresql:postgresql:42.7.3")

// Caching with Ehcache https://www.ehcache.org/
implementation("org.ehcache:ehcache:3.10.8")
Expand All @@ -71,15 +71,15 @@ dependencies {
testImplementation("org.springframework.boot:spring-boot-starter-test") {
exclude(group = "org.junit.vintage", module = "junit-vintage-engine")
}
testImplementation("io.kotest:kotest-runner-junit5:5.8.0")
testImplementation("io.kotest:kotest-assertions-core:5.8.0")
testImplementation("io.kotest:kotest-runner-junit5:5.8.1")
testImplementation("io.kotest:kotest-assertions-core:5.8.1")
testImplementation("io.kotest.extensions:kotest-extensions-spring:1.1.3")
// Testcontainers to provide Postgres DB (https://testcontainers.org/)
testImplementation("org.testcontainers:testcontainers:1.19.3")
testImplementation("org.testcontainers:junit-jupiter:1.19.3")
testImplementation("org.testcontainers:postgresql:1.19.3")
testImplementation("org.testcontainers:testcontainers:1.19.7")
testImplementation("org.testcontainers:junit-jupiter:1.19.7")
testImplementation("org.testcontainers:postgresql:1.19.7")
// Mocking with Mockk (https://mockk.io/)
testImplementation("io.mockk:mockk:1.13.8")
testImplementation("io.mockk:mockk:1.13.10")
}

// Fix version requirement from Kotest
Expand Down
Binary file modified backend/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion backend/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\://services.gradle.org/distributions/gradle-8.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
17 changes: 9 additions & 8 deletions backend/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 backend/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

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion frontend/.yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ enableGlobalCache: true

nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-4.0.2.cjs
yarnPath: .yarn/releases/yarn-4.1.1.cjs
2 changes: 1 addition & 1 deletion frontend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ RUN yarn install --immutable
RUN yarn run build

# Bundle static assets with nginx
FROM nginx:1.25.3-alpine as production
FROM nginx:1.25.4-alpine as production
ENV NODE_ENV production
# Copy built assets from `builder` image
COPY --from=builder /app/build /usr/share/nginx/html
Expand Down
38 changes: 19 additions & 19 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
"node": "^20"
},
"dependencies": {
"@emotion/react": "11.11.3",
"@emotion/styled": "11.11.0",
"@mui/icons-material": "5.15.2",
"@mui/material": "5.15.2",
"@mui/styles": "5.15.2",
"@emotion/react": "11.11.4",
"@emotion/styled": "11.11.5",
"@mui/icons-material": "5.15.14",
"@mui/material": "5.15.14",
"@mui/styles": "5.15.14",
"@mui/x-date-pickers": "5.0.20",
"axios": "1.6.3",
"axios": "1.6.8",
"date-fns": "2.30.0",
"jotai": "2.6.1",
"jotai": "2.7.2",
"leaflet": "1.9.4",
"leaflet.heat": "0.2.0",
"notistack": "3.0.1",
Expand All @@ -31,22 +31,22 @@
"react-sliding-pane": "7.3.0"
},
"devDependencies": {
"@types/geojson": "7946.0.13",
"@types/geojson": "7946.0.14",
"@types/leaflet": "1.9.0",
"@types/leaflet.heat": "0.2.4",
"@types/node": "20.10.6",
"@types/react": "18.2.15",
"@types/react-dom": "18.2.7",
"@types/node": "20.12.3",
"@types/react": "18.2.74",
"@types/react-dom": "18.2.24",
"@types/react-infinite-scroller": "1.2.5",
"@typescript-eslint/eslint-plugin": "6.16.0",
"@typescript-eslint/parser": "6.16.0",
"@vitejs/plugin-react-swc": "3.5.0",
"eslint": "8.56.0",
"@typescript-eslint/eslint-plugin": "6.21.0",
"@typescript-eslint/parser": "6.21.0",
"@vitejs/plugin-react-swc": "3.6.0",
"eslint": "8.57.0",
"eslint-plugin-jsx-a11y": "6.8.0",
"eslint-plugin-react": "7.33.2",
"typescript": "5.3.3",
"vite": "5.0.11",
"eslint-plugin-react": "7.34.1",
"typescript": "5.4.3",
"vite": "5.2.8",
"vite-plugin-checker": "0.6.4"
},
"packageManager": "yarn@4.0.2"
"packageManager": "yarn@4.1.1"
}
Loading

0 comments on commit 5d3eae1

Please sign in to comment.