aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/build.gradle.kts18
-rw-r--r--coreDependencies/build.gradle.kts17
-rw-r--r--plugins/build.gradle.kts4
-rw-r--r--plugins/kotlin-as-java/build.gradle.kts9
-rw-r--r--testApi/build.gradle.kts4
5 files changed, 27 insertions, 25 deletions
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index e70791f3..c8cae2d6 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -7,30 +7,20 @@ plugins {
}
dependencies {
- implementation(project(":coreDependencies", configuration = "shadow"))
+ api(project(":coreDependencies", configuration = "shadow"))
val kotlin_version: String by project
- implementation("org.jetbrains.kotlin:kotlin-compiler:$kotlin_version")
- implementation("org.jetbrains.kotlin:kotlin-script-runtime:$kotlin_version")
+ api("org.jetbrains.kotlin:kotlin-compiler:$kotlin_version")
+ implementation("org.jetbrains.kotlinx:kotlinx-html-jvm:0.6.10")
implementation("org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version")
implementation("org.jetbrains.kotlin:kotlin-reflect:$kotlin_version")
implementation("org.jsoup:jsoup:1.12.1")
implementation("com.google.code.gson:gson:2.8.5")
- implementation("org.jetbrains:markdown:0.1.41")
- implementation("org.jetbrains.kotlinx:kotlinx-html-jvm:0.6.10")
testImplementation(project(":testApi"))
testImplementation("junit:junit:4.13")
}
-tasks {
- shadowJar {
- val dokka_version: String by project
- archiveFileName.set("dokka-core-$dokka_version.jar")
- archiveClassifier.set("")
- }
-}
-
val sourceJar by tasks.registering(Jar::class) {
archiveClassifier.set("sources")
from(sourceSets["main"].allSource)
@@ -40,7 +30,7 @@ publishing {
publications {
register<MavenPublication>("dokkaCore") {
artifactId = "dokka-core"
- project.shadow.component(this)
+ from(components["java"])
artifact(sourceJar.get())
}
}
diff --git a/coreDependencies/build.gradle.kts b/coreDependencies/build.gradle.kts
index 514c7ae1..73b04554 100644
--- a/coreDependencies/build.gradle.kts
+++ b/coreDependencies/build.gradle.kts
@@ -1,6 +1,9 @@
+import org.jetbrains.configureBintrayPublication
+
plugins {
id("com.github.johnrengelman.shadow")
`maven-publish`
+ id("com.jfrog.bintray")
}
val intellijCore: Configuration by configurations.creating
@@ -24,6 +27,9 @@ dependencies {
//TODO: parametrize ij version after 1.3.70
isTransitive = false
}
+ implementation("org.jetbrains:markdown:0.1.41") {
+ because("it's published only on bintray")
+ }
}
tasks {
@@ -41,3 +47,14 @@ tasks {
exclude("src/**")
}
}
+
+publishing {
+ publications {
+ register<MavenPublication>("dokkaCoreDependencies") {
+ artifactId = "dokka-core-dependencies"
+ project.shadow.component(this)
+ }
+ }
+}
+
+configureBintrayPublication("dokkaCoreDependencies") \ No newline at end of file
diff --git a/plugins/build.gradle.kts b/plugins/build.gradle.kts
index 5f2f6dcb..e29f1355 100644
--- a/plugins/build.gradle.kts
+++ b/plugins/build.gradle.kts
@@ -6,6 +6,10 @@ subprojects {
dependencies {
compileOnly(project(":core"))
compileOnly(kotlin("stdlib-jdk8"))
+// compileOnly(project(":coreDependencies", configuration = "shadow")) // uncomment if IntelliJ does not recognize pacakges from IntelliJ
+
testImplementation(project(":testApi"))
+ testImplementation(kotlin("stdlib-jdk8"))
+ testImplementation("junit:junit:4.13")
}
} \ No newline at end of file
diff --git a/plugins/kotlin-as-java/build.gradle.kts b/plugins/kotlin-as-java/build.gradle.kts
index 5d04060f..3b281d53 100644
--- a/plugins/kotlin-as-java/build.gradle.kts
+++ b/plugins/kotlin-as-java/build.gradle.kts
@@ -5,13 +5,4 @@ publishing {
from(components["java"])
}
}
-}
-
-dependencies {
- implementation(kotlin("stdlib-jdk8"))
- compileOnly(project(":coreDependencies", configuration = "shadow"))
- testImplementation(project(":core"))
- testImplementation(project(":coreDependencies", configuration = "shadow"))
- testImplementation(project(":testApi"))
- testImplementation("junit:junit:4.13")
} \ No newline at end of file
diff --git a/testApi/build.gradle.kts b/testApi/build.gradle.kts
index db861b90..43c984b5 100644
--- a/testApi/build.gradle.kts
+++ b/testApi/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
}
dependencies {
- implementation(project(":core"))
+ api(project(":core"))
implementation("junit:junit:4.13") // TODO: remove dependency to junit
implementation(kotlin("stdlib"))
}
@@ -20,7 +20,7 @@ publishing {
publications {
register<MavenPublication>("dokkaTestAPI") {
artifactId = "dokka-test-api"
- components["java"]
+ from(components["java"])
artifact(sourceJar.get())
}
}