diff --git a/CHANGELOG.md b/CHANGELOG.md index d797cc5..7678d01 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,8 @@ skipped the context-path resolution that `TrustedUrl` values receive in templates. - Compile identifier and route-joining regular expressions once instead of once per catalog key, template or route. +- Update KSP to 2.3.12 (the version the Gradle plugin applies to consumers), Spring Framework to + 7.0.9 and Spring Boot to 4.1.1, matching the consumers' Boot version, and JUnit to 6.1.3. ## 0.12.2 - 2026-09-19 diff --git a/README.md b/README.md index 00475b9..5d04579 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ module. Existing `:thimMessageUsageCheck` and `:thimCssUsageCheck` task names an For Kotlin consumers, set `ksp.project.isolation.enabled=true` in `gradle.properties` so KSP uses its compatible source wiring even when isolation is enabled through the command-line flag. Use Gradle 9.7.1 and -`--isolated-projects` to validate a consumer build. KSP 2.3.11 is included for compatibility +`--isolated-projects` to validate a consumer build. KSP 2.3.12 is included for compatibility with Gradle's current isolation property. Third-party plugins must also support isolation: Spring Boot 4.1.1's `bootJar` task still accesses other projects during construction, tracked in [spring-boot#43755](https://github.com/spring-projects/spring-boot/issues/43755). Until that is fixed, this repository's diff --git a/benchmark/build.gradle.kts b/benchmark/build.gradle.kts index 1ca2616..f8c0034 100644 --- a/benchmark/build.gradle.kts +++ b/benchmark/build.gradle.kts @@ -18,7 +18,7 @@ dependencies { ksp(project(":compiler")) jmhImplementation(project(":compiler")) - testImplementation(platform("org.junit:junit-bom:6.0.3")) + testImplementation(platform("org.junit:junit-bom:6.1.3")) testImplementation("org.junit.jupiter:junit-jupiter") testRuntimeOnly("org.junit.platform:junit-platform-launcher") } diff --git a/build.gradle.kts b/build.gradle.kts index 6c142cc..05855ee 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,7 @@ plugins { kotlin("jvm") version "2.4.20" apply false - id("com.google.devtools.ksp") version "2.3.11" apply false - id("org.springframework.boot") version "4.1.0" apply false + id("com.google.devtools.ksp") version "2.3.12" apply false + id("org.springframework.boot") version "4.1.1" apply false id("me.champeau.jmh") version "0.7.3" apply false } diff --git a/compiler/build.gradle.kts b/compiler/build.gradle.kts index 34fb08b..64ccc14 100644 --- a/compiler/build.gradle.kts +++ b/compiler/build.gradle.kts @@ -11,10 +11,10 @@ kotlin { } dependencies { - implementation("com.google.devtools.ksp:symbol-processing-api:2.3.11") + implementation("com.google.devtools.ksp:symbol-processing-api:2.3.12") implementation("org.snakeyaml:snakeyaml-engine:3.1.1") - testImplementation(platform("org.junit:junit-bom:6.0.3")) + testImplementation(platform("org.junit:junit-bom:6.1.3")) testImplementation(kotlin("test-junit5")) testImplementation(project(":runtime")) testRuntimeOnly("org.junit.platform:junit-platform-launcher") diff --git a/example/build.gradle.kts b/example/build.gradle.kts index 6c98b48..87509fd 100644 --- a/example/build.gradle.kts +++ b/example/build.gradle.kts @@ -17,10 +17,10 @@ kotlin { dependencies { implementation(kotlin("reflect")) implementation(project(":spring")) - implementation("org.springframework.boot:spring-boot-starter-webmvc:4.1.0") + implementation("org.springframework.boot:spring-boot-starter-webmvc:4.1.1") ksp(project(":compiler")) - testImplementation(platform("org.junit:junit-bom:6.0.3")) + testImplementation(platform("org.junit:junit-bom:6.1.3")) testImplementation("org.junit.jupiter:junit-jupiter") testRuntimeOnly("org.junit.platform:junit-platform-launcher") } diff --git a/gradle-plugin/build.gradle.kts b/gradle-plugin/build.gradle.kts index d81ec2c..66d34e5 100644 --- a/gradle-plugin/build.gradle.kts +++ b/gradle-plugin/build.gradle.kts @@ -5,9 +5,9 @@ plugins { dependencies { implementation(project(":settings-plugin")) - implementation("com.google.devtools.ksp:symbol-processing-gradle-plugin:2.3.11") + implementation("com.google.devtools.ksp:symbol-processing-gradle-plugin:2.3.12") testImplementation(gradleTestKit()) - testImplementation(platform("org.junit:junit-bom:6.0.3")) + testImplementation(platform("org.junit:junit-bom:6.1.3")) testImplementation("org.junit.jupiter:junit-jupiter") testRuntimeOnly("org.junit.platform:junit-platform-launcher") } diff --git a/gradle-plugin/src/main/java/no/beint/thim/gradle/ThimPlugin.java b/gradle-plugin/src/main/java/no/beint/thim/gradle/ThimPlugin.java index bb23480..21000e1 100644 --- a/gradle-plugin/src/main/java/no/beint/thim/gradle/ThimPlugin.java +++ b/gradle-plugin/src/main/java/no/beint/thim/gradle/ThimPlugin.java @@ -24,7 +24,7 @@ import java.util.Locale; public final class ThimPlugin implements Plugin { - private static final String KSP_VERSION = "2.3.11"; + private static final String KSP_VERSION = "2.3.12"; private static final String KOTLIN_VERSION = "2.4.20"; private static final String MESSAGE_USAGE_TASK = "thimMessageUsageCheck"; private static final String CSS_USAGE_TASK = "thimCssUsageCheck"; diff --git a/gradle-plugin/src/test/java/no/beint/thim/gradle/ThimPluginTest.java b/gradle-plugin/src/test/java/no/beint/thim/gradle/ThimPluginTest.java index 8f0148b..674b67e 100644 --- a/gradle-plugin/src/test/java/no/beint/thim/gradle/ThimPluginTest.java +++ b/gradle-plugin/src/test/java/no/beint/thim/gradle/ThimPluginTest.java @@ -258,7 +258,7 @@ void plainJavaProjectsReceiveOnlyTheRuntime() throws IOException { void springBootBeforeThimAddsTheSpringAdapter() throws IOException { var project = dependencyProject("boot-before-thim", """ id 'java' - id 'org.springframework.boot' version '4.1.0' + id 'org.springframework.boot' version '4.1.1' id 'no.beint.thim' """); @@ -270,7 +270,7 @@ void springBootAfterThimAddsTheSpringAdapter() throws IOException { var project = dependencyProject("boot-after-thim", """ id 'java' id 'no.beint.thim' - id 'org.springframework.boot' version '4.1.0' + id 'org.springframework.boot' version '4.1.1' """); assertEquals(List.of("runtime", "spring"), thimDependencies(project)); diff --git a/runtime/build.gradle.kts b/runtime/build.gradle.kts index bb10791..dcf746b 100644 --- a/runtime/build.gradle.kts +++ b/runtime/build.gradle.kts @@ -4,7 +4,7 @@ plugins { } dependencies { - testImplementation(platform("org.junit:junit-bom:6.0.3")) + testImplementation(platform("org.junit:junit-bom:6.1.3")) testImplementation("org.junit.jupiter:junit-jupiter") testRuntimeOnly("org.junit.platform:junit-platform-launcher") } diff --git a/settings-plugin/build.gradle.kts b/settings-plugin/build.gradle.kts index 2e6557f..18ee7fe 100644 --- a/settings-plugin/build.gradle.kts +++ b/settings-plugin/build.gradle.kts @@ -16,7 +16,7 @@ gradlePlugin { dependencies { testImplementation(gradleTestKit()) - testImplementation(platform("org.junit:junit-bom:6.0.3")) + testImplementation(platform("org.junit:junit-bom:6.1.3")) testImplementation("org.junit.jupiter:junit-jupiter") testRuntimeOnly("org.junit.platform:junit-platform-launcher") } diff --git a/spring/build.gradle.kts b/spring/build.gradle.kts index 69178e4..382141c 100644 --- a/spring/build.gradle.kts +++ b/spring/build.gradle.kts @@ -5,13 +5,13 @@ plugins { dependencies { api(project(":runtime")) - api("org.springframework:spring-webmvc:7.0.8") - compileOnly("org.springframework.boot:spring-boot-autoconfigure:4.1.0") + api("org.springframework:spring-webmvc:7.0.9") + compileOnly("org.springframework.boot:spring-boot-autoconfigure:4.1.1") compileOnly("jakarta.servlet:jakarta.servlet-api:6.1.0") - testImplementation(platform("org.junit:junit-bom:6.0.3")) + testImplementation(platform("org.junit:junit-bom:6.1.3")) testImplementation("org.junit.jupiter:junit-jupiter") - testImplementation("org.springframework:spring-test:7.0.8") + testImplementation("org.springframework:spring-test:7.0.9") testImplementation("jakarta.servlet:jakarta.servlet-api:6.1.0") testRuntimeOnly("org.junit.platform:junit-platform-launcher") }