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

Latest and greatest versions #14

Merged
merged 23 commits into from
Nov 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
cbdc4bc
chore(jvm): upgrade from Java `19` to `20`
PascalHonegger Sep 13, 2023
6dc8e0a
chore(gradle): upgrade from Gradle `7.6` to `8.3`
PascalHonegger Sep 13, 2023
5d3f97a
chore(deps): upgrade `kover` from `0.6.0` to `0.7.3`
PascalHonegger Sep 13, 2023
86b5ada
chore(deps): upgrade `kotlin` from `1.8.10` to `1.9.10`
PascalHonegger Sep 13, 2023
3547769
chore(deps): upgrade `ben-manes.versions` from `0.45.0` to `0.48.0`
PascalHonegger Sep 13, 2023
d7f5777
chore(deps): upgrade `testcontainers` from `1.17.6` to `1.19.0`
PascalHonegger Sep 13, 2023
e72e0a1
chore(deps): upgrade `mockk` from `1.13.4` to `1.13.7`
PascalHonegger Sep 13, 2023
cd43f57
chore(deps): upgrade `ktor` from `2.2.3` to `2.3.4`
PascalHonegger Sep 13, 2023
ef1a298
chore(deps): upgrade `kotlinx.datetime` from `0.4.0` to `0.4.1`
PascalHonegger Sep 13, 2023
a18d77a
chore(deps): upgrade `postgresql` from `42.5.4` to `42.6.0`
PascalHonegger Sep 13, 2023
aef01fd
chore(deps): upgrade `logback` from `1.4.5` to `1.4.11`
PascalHonegger Sep 13, 2023
36cc907
chore(deps): upgrade `jooq` gradle plugin from `8.1` to `8.2.1`
PascalHonegger Sep 13, 2023
3473bda
chore(deps): upgrade `flyway` from `9.15.0` to `9.22.1`
PascalHonegger Sep 13, 2023
f89c74f
chore(deps): upgrade `shadow` from `7.1.2` to `8.1.1`
PascalHonegger Sep 13, 2023
1d679a2
chore(deps): upgrade `kotlin-logging` from `3.0.3` to `5.1.0`
PascalHonegger Sep 13, 2023
0101ad6
feat(gradle): enable configuration cache
PascalHonegger Sep 13, 2023
62e21ad
feat(kotlin): enable experimental K2 compiler
PascalHonegger Sep 13, 2023
4c501c6
feat(gradle): add foojay resolver convention
PascalHonegger Sep 24, 2023
3226fa1
refactor(frontend): migrate from NPM to PNPM
PascalHonegger Sep 24, 2023
4bde78a
chore(pnpm): update to latest versions
PascalHonegger Sep 24, 2023
db97485
chore(gradle): upgrade from Gradle `8.3` to `8.4`
PascalHonegger Oct 17, 2023
8968aad
feat(frontend): migrate to vite
PascalHonegger Sep 24, 2023
c16ae7d
feat(config): default to 4h session timeout
PascalHonegger Nov 18, 2023
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
22 changes: 2 additions & 20 deletions .github/workflows/backend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,30 +18,12 @@ jobs:
- uses: actions/setup-java@v3
with:
distribution: temurin
java-version: 19
java-version: 21
cache: gradle
- name: Verify
run: ./gradlew --no-daemon check koverMergedHtmlReport koverMergedVerify
run: ./gradlew --no-daemon check koverHtmlReport koverVerify
- name: Archive code coverage results
uses: actions/upload-artifact@v3
with:
name: code-coverage-report
path: build/reports/kover/html/

qodana-jvm:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
distribution: temurin
java-version: 19
cache: gradle
- name: Build
run: ./gradlew --no-daemon assemble
- name: 'Qodana JVM Scan'
uses: JetBrains/[email protected]
with:
args: '--linter,jetbrains/qodana-jvm'
artifact-name: 'qodana-jvm-report'
cache-dir: ${{ runner.temp }}/qodana-jvm/caches
31 changes: 8 additions & 23 deletions .github/workflows/frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,30 +15,15 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: pnpm/action-setup@v2
with:
node-version: 18
cache: npm
cache-dependency-path: Frontend/package-lock.json
- run: npm ci
working-directory: Frontend
- run: npm run lint
working-directory: Frontend

qodana-js:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
package_json_file: Frontend/package.json
- uses: actions/setup-node@v3
with:
node-version: 18
cache: npm
cache-dependency-path: Frontend/package-lock.json
- run: npm ci
node-version: 20
cache: pnpm
cache-dependency-path: Frontend/pnpm-lock.yaml
- run: pnpm i
working-directory: Frontend
- run: pnpm lint
working-directory: Frontend
- name: 'Qodana JS Scan'
uses: JetBrains/[email protected]
with:
args: '-i,Frontend,--linter,jetbrains/qodana-js'
artifact-name: 'qodana-js-report'
cache-dir: ${{ runner.temp }}/qodana-js/caches
2 changes: 1 addition & 1 deletion .github/workflows/gradle-dependency-submission.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- uses: actions/setup-java@v3
with:
distribution: temurin
java-version: 19
java-version: 21
cache: gradle

- name: Run snapshot action
Expand Down
23 changes: 13 additions & 10 deletions .github/workflows/operations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,25 +18,28 @@ jobs:
- uses: actions/setup-java@v3
with:
distribution: temurin
java-version: 19
java-version: 21
cache: gradle
- uses: pnpm/action-setup@v2
with:
package_json_file: Frontend/package.json
- uses: actions/setup-node@v3
with:
node-version: 18
cache: npm
cache-dependency-path: Frontend/package-lock.json
- run: npm ci
node-version: 20
cache: pnpm
cache-dependency-path: Frontend/pnpm-lock.yaml
- run: pnpm i
working-directory: Frontend
- name: Build Frontend
run: npm run build
run: pnpm build
working-directory: Frontend
- name: Build Backend
run: ./gradlew --no-daemon shadowJar

- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
- name: Login to GitHub Container Registry
uses: docker/login-action@v2
with:
Expand All @@ -45,7 +48,7 @@ jobs:
password: ${{ github.token }}
- name: Docker meta
id: meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: |
ghcr.io/pascalhonegger/jasstracker
Expand All @@ -55,7 +58,7 @@ jobs:
type=semver,pattern={{major}}
type=ref,event=pr
- name: Build and push container images
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
file: DockerfileBuiltLocally
context: .
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.

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.

4 changes: 2 additions & 2 deletions .idea/misc.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/runConfigurations/Postgres_Dev.xml

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

7 changes: 6 additions & 1 deletion Backend/bootstrap/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
@Suppress("DSL_SCOPE_VIOLATION") // see https://youtrack.jetbrains.com/issue/KTIJ-19369
plugins {
application
alias(libs.plugins.kotlin.jvm)
alias(libs.plugins.shadow)
alias(libs.plugins.kover)
}

application {
Expand All @@ -12,6 +12,10 @@ application {
applicationDefaultJvmArgs = listOf("-Dio.ktor.development=$isDevelopment")
}

kotlin {
jvmToolchain(20)
}

dependencies {
implementation(project(":Backend:data-access"))
implementation(project(":Backend:domain"))
Expand All @@ -31,6 +35,7 @@ dependencies {
implementation(libs.kotlinx.datetime)
implementation(libs.logback)
implementation(libs.kotlin.logging)
implementation(libs.slf4j)
implementation(libs.java.jwt)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import io.ktor.server.plugins.contentnegotiation.*
import io.ktor.server.plugins.cors.routing.*
import io.ktor.server.plugins.statuspages.*
import io.ktor.server.request.*
import mu.KotlinLogging
import io.github.oshai.kotlinlogging.KotlinLogging

fun Application.configureHTTP() {
val log = KotlinLogging.logger { }
Expand Down
2 changes: 1 addition & 1 deletion Backend/bootstrap/src/main/resources/application.conf
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jwt {
audience = ${?JWT_AUDIENCE}
realm = "JassTracker"
realm = ${?JWT_REALM}
expiryTime = 2h
expiryTime = 4h
expiryTime = ${?JWT_EXPIRY_TIME}
}

Expand Down
6 changes: 5 additions & 1 deletion Backend/data-access/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
import org.jooq.meta.jaxb.ForcedType

@Suppress("DSL_SCOPE_VIOLATION") // see https://youtrack.jetbrains.com/issue/KTIJ-19369
plugins {
java
alias(libs.plugins.kotlin.jvm)
alias(libs.plugins.jooq)
alias(libs.plugins.kover)
}

kotlin {
jvmToolchain(20)
}

dependencies {
Expand Down

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

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

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

Loading