aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build.gradle.kts1
-rw-r--r--core/build.gradle.kts3
-rw-r--r--core/dependencies/build.gradle.kts35
-rw-r--r--kotlin-analysis/build.gradle.kts1
-rw-r--r--kotlin-analysis/dependencies/build.gradle.kts4
-rw-r--r--settings.gradle.kts1
6 files changed, 1 insertions, 44 deletions
diff --git a/build.gradle.kts b/build.gradle.kts
index c6335a31..6c34e04c 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -29,7 +29,6 @@ allprojects {
jcenter()
mavenCentral()
mavenLocal()
- maven(url = "https://dl.bintray.com/jetbrains/markdown/")
maven(url = "https://dl.bintray.com/kotlin/kotlin-dev")
}
}
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index b52d3729..168baf48 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -6,8 +6,7 @@ plugins {
}
dependencies {
- api(project("dependencies", configuration = "shadow"))
-
+ api("org.jetbrains:markdown:0.1.45")
implementation(kotlin("reflect"))
implementation("com.google.code.gson:gson:2.8.5")
implementation("org.jsoup:jsoup:1.12.1")
diff --git a/core/dependencies/build.gradle.kts b/core/dependencies/build.gradle.kts
deleted file mode 100644
index a074958d..00000000
--- a/core/dependencies/build.gradle.kts
+++ /dev/null
@@ -1,35 +0,0 @@
-import org.jetbrains.DokkaPublicationBuilder.Component.Shadow
-import org.jetbrains.registerDokkaArtifactPublication
-
-plugins {
- id("com.github.johnrengelman.shadow")
- `maven-publish`
- id("com.jfrog.bintray")
-}
-
-repositories {
- maven(url = "https://kotlin.bintray.com/kotlin-plugin")
-}
-
-dependencies {
- // TODO (see https://github.com/Kotlin/dokka/issues/1009)
- implementation(kotlin("stdlib"))
- implementation(kotlin("reflect"))
-
- implementation("org.jetbrains:markdown:0.1.41") {
- because("it's published only on bintray")
- }
-}
-
-tasks {
- shadowJar {
- val dokka_version: String by project
- archiveFileName.set("dokka-dependencies-$dokka_version.jar")
- archiveClassifier.set("")
- }
-}
-
-registerDokkaArtifactPublication("dokkaCoreDependencies") {
- artifactId = "dokka-core-dependencies"
- component = Shadow
-}
diff --git a/kotlin-analysis/build.gradle.kts b/kotlin-analysis/build.gradle.kts
index f87811e1..8458ecc4 100644
--- a/kotlin-analysis/build.gradle.kts
+++ b/kotlin-analysis/build.gradle.kts
@@ -11,7 +11,6 @@ dependencies {
val kotlin_version: String by project
api("org.jetbrains.kotlin:kotlin-compiler:$kotlin_version")
-
api(project(":kotlin-analysis:dependencies", configuration = "shadow"))
}
diff --git a/kotlin-analysis/dependencies/build.gradle.kts b/kotlin-analysis/dependencies/build.gradle.kts
index 4aba6614..a12e697d 100644
--- a/kotlin-analysis/dependencies/build.gradle.kts
+++ b/kotlin-analysis/dependencies/build.gradle.kts
@@ -30,10 +30,6 @@ dependencies {
val idea_version: String by project
intellijCore("com.jetbrains.intellij.idea:intellij-core:$idea_version")
implementation(intellijCoreAnalysis())
-
- implementation("org.jetbrains:markdown:0.1.41") {
- because("it's published only on bintray")
- }
}
tasks {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 00237615..94364dab 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,7 +1,6 @@
rootProject.name = "dokka"
include("core")
-include("core:dependencies")
include("plugins:base:search-component")
include("testApi")
include("test-tools")