Update Dokka and Knit to their stable versions, remove bintray leftov…

…ers (Kotlin#2811)
RUANHAOANDROID · Jul 8, 2021 · 69c3ce3 · 69c3ce3
1 parent f5e8740
commit 69c3ce3
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 46 deletions.
diff --git a/build.gradle b/build.gradle
@@ -54,7 +54,7 @@ buildscript {
  }
 
  repositories {
- maven { url "https://maven.pkg.jetbrains.space/kotlin/p/dokka/dev/" }
+ mavenCentral()
  maven { url "https://plugins.gradle.org/m2/" }
  maven { url "https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev" }
  mavenLocal()
@@ -137,8 +137,6 @@ allprojects {
  * google should be first in the repository list because some of the play services
  * transitive dependencies was removed from jcenter, thus breaking gradle dependency resolution
  */
- mavenLocal()
- maven { url "https://maven.pkg.jetbrains.space/kotlin/p/dokka/dev/" }
  google()
  mavenCentral()
  }

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -12,16 +12,11 @@ val cacheRedirectorEnabled = System.getenv("CACHE_REDIRECTOR")?.toBoolean() == t
 val buildSnapshotTrain = properties["build_snapshot_train"]?.toString()?.toBoolean() == true
 
 repositories {
- maven(url = "https://maven.pkg.jetbrains.space/kotlin/p/dokka/dev/")
- mavenLocal()
-
+ mavenCentral()
  if (cacheRedirectorEnabled) {
  maven("https://cache-redirector.jetbrains.com/plugins.gradle.org/m2")
- maven("https://cache-redirector.jetbrains.com/dl.bintray.com/kotlin/kotlin-dev")
  } else {
  maven("https://plugins.gradle.org/m2")
- // Leftover until we migrated to Dokka 1.4.30
- maven("https://dl.bintray.com/kotlin/kotlin-dev")
  }
  maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev")
 

diff --git a/buildSrc/src/main/kotlin/CacheRedirector.kt b/buildSrc/src/main/kotlin/CacheRedirector.kt
@@ -21,46 +21,15 @@ private val cacheRedirectorEnabled = System.getenv("CACHE_REDIRECTOR")?.toBoolea
 private val mirroredUrls = listOf(
  "https://cdn.azul.com/zulu/bin",
  "https://clojars.org/repo",
- "https://dl.bintray.com/d10xa/maven",
- "https://dl.bintray.com/groovy/maven",
- "https://dl.bintray.com/jetbrains/maven-patched",
- "https://dl.bintray.com/jetbrains/scala-plugin-deps",
- "https://dl.bintray.com/kodein-framework/Kodein-DI",
- "https://dl.bintray.com/konsoletyper/teavm",
- "https://dl.bintray.com/kotlin/kotlin-dev",
- "https://dl.bintray.com/kotlin/kotlin-eap",
- "https://dl.bintray.com/kotlin/kotlinx.html",
- "https://dl.bintray.com/kotlin/kotlinx",
- "https://dl.bintray.com/kotlin/ktor",
- "https://dl.bintray.com/scalacenter/releases",
- "https://dl.bintray.com/scalamacros/maven",
- "https://dl.bintray.com/kotlin/exposed",
- "https://dl.bintray.com/cy6ergn0m/maven",
- "https://dl.bintray.com/kotlin/kotlin-js-wrappers",
  "https://dl.google.com/android/repository",
  "https://dl.google.com/dl/android/maven2",
  "https://dl.google.com/dl/android/studio/ide-zips",
  "https://dl.google.com/go",
  "https://download.jetbrains.com",
- "https://jcenter.bintray.com",
- "https://jetbrains.bintray.com/dekaf",
- "https://jetbrains.bintray.com/intellij-jbr",
- "https://jetbrains.bintray.com/intellij-jdk",
- "https://jetbrains.bintray.com/intellij-plugin-service",
- "https://jetbrains.bintray.com/intellij-terraform",
- "https://jetbrains.bintray.com/intellij-third-party-dependencies",
- "https://jetbrains.bintray.com/jediterm",
- "https://jetbrains.bintray.com/kotlin-native-dependencies",
- "https://jetbrains.bintray.com/markdown",
- "https://jetbrains.bintray.com/teamcity-rest-client",
- "https://jetbrains.bintray.com/test-discovery",
- "https://jetbrains.bintray.com/wormhole",
  "https://jitpack.io",
  "https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev",
  "https://maven.pkg.jetbrains.space/kotlin/p/kotlin/bootstrap",
  "https://maven.pkg.jetbrains.space/kotlin/p/kotlin/eap",
- "https://kotlin.bintray.com/dukat",
- "https://kotlin.bintray.com/kotlin-dependencies",
  "https://oss.sonatype.org/content/repositories/releases",
  "https://oss.sonatype.org/content/repositories/snapshots",
  "https://oss.sonatype.org/content/repositories/staging",
@@ -85,10 +54,7 @@ private val mirroredUrls = listOf(
 )
 
 private val aliases = mapOf(
- "https://repo.maven.apache.org/maven2" to "https://repo1.maven.org/maven2", // Maven Central
- "https://kotlin.bintray.com/kotlin-dev" to "https://dl.bintray.com/kotlin/kotlin-dev",
- "https://kotlin.bintray.com/kotlin-eap" to "https://dl.bintray.com/kotlin/kotlin-eap",
- "https://kotlin.bintray.com/kotlinx" to "https://dl.bintray.com/kotlin/kotlinx"
+ "https://repo.maven.apache.org/maven2" to "https://repo1.maven.org/maven2" // Maven Central
 )
 
 private fun URI.toCacheRedirectorUri() = URI("https://cache-redirector.jetbrains.com/$host/$path")

diff --git a/gradle.properties b/gradle.properties
@@ -11,10 +11,10 @@ kotlin_version=1.5.20
 junit_version=4.12
 junit5_version=5.7.0
 atomicfu_version=0.16.2
-knit_version=0.3.0-RC
+knit_version=0.3.0
 html_version=0.7.2
 lincheck_version=2.14
-dokka_version=1.5.0-dev-106
+dokka_version=1.5.0
 byte_buddy_version=1.10.9
 reactor_version=3.4.1
 reactive_streams_version=1.0.3