Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to latest #15

Merged
merged 4 commits into from
May 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/backend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@ jobs:
backend:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 21
cache: gradle
- name: Verify
run: ./gradlew --no-daemon check koverHtmlReport koverVerify
- name: Archive code coverage results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: code-coverage-report
path: build/reports/kover/html/
4 changes: 2 additions & 2 deletions .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ jobs:
container:
image: texlive/texlive:latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Make LaTeX
working-directory: ./Documentation
run: make doc
- name: Archive built LaTeX documentation
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: documentation
path: Documentation/out/*.pdf
6 changes: 3 additions & 3 deletions .github/workflows/frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ jobs:
frontend:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v2
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4
with:
package_json_file: Frontend/package.json
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 20
cache: pnpm
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/gradle-dependency-submission.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ jobs:
permissions:
contents: write
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 21
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/operations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@ jobs:
build-image:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 21
cache: gradle
- uses: pnpm/action-setup@v2
- uses: pnpm/action-setup@v4
with:
package_json_file: Frontend/package.json
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 20
cache: pnpm
Expand Down
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,6 @@ gradle-app.setting
# JDT-specific (Eclipse Java Development Tools)
.classpath

*.DS_Store
.kotlin

*.DS_Store
2 changes: 1 addition & 1 deletion .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 Backend/bootstrap/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ application {
}

kotlin {
jvmToolchain(20)
jvmToolchain(21)
}

dependencies {
Expand Down
5 changes: 3 additions & 2 deletions Backend/data-access/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,14 @@ plugins {
}

kotlin {
jvmToolchain(20)
jvmToolchain(21)
}

dependencies {
implementation(project(":Backend:domain"))
implementation(libs.logback)
implementation(libs.flyway)
implementation(libs.flyway.core)
implementation(libs.flyway.postgresql)
implementation(libs.jooq)
implementation(libs.kotlinx.datetime)
implementation(libs.kotlin.reflect)
Expand Down
8 changes: 5 additions & 3 deletions Backend/domain/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins {
}

kotlin {
jvmToolchain(20)
jvmToolchain(21)
}

dependencies {
Expand All @@ -19,6 +19,8 @@ tasks.withType<Test> {
useJUnitPlatform()
}

tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
kotlinOptions.freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
tasks.named("compileKotlin", org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask::class) {
compilerOptions {
freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn")
}
}
2 changes: 1 addition & 1 deletion Backend/security/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins {
}

kotlin {
jvmToolchain(20)
jvmToolchain(21)
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion Backend/web-api/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
}

kotlin {
jvmToolchain(20)
jvmToolchain(21)
}

dependencies {
Expand Down
4 changes: 3 additions & 1 deletion Frontend/JassTracker.Frontend.iml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
<module type="WEB_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$" />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/node_modules" />
</content>
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
45 changes: 23 additions & 22 deletions Frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
"name": "jasstracker",
"version": "0.1.0",
"private": true,
"packageManager": "pnpm@8.10.5",
"packageManager": "pnpm@9.1.2+sha512.127dc83b9ea10c32be65d22a8efb4a65fb952e8fefbdfded39bdc3c97efc32d31b48b00420df2c1187ace28c921c902f0cb5a134a4d032b8b5295cbfa2c681e2",
"license": "MIT",
"type": "module",
"scripts": {
"dev": "vite",
"build": "run-p type-check \"build-only {@}\" --",
Expand All @@ -14,33 +15,33 @@
"format": "prettier --write src/"
},
"dependencies": {
"mande": "^2.0.8",
"mande": "^2.0.9",
"pinia": "^2.1.7",
"vue": "^3.3.8",
"vue": "^3.4.27",
"vue-draggable-next": "^2.2.1",
"vue-router": "^4.2.5",
"vue-router": "^4.3.2",
"vue-toastification": "2.0.0-rc.5",
"vue3-charts": "^1.1.33"
},
"devDependencies": {
"@rushstack/eslint-patch": "^1.5.1",
"@tsconfig/node18": "^18.2.2",
"@rushstack/eslint-patch": "^1.10.3",
"@tsconfig/node20": "^20.1.4",
"@types/d3-axis": "^3.0.6",
"@types/d3-shape": "^3.1.5",
"@types/node": "^20.9.1",
"@vitejs/plugin-vue": "^4.5.0",
"@vue/eslint-config-prettier": "^8.0.0",
"@vue/eslint-config-typescript": "^12.0.0",
"@vue/tsconfig": "^0.4.0",
"autoprefixer": "^10.4.16",
"eslint": "^8.54.0",
"eslint-plugin-vue": "^9.18.1",
"npm-run-all2": "^6.1.1",
"postcss": "^8.4.31",
"prettier": "^3.1.0",
"tailwindcss": "^3.3.5",
"typescript": "^5.2.2",
"vite": "^4.5.0",
"vue-tsc": "^1.8.22"
"@types/d3-shape": "^3.1.6",
"@types/node": "^20.12.12",
"@vitejs/plugin-vue": "^5.0.4",
"@vue/eslint-config-prettier": "^9.0.0",
"@vue/eslint-config-typescript": "^13.0.0",
"@vue/tsconfig": "^0.5.1",
"autoprefixer": "^10.4.19",
"eslint": "^8.57.0",
"eslint-plugin-vue": "^9.26.0",
"npm-run-all2": "^6.2.0",
"postcss": "^8.4.38",
"prettier": "^3.2.5",
"tailwindcss": "^3.4.3",
"typescript": "^5.4.5",
"vite": "^5.2.11",
"vue-tsc": "^2.0.19"
}
}
Loading
Loading