Skip to content
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
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

[![build and test](https://github.com/jactor-rises/jactor-shared/actions/workflows/build-test.yaml/badge.svg?label=build%20and%20test&cachebust=20260208)](https://github.com/jactor-rises/jactor-shared/actions/workflows/build-test.yaml)

Shared beans between [jactor-persistence](https://github.com/jactor-rises/jactor-modules/tree/main/persistence) and
[jactor-web](https://github.com/jactor-rises/jactor-modules/tree/main/web) http api and json-serialization
Shared beans between [jactor-persistence](https://github.com/jactor-rises/jactor-persistence) and
[jactor-web](https://github.com/jactor-rises/jactor-web) http api and json-serialization

will be available using [jitpack.io](https://jitpack.io/#jactor-rises/jactor-shared)

Expand Down
14 changes: 5 additions & 9 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,13 @@ kotlin {
}

tasks {
val ktlintFormatAndCheck by registering {
dependsOn("ktlintFormat")
doLast {
ProcessBuilder("${project.rootDir}/gradlew", "ktlintCheck")
.directory(project.rootDir).inheritIO()
.start().waitFor() // venter på at prosessen skal fullføre før vi går videre til testene
}
val ktlintFormatAndCheck = register("ktlintFormatAndCheck") {
description = "Run ktlintFormat and ktlintCheck before testing (and commit)"
dependsOn("ktlintFormat", "ktlintCheck")
}

matching { it.name.startsWith("runKtlintCheck") }.configureEach {
mustRunAfter(project.tasks.matching { it.name.startsWith("runKtlintFormat") })
named("ktlintCheck") {
mustRunAfter("ktlintFormat")
}

test {
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
assertk = "0.28.1"
jackson = "2.21.0"
junit-platform = "6.0.1"
jvm = "21"
jvm = "25"
kotlin = "2.3.0"
ktlint = "14.0.1"
springdoc-openapi = "1.8.0"
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-9.3.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
3 changes: 0 additions & 3 deletions jitpack.yml

This file was deleted.

Loading