Created
April 27, 2021 03:33
-
-
Save chao2zhang/6522db3677cbd3799ad70596d2f51779 to your computer and use it in GitHub Desktop.
3455.diff
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts | |
index 245bc546a..98067412c 100644 | |
--- a/buildSrc/build.gradle.kts | |
+++ b/buildSrc/build.gradle.kts | |
@@ -19,7 +19,7 @@ object Plugins { | |
const val SHADOW = "6.1.0" | |
const val VERSIONS = "0.28.0" | |
const val SONAR = "2.8" | |
- const val DOKKA = "1.4.10" | |
+ const val DOKKA = "1.4.32" | |
const val SEMVER4J = "3.1.0" | |
const val NEXUS = "0.22.0" | |
const val KOTLIN_API_VALIDATOR = "0.4.0" | |
diff --git a/detekt-gradle-plugin/build.gradle.kts b/detekt-gradle-plugin/build.gradle.kts | |
index 0dd5be121..82d629c96 100644 | |
--- a/detekt-gradle-plugin/build.gradle.kts | |
+++ b/detekt-gradle-plugin/build.gradle.kts | |
@@ -10,7 +10,6 @@ repositories { | |
jcenter { | |
content { | |
includeModule("org.jetbrains.trove4j", "trove4j") | |
- includeModule("org.jetbrains.kotlinx", "kotlinx-html-jvm") | |
} | |
} | |
} | |
diff --git a/detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/DetektAndroidTest.kt b/detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/DetektAndroidTest.kt | |
index 2887dd20d..2091250d3 100644 | |
--- a/detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/DetektAndroidTest.kt | |
+++ b/detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/DetektAndroidTest.kt | |
@@ -460,6 +460,7 @@ private fun createGradleRunnerAndSetupProject(projectLayout: ProjectLayout) = Ds | |
repositories { | |
mavenCentral() | |
google() | |
+ jcenter() | |
mavenLocal() | |
} | |
} | |
diff --git a/detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/DetektJvmTest.kt b/detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/DetektJvmTest.kt | |
index 9ddfd1d97..bacf9128f 100644 | |
--- a/detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/DetektJvmTest.kt | |
+++ b/detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/DetektJvmTest.kt | |
@@ -22,6 +22,7 @@ object DetektJvmTest : Spek({ | |
repositories { | |
mavenCentral() | |
+ jcenter() | |
mavenLocal() | |
} | |
diff --git a/detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/DetektMultiplatformTest.kt b/detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/DetektMultiplatformTest.kt | |
index dca6cf823..76783108a 100644 | |
--- a/detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/DetektMultiplatformTest.kt | |
+++ b/detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/DetektMultiplatformTest.kt | |
@@ -330,6 +330,7 @@ private fun setupProject(projectLayoutAction: ProjectLayout.() -> Unit): DslGrad | |
repositories { | |
mavenCentral() | |
google() | |
+ jcenter() | |
mavenLocal() | |
} | |
} | |
diff --git a/detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/testkit/DslTestBuilder.kt b/detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/testkit/DslTestBuilder.kt | |
index 5276d92ac..9a08a3c9d 100644 | |
--- a/detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/testkit/DslTestBuilder.kt | |
+++ b/detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/testkit/DslTestBuilder.kt | |
@@ -10,6 +10,7 @@ abstract class DslTestBuilder { | |
repositories { | |
mavenLocal() | |
mavenCentral() | |
+ jcenter() | |
} | |
""".trimIndent() | |
diff --git a/settings.gradle.kts b/settings.gradle.kts | |
index bbb3ad700..e6e220a40 100644 | |
--- a/settings.gradle.kts | |
+++ b/settings.gradle.kts | |
@@ -46,11 +46,5 @@ gradleEnterprise { | |
dependencyResolutionManagement { | |
repositories { | |
mavenCentral() | |
- jcenter { | |
- content { | |
- includeModule("org.jetbrains.kotlinx", "kotlinx-html-jvm") | |
- includeGroup("org.jetbrains.dokka") | |
- } | |
- } | |
} | |
} |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment