diff --git a/.gitignore b/.gitignore
index 5debee3c32..7e406dbcb5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,6 +27,8 @@ hs_err_pid*
 # Gradle
 .gradle
 build/
+**/bin/main/
+**/bin/test/
 
 # Ignore Gradle GUI config
 gradle-app.setting
@@ -47,4 +49,4 @@ gradle-app.setting
 target/
 
 # IDEs
-.idea/
\ No newline at end of file
+.idea/
diff --git a/build.gradle.kts b/build.gradle.kts
index c6ff9c783b..7fefbe867f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -16,7 +16,7 @@ buildscript {
 
 plugins {
     kotlin("jvm") version "1.3.72" apply false
-    id("org.jetbrains.dokka") version "0.10.0"
+    id("org.jetbrains.dokka") version "1.7.10"
 }
 
 allprojects {
diff --git a/codegen-client/build.gradle.kts b/codegen-client/build.gradle.kts
index 0688039f95..10aedcab23 100644
--- a/codegen-client/build.gradle.kts
+++ b/codegen-client/build.gradle.kts
@@ -78,13 +78,12 @@ tasks.test {
     }
 }
 
-tasks.dokka {
-    outputFormat = "html"
-    outputDirectory = "$buildDir/javadoc"
+tasks.dokkaHtml.configure {
+    outputDirectory.set(buildDir.resolve("javadoc"))
 }
 
 // Always build documentation
-tasks["build"].finalizedBy(tasks["dokka"])
+tasks["build"].finalizedBy(tasks["dokkaHtml"])
 
 // Configure jacoco (code coverage) to generate an HTML report
 tasks.jacocoTestReport {
diff --git a/codegen-core/build.gradle.kts b/codegen-core/build.gradle.kts
index 20b0af3744..f1c349b2ed 100644
--- a/codegen-core/build.gradle.kts
+++ b/codegen-core/build.gradle.kts
@@ -114,13 +114,12 @@ tasks.test {
     }
 }
 
-tasks.dokka {
-    outputFormat = "html"
-    outputDirectory = "$buildDir/javadoc"
+tasks.dokkaHtml.configure {
+    outputDirectory.set(buildDir.resolve("javadoc"))
 }
 
 // Always build documentation
-tasks["build"].finalizedBy(tasks["dokka"])
+tasks["build"].finalizedBy(tasks["dokkaHtml"])
 
 // Configure jacoco (code coverage) to generate an HTML report
 tasks.jacocoTestReport {