Remove Bintray support as we cannot upload to JCenter anyway.

Also, Update Gradle/AGP and made sure they produce the same artifacts as before.

Author: Piotr Zawadzki

build.gradle

@@ -1,29 +1,27 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.KOTLIN_VERSION = '1.3.41'
-    ext.ANDROID_GRADLE_PLUGIN_VERSION = '3.5.4'
-    ext.DOKKA_VERSION = '0.9.17'
-    ext.BINTRAY_VERSION = '1.8.4'
+    ext.KOTLIN_VERSION = '1.5.21'
+    ext.ANDROID_GRADLE_PLUGIN_VERSION = '7.0.1'
+    ext.DOKKA_VERSION = '1.5.0'
     repositories {
         google()
-        jcenter()
         maven {
             url 'https://dl.bintray.com/kotlin/kotlin-eap'
         }
+        mavenCentral()
     }
     dependencies {
         classpath "com.android.tools.build:gradle:$ANDROID_GRADLE_PLUGIN_VERSION"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN_VERSION"
-        classpath "org.jetbrains.dokka:dokka-android-gradle-plugin:$DOKKA_VERSION"
-        classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:$BINTRAY_VERSION"
+        classpath "org.jetbrains.dokka:dokka-gradle-plugin:$DOKKA_VERSION"
     }
 }
 
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

xrunner-library/bintrayv1.gradle

@@ -1,6 +1,6 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'org.jetbrains.dokka-android'
+apply plugin: 'org.jetbrains.dokka'
 apply plugin: 'maven-publish'
 
 apply from: '../ktlint.gradle'
@@ -30,30 +30,6 @@ dependencies {
     implementation "de.jodamob.android:SuperReflect:$SUPER_REFLEKT_VERSION"
 }
 
-dokka {
-    outputDirectory = "$rootDir/docs"
-}
-
-task dokkaJavadoc(type: org.jetbrains.dokka.gradle.DokkaAndroidTask) {
-    delete "$buildDir/docs"
-
-    outputFormat = 'javadoc'
-    outputDirectory = "$buildDir/docs"
-
-    externalDocumentationLink {
-        url = new URL("https://developer.android.com/reference/")
-    }
-
-    // Always recreate documentation
-    outputs.upToDateWhen { return false }
-}
-
-afterEvaluate {
-    if (project.hasProperty("javadocJar")) {
-        tasks.javadocJar.dependsOn dokkaJavadoc
-    }
-}
-
 ext {
     bintrayRepo = 'maven'
     bintrayName = 'android-test-xrunner'
@@ -74,28 +50,22 @@ ext {
     allLicenses = ["Apache-2.0"]
 }
 
-
-tasks.withType(Javadoc) {
-    excludes = ['**/*.kt']
-}
-
 task sourcesJar(type: Jar) {
     classifier = 'sources'
     from android.sourceSets.main.java.srcDirs
 }
 
-task javadoc(type: Javadoc) {
-    source = android.sourceSets.main.java.srcDirs
-    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+dokkaJavadoc.configure {
+    dokkaSourceSets {
+        named("main") {
+            noAndroidSdkLink.set(false)
+        }
+    }
 }
 
-task javadocJar(type: Jar, dependsOn: javadoc) {
-
-    // Always recreate documentation
-    outputs.upToDateWhen { return false }
-
+task javadocJar(type: Jar, dependsOn: dokkaJavadoc) {
     classifier = 'javadoc'
-    from new File("$buildDir/docs")
+    from "$buildDir/dokka/javadoc"
 }
 
 publishing {
@@ -108,6 +78,7 @@ publishing {
 
             groupId publishedGroupId
             artifactId artifact
+            version libraryVersion
 
             pom {
                 packaging 'aar'
@@ -148,7 +119,5 @@ publishing {
         }
     }
 }
-// Bintray Upload
-apply from: 'bintrayv1.gradle'
 
 publishToMavenLocal.dependsOn 'assembleRelease'