5 files changed, 12 insertions, 4 deletions
diff --git a/build.gradle.kts b/build.gradle.kts
index 04f4afd4..bd73a251 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -4,7 +4,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     kotlin("jvm") apply false
-    id("com.jfrog.bintray") apply false
     id("java")
 }
 
@@ -50,3 +49,11 @@ subprojects {
 }
 
 println("Publication version: $dokka_version")
+
+// Workaround for https://github.com/bintray/gradle-bintray-plugin/issues/267
+//  Manually disable bintray tasks added to the root project
+tasks.whenTaskAdded {
+    if ("bintray" in name) {
+        enabled = false
+    }
+}
diff --git a/buildSrc/src/main/kotlin/org/jetbrains/BintrayPublishing.kt b/buildSrc/src/main/kotlin/org/jetbrains/BintrayPublishing.kt
index 78e4257f..c3d21d88 100644
--- a/buildSrc/src/main/kotlin/org/jetbrains/BintrayPublishing.kt
+++ b/buildSrc/src/main/kotlin/org/jetbrains/BintrayPublishing.kt
@@ -24,4 +24,4 @@ fun Project.configureBintrayPublication(vararg publications: String) {
         }
         setPublications(*publications)
     }
-}
-\ No newline at end of file
+}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 622ab64a..bb8b2fc2 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/runners/cli/build.gradle.kts b/runners/cli/build.gradle.kts
index bc09f2cd..00e459b2 100644
--- a/runners/cli/build.gradle.kts
+++ b/runners/cli/build.gradle.kts
@@ -2,6 +2,7 @@ import org.jetbrains.configureBintrayPublication
 
 plugins {
     id("com.github.johnrengelman.shadow")
+    id("com.jfrog.bintray")
 }
 
 repositories {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index e634c7d2..b6233dc7 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -26,7 +26,7 @@ pluginManagement {
     plugins {
         id("org.jetbrains.kotlin.jvm") version kotlin_version
         id("com.github.johnrengelman.shadow") version "5.2.0"
-        id("com.jfrog.bintray") version "1.8.4"
+        id("com.jfrog.bintray") version "1.8.5"
         id("com.gradle.plugin-publish") version "0.10.1"
     }