Merge branch 'main' into v1.0

xyzsd · Dec 1, 2023 · 622ae38 · 622ae38
2 parents 5a3baa8 + 123519b
commit 622ae38
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -21,10 +21,10 @@ dependencies {
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.3")
 }
 
-java {
+java { 
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(20))
-        vendor.set(JvmVendorSpec.ORACLE)
+        languageVersion.set(JavaLanguageVersion.of(21))
+        vendor.set(JvmVendorSpec.ADOPTIUM)
     }
 
     withJavadocJar()
@@ -42,6 +42,7 @@ tasks.withType<JavaCompile>().configureEach {
     options.compilerArgs.add("-Xlint:preview")
 }
 
+
 tasks.withType<Test>().configureEach {
     useJUnitPlatform()
 }
@@ -51,7 +52,6 @@ tasks.withType<JavaExec>().configureEach {
 
 
 
-
 publishing {
     publications {
         create<MavenPublication>("mavenJava") {
@@ -119,8 +119,7 @@ tasks.javadoc {
         (options as StandardJavadocDocletOptions).addBooleanOption("html5", true)
     }
     val javadocOptions = options as CoreJavadocOptions
-    javadocOptions.addBooleanOption("-enable-preview", true)
-    javadocOptions.addStringOption("source", "20")
+    javadocOptions.addStringOption("source", "21")
 }
 
 // for reproducible builds