Skip to content

Commit

Permalink
:dependabot: Bump gradle from 8.5.0-jdk21 to 8.6.0-jdk21
Browse files Browse the repository at this point in the history
* upgrade gradle wrapper to version 8.6-rc-1

* upgrade to gradle 8.6-rc-2

* upgrade to gradle 8.6-rc-3

* bump gradle wrapper to 8.6-rc-4

* upgrade gradle wrapper to version 8.6

* :dependabot: Bump gradle from 8.5.0-jdk21 to 8.6.0-jdk21

Bumps gradle from 8.5.0-jdk21 to 8.6.0-jdk21.

---
updated-dependencies:
- dependency-name: gradle
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* ci: rm caching of project folder

cache uploaded by post-setup step of java setup is not being used and therefore seems to be a waste of time and space

* 🐳: clear cached apt packages from deploy container

* codespaces: add sonarlint vscode extension && install nodejs

* codespaces: try to install fontconfig after startup

* ci: show gradle deprecation warnings

* dont exit terminal after nvm run

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: JKatzwinkel <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
dependabot[bot] and JKatzwinkel authored Feb 5, 2024
1 parent 5b19e36 commit 749fb4e
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 17 deletions.
17 changes: 15 additions & 2 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,30 @@
},
"ghcr.io/devcontainers/features/docker-in-docker:2": {}
},
"postStartCommand": "sudo apt-get update && sudo apt-get install -y fontconfig && sudo apt-get clean",
"postAttachCommand": "nvm install 21.6.1",
"customizations": {
"vscode": {
"extensions": [
"ryanluker.vscode-coverage-gutters"
"ryanluker.vscode-coverage-gutters",
"SonarSource.sonarlint-vscode"
],
"settings": {
"editor.renderWhitespace": "all",
"coverage-gutters.coverageFileNames": [
"jacocoTestReport.xml"
],
"coverage-gutters.showLineCoverage": true
"coverage-gutters.showLineCoverage": true,
"sonarlint.pathToNodeExecutable": "/usr/local/share/nvm/versions/node/v21.6.1/bin/node",
"sonarlint.output.showVerboseLogs": true,
"sonarlint.analyzerProperties": {
"sonar.java.source": "21"
},
"search.exclude": {
"gradlew": true,
"gradlew.bat": true,
"gradle/": true
}
}
}
}
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,9 @@ jobs:
with:
distribution: temurin
java-version: ${{ matrix.java-version }}
cache: gradle

- name: run tests && build project
run: ./gradlew build --no-daemon
run: ./gradlew build --no-daemon --warning-mode all

- uses: mikepenz/[email protected]
if: always()
Expand Down
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gradle:8.5.0-jdk21 AS build
FROM gradle:8.6.0-jdk21 AS build

COPY --chown=gradle:gradle . /home/gradle/tla-frontend
WORKDIR /home/gradle/tla-frontend
Expand All @@ -7,7 +7,8 @@ RUN gradle installAssets bootJar --no-daemon

FROM openjdk:23-jdk-slim-bookworm

RUN mkdir /app; apt-get update && apt-get install -y fontconfig
RUN mkdir /app; apt-get update && apt-get install -y fontconfig \
&& apt-get clean
WORKDIR /app

COPY --from=build /home/gradle/tla-frontend/build/libs/*.jar /app/tla-web-frontend.jar
Expand Down
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\://services.gradle.org/distributions/gradle-8.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
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

0 comments on commit 749fb4e

Please sign in to comment.