Using newer version of dokka and using stdlib for kotlin instead of jdk8

johanhaleby · johanhaleby · commit 2f11520403d8 · 2025-12-12T11:34:44.000+01:00
diff --git a/dist/dist-kotlin-extensions/src/main/assembly/dependencies.xml b/dist/dist-kotlin-extensions/src/main/assembly/dependencies.xml
@@ -43,7 +43,7 @@
                 <!-- Kotlin Extensions -->
                 <exclude>io.rest-assured:kotlin-extensions</exclude>
                 <!-- Kotlin -->
-                <exclude>org.jetbrains.kotlin:kotlin-stdlib-jdk8</exclude>
+                <exclude>org.jetbrains.kotlin:kotlin-stdlib</exclude>
                 <!-- JsonPath -->
                 <exclude>io.rest-assured:json-path</exclude>
                 <exclude>com.fasterxml.jackson.core:jackson-databind</exclude>
diff --git a/modules/kotlin-extensions/pom.xml b/modules/kotlin-extensions/pom.xml
@@ -33,7 +33,7 @@
     <dependencies>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-stdlib-jdk8</artifactId>
+            <artifactId>kotlin-stdlib</artifactId>
         </dependency>
         <dependency>
             <groupId>io.rest-assured</groupId>
@@ -57,12 +57,6 @@
     <profiles>
         <profile>
             <id>release</id>
-            <!-- We disable this plugin during normal build since dokka doesn't work with JDK11. We get the following error when using JDK11:
-
-            [ERROR] Failed to execute goal org.jetbrains.dokka:dokka-maven-plugin:0.9.18:dokka (default) on project kotlin-extensions: Execution default of goal org.jetbrains.dokka:dokka-maven-plugin:0.9.18:dokka failed: A required class was missing while executing org.jetbrains.dokka:dokka-maven-plugin:0.9.18:dokka: com/sun/tools/doclets/formats/html/HtmlDoclet
-
-            This is a know issue! See https://github.com/Kotlin/dokka/issues/294
-            -->
             <build>
                 <plugins>
                     <plugin>
diff --git a/modules/spring-mock-mvc-kotlin-extensions/pom.xml b/modules/spring-mock-mvc-kotlin-extensions/pom.xml
@@ -34,7 +34,7 @@
     <dependencies>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-stdlib-jdk8</artifactId>
+            <artifactId>kotlin-stdlib</artifactId>
         </dependency>
         <dependency>
             <groupId>io.rest-assured</groupId>
diff --git a/modules/spring-web-test-client-kotlin-extensions/pom.xml b/modules/spring-web-test-client-kotlin-extensions/pom.xml
@@ -34,7 +34,7 @@
     <dependencies>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-stdlib-jdk8</artifactId>
+            <artifactId>kotlin-stdlib</artifactId>
         </dependency>
         <dependency>
             <groupId>io.rest-assured</groupId>
diff --git a/pom.xml b/pom.xml
@@ -72,7 +72,7 @@
         <assertj-core.version>3.27.4</assertj-core.version>
         <scribe.version>2.5.3</scribe.version>
         <guava.version>33.2.1-jre</guava.version>
-        <dokka.version>1.9.20</dokka.version>
+        <dokka.version>2.1.0</dokka.version>
 
 		<duplicate-finder-mavwen-plugin.phase>package</duplicate-finder-mavwen-plugin.phase>
 	</properties>
@@ -490,7 +490,7 @@
             </dependency>
             <dependency>
                 <groupId>org.jetbrains.kotlin</groupId>
-                <artifactId>kotlin-stdlib-jdk8</artifactId>
+                <artifactId>kotlin-stdlib</artifactId>
                 <version>${kotlin.version}</version>
             </dependency>
             <dependency>
