Skip to content

Commit 69c3ce3

Browse files
authored
Update Dokka and Knit to their stable versions, remove bintray leftovers (#2811)
1 parent f5e8740 commit 69c3ce3

File tree

4 files changed

+5
-46
lines changed

4 files changed

+5
-46
lines changed

build.gradle

+1-3
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ buildscript {
5454
}
5555

5656
repositories {
57-
maven { url "https://maven.pkg.jetbrains.space/kotlin/p/dokka/dev/" }
57+
mavenCentral()
5858
maven { url "https://plugins.gradle.org/m2/" }
5959
maven { url "https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev" }
6060
mavenLocal()
@@ -137,8 +137,6 @@ allprojects {
137137
* google should be first in the repository list because some of the play services
138138
* transitive dependencies was removed from jcenter, thus breaking gradle dependency resolution
139139
*/
140-
mavenLocal()
141-
maven { url "https://maven.pkg.jetbrains.space/kotlin/p/dokka/dev/" }
142140
google()
143141
mavenCentral()
144142
}

buildSrc/build.gradle.kts

+1-6
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,11 @@ val cacheRedirectorEnabled = System.getenv("CACHE_REDIRECTOR")?.toBoolean() == t
1212
val buildSnapshotTrain = properties["build_snapshot_train"]?.toString()?.toBoolean() == true
1313

1414
repositories {
15-
maven(url = "https://maven.pkg.jetbrains.space/kotlin/p/dokka/dev/")
16-
mavenLocal()
17-
15+
mavenCentral()
1816
if (cacheRedirectorEnabled) {
1917
maven("https://cache-redirector.jetbrains.com/plugins.gradle.org/m2")
20-
maven("https://cache-redirector.jetbrains.com/dl.bintray.com/kotlin/kotlin-dev")
2118
} else {
2219
maven("https://plugins.gradle.org/m2")
23-
// Leftover until we migrated to Dokka 1.4.30
24-
maven("https://dl.bintray.com/kotlin/kotlin-dev")
2520
}
2621
maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev")
2722

buildSrc/src/main/kotlin/CacheRedirector.kt

+1-35
Original file line numberDiff line numberDiff line change
@@ -21,46 +21,15 @@ private val cacheRedirectorEnabled = System.getenv("CACHE_REDIRECTOR")?.toBoolea
2121
private val mirroredUrls = listOf(
2222
"https://cdn.azul.com/zulu/bin",
2323
"https://clojars.org/repo",
24-
"https://dl.bintray.com/d10xa/maven",
25-
"https://dl.bintray.com/groovy/maven",
26-
"https://dl.bintray.com/jetbrains/maven-patched",
27-
"https://dl.bintray.com/jetbrains/scala-plugin-deps",
28-
"https://dl.bintray.com/kodein-framework/Kodein-DI",
29-
"https://dl.bintray.com/konsoletyper/teavm",
30-
"https://dl.bintray.com/kotlin/kotlin-dev",
31-
"https://dl.bintray.com/kotlin/kotlin-eap",
32-
"https://dl.bintray.com/kotlin/kotlinx.html",
33-
"https://dl.bintray.com/kotlin/kotlinx",
34-
"https://dl.bintray.com/kotlin/ktor",
35-
"https://dl.bintray.com/scalacenter/releases",
36-
"https://dl.bintray.com/scalamacros/maven",
37-
"https://dl.bintray.com/kotlin/exposed",
38-
"https://dl.bintray.com/cy6ergn0m/maven",
39-
"https://dl.bintray.com/kotlin/kotlin-js-wrappers",
4024
"https://dl.google.com/android/repository",
4125
"https://dl.google.com/dl/android/maven2",
4226
"https://dl.google.com/dl/android/studio/ide-zips",
4327
"https://dl.google.com/go",
4428
"https://download.jetbrains.com",
45-
"https://jcenter.bintray.com",
46-
"https://jetbrains.bintray.com/dekaf",
47-
"https://jetbrains.bintray.com/intellij-jbr",
48-
"https://jetbrains.bintray.com/intellij-jdk",
49-
"https://jetbrains.bintray.com/intellij-plugin-service",
50-
"https://jetbrains.bintray.com/intellij-terraform",
51-
"https://jetbrains.bintray.com/intellij-third-party-dependencies",
52-
"https://jetbrains.bintray.com/jediterm",
53-
"https://jetbrains.bintray.com/kotlin-native-dependencies",
54-
"https://jetbrains.bintray.com/markdown",
55-
"https://jetbrains.bintray.com/teamcity-rest-client",
56-
"https://jetbrains.bintray.com/test-discovery",
57-
"https://jetbrains.bintray.com/wormhole",
5829
"https://jitpack.io",
5930
"https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev",
6031
"https://maven.pkg.jetbrains.space/kotlin/p/kotlin/bootstrap",
6132
"https://maven.pkg.jetbrains.space/kotlin/p/kotlin/eap",
62-
"https://kotlin.bintray.com/dukat",
63-
"https://kotlin.bintray.com/kotlin-dependencies",
6433
"https://oss.sonatype.org/content/repositories/releases",
6534
"https://oss.sonatype.org/content/repositories/snapshots",
6635
"https://oss.sonatype.org/content/repositories/staging",
@@ -85,10 +54,7 @@ private val mirroredUrls = listOf(
8554
)
8655

8756
private val aliases = mapOf(
88-
"https://repo.maven.apache.org/maven2" to "https://repo1.maven.org/maven2", // Maven Central
89-
"https://kotlin.bintray.com/kotlin-dev" to "https://dl.bintray.com/kotlin/kotlin-dev",
90-
"https://kotlin.bintray.com/kotlin-eap" to "https://dl.bintray.com/kotlin/kotlin-eap",
91-
"https://kotlin.bintray.com/kotlinx" to "https://dl.bintray.com/kotlin/kotlinx"
57+
"https://repo.maven.apache.org/maven2" to "https://repo1.maven.org/maven2" // Maven Central
9258
)
9359

9460
private fun URI.toCacheRedirectorUri() = URI("https://cache-redirector.jetbrains.com/$host/$path")

gradle.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ kotlin_version=1.5.20
1111
junit_version=4.12
1212
junit5_version=5.7.0
1313
atomicfu_version=0.16.2
14-
knit_version=0.3.0-RC
14+
knit_version=0.3.0
1515
html_version=0.7.2
1616
lincheck_version=2.14
17-
dokka_version=1.5.0-dev-106
17+
dokka_version=1.5.0
1818
byte_buddy_version=1.10.9
1919
reactor_version=3.4.1
2020
reactive_streams_version=1.0.3

0 commit comments

Comments
 (0)