Skip to content

Commit

Permalink
Merge pull request #12 from PascalHonegger/dependency-upgrades
Browse files Browse the repository at this point in the history
chore(deps): upgrade all to latest
  • Loading branch information
PascalHonegger authored Feb 24, 2023
2 parents d09192c + e452b13 commit 7a54d02
Show file tree
Hide file tree
Showing 29 changed files with 1,548 additions and 13,747 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/backend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ jobs:
- uses: actions/setup-java@v3
with:
distribution: temurin
java-version: 18
java-version: 19
cache: gradle
- name: Verify
run: ./gradlew check koverMergedHtmlReport koverMergedVerify
run: ./gradlew --no-daemon check koverMergedHtmlReport koverMergedVerify
- name: Archive code coverage results
uses: actions/upload-artifact@v3
with:
Expand All @@ -35,12 +35,12 @@ jobs:
- uses: actions/setup-java@v3
with:
distribution: temurin
java-version: 18
java-version: 19
cache: gradle
- name: Build
run: ./gradlew assemble
run: ./gradlew --no-daemon assemble
- name: 'Qodana JVM Scan'
uses: JetBrains/qodana-action@v2022.2.1
uses: JetBrains/qodana-action@v2022.3.4
with:
args: '--linter,jetbrains/qodana-jvm'
artifact-name: 'qodana-jvm-report'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
- run: npm ci
working-directory: Frontend
- name: 'Qodana JS Scan'
uses: JetBrains/qodana-action@v2022.2.1
uses: JetBrains/qodana-action@v2022.3.4
with:
args: '-i,Frontend,--linter,jetbrains/qodana-js'
artifact-name: 'qodana-js-report'
Expand Down
34 changes: 34 additions & 0 deletions .github/workflows/gradle-dependency-submission.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@

name: Gradle Dependency Submission
on:
push:
branches:
- main

jobs:
gradle-action-detection:
runs-on: ubuntu-latest
# The Dependency Submission API requires write permission
permissions:
contents: write
steps:
- name: Checkout Gradle Build Cache
uses: actions/cache@v3
with:
path: |
~/.gradle/caches
~/.gradle/wrapper
!~/.gradle/wrapper/dists/**/gradle*.zip
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
restore-keys: |
gradle-${{ runner.os }}-
- name: 'Checkout Repository'
uses: actions/checkout@v3

- name: Run snapshot action
uses: mikepenz/gradle-dependency-submission@main
with:
gradle-build-module: |-
:Backend:bootstrap
sub-module-mode: 'INDIVIDUAL_DEEP'
4 changes: 2 additions & 2 deletions .github/workflows/operations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- uses: actions/setup-java@v3
with:
distribution: temurin
java-version: 18
java-version: 19
cache: gradle
- uses: actions/setup-node@v3
with:
Expand All @@ -31,7 +31,7 @@ jobs:
run: npm run build
working-directory: Frontend
- name: Build Backend
run: ./gradlew shadowJar
run: ./gradlew --no-daemon shadowJar

- name: Set up QEMU
uses: docker/setup-qemu-action@v2
Expand Down
2 changes: 1 addition & 1 deletion .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/kotlinc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 0 additions & 11 deletions .idea/modules/JassTracker.iml

This file was deleted.

1 change: 0 additions & 1 deletion .vscode/spellright.dict
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
hyperref
amsrefs
TeXclipse
latexdiff
Backend
Qodana
Vue
Expand Down
2 changes: 1 addition & 1 deletion Backend/data-access/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ tasks.withType<Test> {

java {
toolchain {
languageVersion.set(JavaLanguageVersion.of("18"))
languageVersion.set(JavaLanguageVersion.of("19"))
}
}

Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ WORKDIR /home/node/src
RUN npm ci
RUN npm run build

FROM openjdk:18 AS buildBackend
FROM eclipse-temurin:19-jdk AS buildBackend
COPY . /home/gradle/src
COPY --from=buildFrontend /home/node/src/dist /home/gradle/src/Backend/bootstrap/src/main/resources/static
WORKDIR /home/gradle/src
RUN ./gradlew shadowJar --no-daemon

FROM openjdk:18
FROM eclipse-temurin:19-jre
EXPOSE 8080:8080
RUN mkdir /app
COPY --from=buildBackend /home/gradle/src/Backend/bootstrap/build/libs/*.jar /app/jasstracker.jar
Expand Down
2 changes: 1 addition & 1 deletion DockerfileBuiltLocally
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM openjdk:18
FROM eclipse-temurin:19-jre
EXPOSE 8080:8080
RUN mkdir /app
COPY ./Backend/bootstrap/build/libs/*.jar /app/jasstracker.jar
Expand Down
2 changes: 0 additions & 2 deletions Documentation/.gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
### LaTeX Documentation ###
out/
latexdiff-base/
gitDescription.tmp
src/**/*.aux
src/**/*.gz
src/**/*.log
Expand Down
32 changes: 3 additions & 29 deletions Documentation/makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,42 +4,16 @@
# Tested with the TeX Live 2021 snapshot as of 09.12.2021
# Docker image: registry.gitlab.com/islandoftex/images/texlive:TL2021-2021-12-05-04-05

gitDescription:
git describe --exclude "latexdiff-base" --always --long --dirty --broken > gitDescription.tmp

doc: gitDescription
doc:
# Note: pdflatex does not work well when the out and aux directories are different
latexmk -outdir=../out -cd -interaction=batchmode -pdf src/main.tex

proposal: gitDescription
# Note: pdflatex does not work well when the out and aux directories are different
latexmk -outdir=../out -cd -interaction=batchmode -pdf src/project-proposal-standalone.tex

gitDiffDescription:
# Note the double $ are needed to escape the $ within a makefile.
# Use only one $ when running the following command in the shell.
printf "%s (diff with %s)" $$(git describe --exclude "latexdiff-base" --always --long --dirty --broken) $$(git describe --exclude "latexdiff-base" --always --long latexdiff-base) > gitDescription.tmp

doc_diff: gitDiffDescription
rm -rf latexdiff-base
mkdir latexdiff-base
git archive --format=tar latexdiff-base | (cd latexdiff-base && tar xf -)
# Note: Change to the base directory before running latexdiff. Otherwise the .sty files cannot be found.
# Note: In the makefile, each command is executed in a sub-process shell. Therefore, one needs to chain `cd` using `&&` or `;` into one command.
# Note: The `-` prefix instructs make to ignore the exit code of the command. The exit code of the following command is ignored since latexdiff and pdflatex do not work well together. Pdflatex generates an error, but is still able to generate the document.
-cd latexdiff-base/src && \
latexdiff -V --flatten main.tex ../../src/main.tex > diff.tex && \
latexmk -outdir=../../out -cd -interaction=batchmode -pdf -f diff.tex

all: proposal doc doc_diff
all: doc

clean:
rm -rf out
rm -rf latexdiff-base
rm gitDescription.tmp

# Can be used locally as e.g. make docker-doc or make docker-proposal, ...
# Can be used locally as e.g. make docker-doc ...
docker-%:
docker run --rm -v "$(CURDIR)/../:/opt/ws" -w "/opt/ws/Documentation" registry.gitlab.com/islandoftex/images/texlive:latest make $*
# docker run --rm -v "$(CURDIR)/../:/opt/ws" -w "/opt/ws/Documentation" registry.gitlab.com/islandoftex/images/texlive:TL2021-2021-04-11-04-09 make $*

8 changes: 0 additions & 8 deletions Documentation/src/custom.tex
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,6 @@
% Note: The changes within `\instructions` are not visible in latexdiff when they are typeset in this way
% \newcommand{\instructions}[1]{ { \color{blue} #1 } }

% Get a git version description roughly using the idea in
% https://blog.wxm.be/2013/08/20/automated-git-commit-number-in-latex.html
% Note that the file that is included needs to be generated before the document is built.
% Refer to the makefile for further details.
\IfFileExists{../gitDescription.tmp}
{\newcommand{\gitDescription}{\input{../gitDescription.tmp}}}
{\newcommand{\gitDescription}{Not available}}

% Note: Importing hyperref must be done towards the end since it
% redefines many macros
%
Expand Down
3 changes: 0 additions & 3 deletions Documentation/src/main.tex
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,6 @@ \part{Product Documentation}


\part{Project Documentation}
% Note: The project proposal needs to be included in the following way (i.e. using `\input` and not `\include`, and with the `\chapter` declaration outside the input{}-tag), since the proposal can also be generated as a stand-alone document.
% \chapter{Initial Project Proposal}
% \input{03_project-documentation/01_project-proposal}
\input{03_project-documentation/02_project-plan}
\input{03_project-documentation/03_time-tracking-report}
\input{03_project-documentation/04_personal-reports}
Expand Down
21 changes: 0 additions & 21 deletions Documentation/src/project-proposal-standalone.tex

This file was deleted.

1 change: 0 additions & 1 deletion Documentation/src/title-page.tex
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@

Version: 1.0 \\
Date: \DTMnow \\
Git Version: \gitDescription
\vspace{1 cm}

\begin{tabular}{rl}
Expand Down
Loading

0 comments on commit 7a54d02

Please sign in to comment.