diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index 0fc3113..69e8615 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.8.10" />
+    <option name="version" value="1.8.20" />
   </component>
 </project>
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index 32aec61..eeb507d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -38,35 +38,34 @@ repositories {
 }
 
 // SourceSet for Kotlin DSL code so that it can be built after the main SourceSet
-val dsl by sourceSets.registering
+val dsl: SourceSet by sourceSets.creating
 sourceSets {
-	dsl {
+	dsl.apply {
 		compileClasspath += main.get().output
 		runtimeClasspath += main.get().output
 	}
 	test {
-		compileClasspath += dsl.get().output
-		runtimeClasspath += dsl.get().output
+		compileClasspath += dsl.output
+		runtimeClasspath += dsl.output
 	}
 }
 
 configurations {
-	val dslCompileOnly by existing
-	dslCompileOnly {
+	dsl.compileOnlyConfigurationName {
 		extendsFrom(compileOnly.get())
 	}
-	val dslImplementation by existing
-	dslImplementation {
+	dsl.implementationConfigurationName {
 		extendsFrom(implementation.get())
 	}
-	val dslRuntimeOnly by existing
-	dslRuntimeOnly {
+	dsl.runtimeOnlyConfigurationName {
 		extendsFrom(runtimeOnly.get())
 	}
 }
 
 // Dependencies
 dependencies {
+	testImplementation("org.junit.jupiter:junit-jupiter:5.9.2")
+	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 	testImplementation("org.spockframework:spock-core:2.3-groovy-3.0")
 	testImplementation("biz.aQute.bnd:biz.aQute.bndlib:6.4.1")
 }
@@ -173,12 +172,12 @@ tasks.withType<Javadoc>().configureEach {
 
 tasks.pluginUnderTestMetadata {
 	// Include dsl SourceSet
-	pluginClasspath.from(dsl.get().output)
+	pluginClasspath.from(dsl.output)
 }
 
 tasks.jar {
 	// Include dsl SourceSet
-	from(dsl.get().output)
+	from(dsl.output)
 	// META-INF/maven folder
 	val metaInfMaven = publishing.publications.named<MavenPublication>("pluginMaven").map {
 		"META-INF/maven/${it.groupId}/${it.artifactId}"
@@ -197,7 +196,7 @@ tasks.jar {
 
 tasks.named<Jar>("sourcesJar") {
 	// Include dsl SourceSet
-	from(dsl.get().allSource)
+	from(dsl.allSource)
 }
 
 val testresourcesOutput = layout.buildDirectory.dir("testresources")
@@ -239,3 +238,8 @@ tasks.test {
 tasks.named<Delete>("cleanTest") {
 	delete(testresourcesOutput)
 }
+
+tasks.withType<ValidatePlugins>().configureEach {
+	failOnWarning.set(true)
+	enableStricterValidation.set(true)
+}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index c1962a7..033e24c 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 37aef8d..9f4197d 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index aeb74cb..fcb6fca 100755
--- a/gradlew
+++ b/gradlew
@@ -130,10 +130,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.