Skip to content

Commit b8c4bac

Browse files
authored
Dokka 1.4.32 (#62)
* Remove Dokka Bintray repositories * Dokka 1.4.32 * Remove now-unneeded trove4j substitution
1 parent 85db821 commit b8c4bac

2 files changed

Lines changed: 3 additions & 34 deletions

File tree

build.gradle

Lines changed: 2 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,6 @@ buildscript {
3030
repositories {
3131
mavenCentral()
3232
google()
33-
34-
// TODO: Remove Bintray dependencies when possible
35-
maven { url 'https://dl.bintray.com/kotlin/dokka' }
36-
maven { url 'https://dl.bintray.com/jetbrains/markdown' }
37-
}
38-
39-
// TODO WORKAROUND: Remove when AGP no longer requires JCenter's trove4j
40-
configurations.configureEach {
41-
resolutionStrategy.eachDependency {
42-
if (requested.group == 'org.jetbrains.trove4j' &&
43-
requested.name == 'trove4j' &&
44-
requested.version == '20160824'
45-
) {
46-
useTarget('org.jetbrains.intellij.deps:trove4j:1.0.20181211')
47-
}
48-
}
4933
}
5034
}
5135

@@ -67,11 +51,8 @@ allprojects { project ->
6751
mavenCentral()
6852
google()
6953

70-
// TODO: Remove Bintray dependencies when possible
71-
maven { url 'https://dl.bintray.com/jetbrains/markdown' }
72-
maven { url 'https://dl.bintray.com/korlibs/korlibs' }
73-
maven { url 'https://dl.bintray.com/kotlin/dokka' }
74-
maven { url 'https://dl.bintray.com/kotlin/kotlinx' }
54+
// Transitive kotlinx-html-jvm dependency for Dokka:
55+
maven { url = "https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven" }
7556
}
7657

7758
project.plugins.withType(com.android.build.gradle.LibraryPlugin) {
@@ -81,18 +62,6 @@ allprojects { project ->
8162
}
8263
//endregion
8364
}
84-
85-
// TODO WORKAROUND: Remove when AGP no longer requires JCenter's trove4j
86-
configurations.configureEach {
87-
resolutionStrategy.eachDependency {
88-
if (requested.group == 'org.jetbrains.trove4j' &&
89-
requested.name == 'trove4j' &&
90-
requested.version == '20160824'
91-
) {
92-
useTarget('org.jetbrains.intellij.deps:trove4j:1.0.20181211')
93-
}
94-
}
95-
}
9665
}
9766

9867
task clean(type: Delete) {

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ androidx-junit = { module = "androidx.test.ext:junit-ktx", version = "1.1.2" }
1111
androidx-test-rules = { module = "androidx.test:rules", version.ref = "android-test" }
1212
androidx-test-runner = { module = "androidx.test:runner", version.ref = "android-test" }
1313
detekt-gradlePlugin = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version = "1.15.0" }
14-
dokka-gradlePlugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version = "1.4.20" }
14+
dokka-gradlePlugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version = "1.4.32" }
1515
junit = { module = "junit:junit", version = "4.13" }
1616
kotlin-gradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
1717
kotlinx-binaryCompatibilityValidator = { module = "org.jetbrains.kotlinx:binary-compatibility-validator", version = "0.5.0" }

0 commit comments

Comments
 (0)