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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion benchmark/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Expand Down
4 changes: 2 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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
}

Expand Down
4 changes: 2 additions & 2 deletions compiler/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions example/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Expand Down
4 changes: 2 additions & 2 deletions gradle-plugin/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import java.util.Locale;

public final class ThimPlugin implements Plugin<Project> {
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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'
""");

Expand All @@ -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));
Expand Down
2 changes: 1 addition & 1 deletion runtime/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Expand Down
2 changes: 1 addition & 1 deletion settings-plugin/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Expand Down
8 changes: 4 additions & 4 deletions spring/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Expand Down
Loading