Upgraded to Gradle 6.6 and Kotlin 1.4.0.

build.gradle.kts

@@ -1,5 +1,4 @@
 import com.jfrog.bintray.gradle.tasks.BintrayUploadTask
-import org.jetbrains.dokka.gradle.DokkaTask
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import java.io.FileInputStream
 import java.util.Date
@@ -11,11 +10,11 @@ plugins {
     `maven-publish`
     id("com.github.ben-manes.versions") version "0.29.0"
     id("com.jfrog.bintray") version "1.8.5"
-    id("io.gitlab.arturbosch.detekt") version "1.10.0"
+    id("io.gitlab.arturbosch.detekt") version "1.11.0"
     id("net.thauvin.erik.gradle.semver") version "1.0.4"
-    id("org.jetbrains.dokka") version "0.10.1"
-    id("org.jetbrains.kotlin.jvm") version "1.3.72"
-    id("org.jetbrains.kotlin.kapt") version "1.3.72"
+    id("org.jetbrains.dokka") version "1.4.0-rc"
+    id("org.jetbrains.kotlin.jvm") version "1.4.0"
+    id("org.jetbrains.kotlin.kapt") version "1.4.0"
     id("org.sonarqube") version "3.0"
 }
 
@@ -32,7 +31,7 @@ var semverProcessor = "net.thauvin.erik:semver:1.2.0"
 val publicationName = "mavenJava"
 
 object VersionInfo {
-    const val okhttp = "4.8.0"
+    const val okhttp = "4.8.1"
 }
 
 val versions: VersionInfo by extra { VersionInfo }
@@ -57,11 +56,6 @@ repositories {
 }
 
 dependencies {
-    // Align versions of all Kotlin components
-    implementation(platform("org.jetbrains.kotlin:kotlin-bom"))
-    // Use the Kotlin JDK 8 standard library.
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
-
     implementation("com.squareup.okhttp3:okhttp:${versions.okhttp}")
     implementation("com.squareup.okhttp3:logging-interceptor:${versions.okhttp}")
     implementation("org.json:json:20200518")
@@ -79,7 +73,7 @@ kapt {
 }
 
 detekt {
-    baseline = project.rootDir.resolve("detekt-baseline.xml")
+    baseline = project.rootDir.resolve("config/detekt/baseline.xml")
 }
 
 jacoco {
@@ -104,32 +98,13 @@ val sourcesJar by tasks.creating(Jar::class) {
 }
 
 val javadocJar by tasks.creating(Jar::class) {
-    dependsOn(tasks.dokka)
-    from(tasks.dokka)
+    dependsOn(tasks.dokkaJavadoc)
+    from(tasks.dokkaJavadoc)
     archiveClassifier.set("javadoc")
     description = "Assembles a JAR of the generated Javadoc."
     group = JavaBasePlugin.DOCUMENTATION_GROUP
 }
 
-val dokkaDocs by tasks.creating(DokkaTask::class) {
-    outputFormat = "gfm"
-    outputDirectory = "$projectDir"
-
-    configuration {
-        moduleName = "docs"
-        sourceLink {
-            path = file("$projectDir/src/main/kotlin").toURI().toString().replace("file:", "")
-            url = "https://github.com/ethauvin/${project.name}/tree/master/src/main/kotlin"
-            lineSuffix = "#L"
-        }
-
-        jdkVersion = 8
-
-        includes = listOf("config/dokka/packages.md")
-        includeNonPublic = false
-    }
-}
-
 tasks {
     withType<JacocoReport> {
         reports {
@@ -156,23 +131,31 @@ tasks {
         }
     }
 
-    dokka {
-        outputFormat = "html"
-        outputDirectory = "$buildDir/javadoc"
+    dokkaHtml {
+        outputDirectory = "$projectDir/docs"
+
+        dokkaSourceSets {
+            configureEach {
+                jdkVersion = 8
+                includes = listOf("config/dokka/packages.md")
+                sourceLink {
+                    path = "/src/main/kotlin/"
+                    url = "https://github.com/ethauvin/${project.name}/tree/master/src/main/kotlin/"
+                    lineSuffix = "#L"
+                }
 
-        configuration {
-            sourceLink {
-                path = file("$projectDir/src/main/kotlin").toURI().toString().replace("file:", "")
-                url = "https://github.com/ethauvin/${project.name}/tree/master/src/main/kotlin"
-                lineSuffix = "#L"
             }
-
-            jdkVersion = 8
-
-            includes = listOf("config/dokka/packages.md")
-            includeNonPublic = false
         }
-        dependsOn(dokkaDocs)
+    }
+    
+    dokkaJavadoc {
+         dokkaSourceSets {
+            configureEach {
+                jdkVersion = 8
+                includes = listOf("config/dokka/packages.md")
+            }
+        }
+        dependsOn(dokkaHtml)
     }
 
     val copyToDeploy by registering(Copy::class) {
@@ -244,6 +227,7 @@ bintray {
         githubReleaseNotesFile = "README.md"
         vcsUrl = "$mavenUrl.git"
         setLabels(
+                "android",
                 "bitlinks",
                 "bitly",
                 "bitly-api",