diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 7f93135c..d64cd491 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 9e33c2f3..a80b22ce 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-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew.bat b/gradlew.bat
index 6689b85b..7101f8e4 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
diff --git a/grgit-core/build.gradle.kts b/grgit-core/build.gradle.kts
index ba31b989..89caca43 100644
--- a/grgit-core/build.gradle.kts
+++ b/grgit-core/build.gradle.kts
@@ -19,12 +19,18 @@ java {
   }
 }
 
+val transform1 by sourceSets.creating
+val transform2 by sourceSets.creating
+
 dependencies {
-  // groovy
-  api("org.codehaus.groovy:groovy:[3.0.9, 4.0)")
+  "transform1Implementation"("org.codehaus.groovy:groovy:[3.0.9, 4.0)")
 
-  // jgit
+  "transform2Implementation"("org.codehaus.groovy:groovy:[3.0.9, 4.0)")
+  "transform2Implementation"(transform1.output)
+
+  api("org.codehaus.groovy:groovy:[3.0.9, 4.0)")
   api("org.eclipse.jgit:org.eclipse.jgit:[6.0, 7.0)")
+  api(transform2.output)
 }
 
 testing {
@@ -48,4 +54,6 @@ tasks.named<Jar>("jar") {
   manifest {
     attributes.put("Automatic-Module-Name", "org.ajoberstar.grgit")
   }
+  from(transform1.output)
+  from(transform2.output)
 }
diff --git a/grgit-core/gradle.lockfile b/grgit-core/gradle.lockfile
index 0d7026e4..9006ddf6 100644
--- a/grgit-core/gradle.lockfile
+++ b/grgit-core/gradle.lockfile
@@ -5,16 +5,19 @@ com.googlecode.javaewah:JavaEWAH:1.2.3=compileClasspath,default,runtimeClasspath
 commons-codec:commons-codec:1.16.0=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
 org.codehaus.groovy:groovy:3.0.12=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy:3.0.19=compileClasspath,default,runtimeClasspath
-org.eclipse.jgit:org.eclipse.jgit:6.7.0.202309050840-r=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.codehaus.groovy:groovy:3.0.19=default
+org.codehaus.groovy:groovy:3.0.20=compileClasspath,runtimeClasspath,transformCompileClasspath,transformRuntimeClasspath
+org.eclipse.jgit:org.eclipse.jgit:6.7.0.202309050840-r=default
+org.eclipse.jgit:org.eclipse.jgit:6.8.0.202311291450-r=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hamcrest:hamcrest:2.2=testCompileClasspath,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-api:5.10.0=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-commons:1.10.0=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-engine:1.10.0=testCompileClasspath,testRuntimeClasspath
-org.junit:junit-bom:5.10.0=testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-api:5.10.2=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-commons:1.10.2=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-engine:1.10.2=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-launcher:1.10.2=testRuntimeClasspath
+org.junit:junit-bom:5.10.2=testCompileClasspath,testRuntimeClasspath
 org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath
 org.slf4j:slf4j-api:1.7.36=compileClasspath,default,runtimeClasspath
-org.slf4j:slf4j-api:2.0.9=testCompileClasspath,testRuntimeClasspath
-org.slf4j:slf4j-simple:2.0.9=testRuntimeClasspath
+org.slf4j:slf4j-api:2.1.0-alpha1=testCompileClasspath,testRuntimeClasspath
+org.slf4j:slf4j-simple:2.1.0-alpha1=testRuntimeClasspath
 org.spockframework:spock-core:2.3-groovy-3.0=testCompileClasspath,testRuntimeClasspath
-empty=annotationProcessor,archives,signatures,testAnnotationProcessor
+empty=annotationProcessor,archives,signatures,testAnnotationProcessor,transformAnnotationProcessor
diff --git a/grgit-core/src/main/groovy/org/ajoberstar/grgit/internal/AnnotateAtRuntime.java b/grgit-core/src/transform1/groovy/org/ajoberstar/grgit/internal/AnnotateAtRuntime.java
similarity index 100%
rename from grgit-core/src/main/groovy/org/ajoberstar/grgit/internal/AnnotateAtRuntime.java
rename to grgit-core/src/transform1/groovy/org/ajoberstar/grgit/internal/AnnotateAtRuntime.java
diff --git a/grgit-core/src/main/groovy/org/ajoberstar/grgit/internal/AnnotateAtRuntimeASTTransformation.java b/grgit-core/src/transform1/groovy/org/ajoberstar/grgit/internal/AnnotateAtRuntimeASTTransformation.java
similarity index 100%
rename from grgit-core/src/main/groovy/org/ajoberstar/grgit/internal/AnnotateAtRuntimeASTTransformation.java
rename to grgit-core/src/transform1/groovy/org/ajoberstar/grgit/internal/AnnotateAtRuntimeASTTransformation.java
diff --git a/grgit-core/src/main/groovy/org/ajoberstar/grgit/Configurable.groovy b/grgit-core/src/transform2/groovy/org/ajoberstar/grgit/Configurable.groovy
similarity index 100%
rename from grgit-core/src/main/groovy/org/ajoberstar/grgit/Configurable.groovy
rename to grgit-core/src/transform2/groovy/org/ajoberstar/grgit/Configurable.groovy
diff --git a/grgit-core/src/main/groovy/org/ajoberstar/grgit/internal/OpSyntax.groovy b/grgit-core/src/transform2/groovy/org/ajoberstar/grgit/internal/OpSyntax.groovy
similarity index 100%
rename from grgit-core/src/main/groovy/org/ajoberstar/grgit/internal/OpSyntax.groovy
rename to grgit-core/src/transform2/groovy/org/ajoberstar/grgit/internal/OpSyntax.groovy
diff --git a/grgit-core/src/main/groovy/org/ajoberstar/grgit/internal/Operation.java b/grgit-core/src/transform2/groovy/org/ajoberstar/grgit/internal/Operation.java
similarity index 100%
rename from grgit-core/src/main/groovy/org/ajoberstar/grgit/internal/Operation.java
rename to grgit-core/src/transform2/groovy/org/ajoberstar/grgit/internal/Operation.java
diff --git a/grgit-core/src/main/groovy/org/ajoberstar/grgit/internal/WithOperations.java b/grgit-core/src/transform2/groovy/org/ajoberstar/grgit/internal/WithOperations.java
similarity index 100%
rename from grgit-core/src/main/groovy/org/ajoberstar/grgit/internal/WithOperations.java
rename to grgit-core/src/transform2/groovy/org/ajoberstar/grgit/internal/WithOperations.java
diff --git a/grgit-core/src/main/groovy/org/ajoberstar/grgit/internal/WithOperationsASTTransformation.java b/grgit-core/src/transform2/groovy/org/ajoberstar/grgit/internal/WithOperationsASTTransformation.java
similarity index 100%
rename from grgit-core/src/main/groovy/org/ajoberstar/grgit/internal/WithOperationsASTTransformation.java
rename to grgit-core/src/transform2/groovy/org/ajoberstar/grgit/internal/WithOperationsASTTransformation.java
diff --git a/grgit-gradle/gradle.lockfile b/grgit-gradle/gradle.lockfile
index 06ebc891..9b08ff29 100644
--- a/grgit-gradle/gradle.lockfile
+++ b/grgit-gradle/gradle.lockfile
@@ -5,7 +5,8 @@ com.googlecode.javaewah:JavaEWAH:1.2.3=compatTestCompileClasspath,compatTestRunt
 commons-codec:commons-codec:1.16.0=compatTestCompileClasspath,compatTestRuntimeClasspath,compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.apiguardian:apiguardian-api:1.1.2=compatTestCompileClasspath
 org.codehaus.groovy:groovy:3.0.12=compatTestCompileClasspath,compatTestRuntimeClasspath
-org.eclipse.jgit:org.eclipse.jgit:6.7.0.202309050840-r=compatTestCompileClasspath,compatTestRuntimeClasspath,compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jgit:org.eclipse.jgit:6.7.0.202309050840-r=default
+org.eclipse.jgit:org.eclipse.jgit:6.8.0.202311291450-r=compatTestCompileClasspath,compatTestRuntimeClasspath,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hamcrest:hamcrest:2.2=compatTestCompileClasspath,compatTestRuntimeClasspath
 org.junit.platform:junit-platform-commons:1.9.0=compatTestCompileClasspath,compatTestRuntimeClasspath
 org.junit.platform:junit-platform-engine:1.9.0=compatTestCompileClasspath,compatTestRuntimeClasspath
diff --git a/grgit-gradle/stutter.lockfile b/grgit-gradle/stutter.lockfile
index 6989ea6a..1ac19775 100644
--- a/grgit-gradle/stutter.lockfile
+++ b/grgit-gradle/stutter.lockfile
@@ -1,4 +1,4 @@
 # DO NOT MODIFY: Generated by Stutter plugin.
-java11=7.0.2,7.6.3,8.0.2,8.4
-java17=7.3.3,7.6.3,8.0.2,8.4
-java21=8.4
+java11=7.0.2,7.6.4,8.0.2,8.6
+java17=7.3.3,7.6.4,8.0.2,8.6
+java21=8.4,8.6
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 1dc5d42e..84e15460 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,12 +1,12 @@
 pluginManagement {
   plugins {
-    id("org.ajoberstar.defaults.java-library") version "0.17.5"
-    id("org.ajoberstar.defaults.gradle-plugin") version "0.17.5"
+    id("org.ajoberstar.defaults.java-library") version "0.17.6"
+    id("org.ajoberstar.defaults.gradle-plugin") version "0.17.6"
 
-    id("org.ajoberstar.reckon.settings") version "0.18.0"
-    id("org.ajoberstar.stutter") version "0.7.2"
+    id("org.ajoberstar.reckon.settings") version "0.18.3"
+    id("org.ajoberstar.stutter") version "1.0.0"
 
-    id("com.diffplug.spotless") version "6.22.0"
+    id("com.diffplug.spotless") version "6.25.0"
   }
 
   repositories {