From 160e48fe02ee5372668cfb3bb6225c4b496afb96 Mon Sep 17 00:00:00 2001
From: Tor Egil Jacobsen <Toregil.jacobsen@skatteetaten.no>
Date: Wed, 1 Jul 2026 15:42:56 +0200
Subject: [PATCH] #4: bump jvm 21 -> 25, gradle 9.3.1 -> 9.6.1

- delete jitpack.yml
- fix ktlintFormatAndCheck
- fix links in README.md
---
 README.md                                |  4 ++--
 build.gradle.kts                         | 14 +++++---------
 gradle/libs.versions.toml                |  2 +-
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 jitpack.yml                              |  3 ---
 5 files changed, 9 insertions(+), 16 deletions(-)
 delete mode 100644 jitpack.yml

diff --git a/README.md b/README.md
index 047a83a..65059d2 100644
--- a/README.md
+++ b/README.md
@@ -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)
 
diff --git a/build.gradle.kts b/build.gradle.kts
index a15706f..9c80fa5 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -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 {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index fb97898..f7c8f96 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -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"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 37f78a6..a351597 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -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
diff --git a/jitpack.yml b/jitpack.yml
deleted file mode 100644
index 54ebd17..0000000
--- a/jitpack.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-# JitPack build configuration file use jdk 21
-jdk:
-  - openjdk21