Skip to content

Commit 762f644

Browse files
committed
Update dokka to 1.4.10.2 and dokka site to 0.1.9
This PR removes Kotlin project since we are able to define plugins using plain Java.
1 parent 3a458e1 commit 762f644

29 files changed

+222
-707
lines changed

.github/workflows/CI.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,6 @@ jobs:
3232
- name: Compile and test
3333
run: sbt compile test
3434

35-
- name: Locally publish Dokka Java API
36-
run: |
37-
cd dokkaJavaApi
38-
./gradlew publishToMavenLocal
39-
4035
- name: Locally publish self
4136
run: sbt publishLocal
4237

build.sbt

Lines changed: 3 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,14 @@
22
val `example-project` = ExampleProject.`example-project`
33

44
val dottyVersion = "0.27.0-RC1"
5-
val dokkaVersion = "1.4.0"
6-
val kotlinxVersion = "0.7.2" // upgrade when upgrading dokka
5+
val dokkaVersion = "1.4.10.2"
76
val flexmarkVersion = "0.42.12"
87
val jacksonVersion = "2.9.8"
98
val scalaTagsVersion = "0.9.1"
10-
val dokkaSiteVersion = "0.1.7"
9+
val dokkaSiteVersion = "0.1.9"
1110

1211
libraryDependencies ++= Seq(
13-
"org.jetbrains.dokka" % "dokka-base" % dokkaVersion,
14-
"org.jetbrains.dokka" % "dokka-core" % dokkaVersion,
15-
"org.jetbrains.dokka" % "dokka-test-api" % dokkaVersion,
16-
"org.jetbrains.kotlinx" % "kotlinx-html-jvm" % kotlinxVersion,
12+
"org.jetbrains.dokka" % "dokka-test-api" % dokkaVersion % "test", // TODO move testing utils to dokka-site
1713
"com.virtuslab.dokka" % "dokka-site" % dokkaSiteVersion,
1814

1915
"ch.epfl.lamp" %% "dotty-tasty-inspector" % dottyVersion,
@@ -41,30 +37,11 @@ lazy val root = project
4137
scalaVersion := dottyVersion
4238
)
4339

44-
45-
val dokkaJavaApiJar = file("libs") / "dokkaJavaApi-0.1.1-SNAPSHOT.jar"
46-
val gradleRootDir = file("dokkaJavaApi")
47-
48-
val buildDokkaApi = taskKey[File]("Compile dokka wrapper and put jar in lib")
49-
buildDokkaApi := {
50-
streams.value.log.info("Building Dokka API with Gradle...")
51-
sys.process.Process(Seq("./gradlew", "build"), gradleRootDir).!
52-
53-
if (dokkaJavaApiJar.exists()) IO.delete(dokkaJavaApiJar)
54-
IO.move(gradleRootDir / "build" / "libs" / "dokkaJavaApi-0.1.1-SNAPSHOT.jar", dokkaJavaApiJar)
55-
streams.value.log.success(s"Dokka API copied to $dokkaJavaApiJar")
56-
dokkaJavaApiJar
57-
}
58-
59-
compile.in(Compile) := (compile.in(Compile).dependsOn(buildDokkaApi)).value
60-
6140
val generateSelfDocumentation = inputKey[Unit]("Generate example documentation")
6241
generateSelfDocumentation := {
6342
run.in(Compile).fullInput(" -o output/self -t target/scala-0.27/classes -d documentation -n scala3doc -s src/main/scala=https://github.com/lampepfl/scala3doc/tree/master/src/main/scala#L").evaluated // TODO #35 proper sbt integration
6443
}
6544

66-
unmanagedJars in Compile += dokkaJavaApiJar
67-
6845
// Uncomment to debug dokka processing (require to run debug in listen mode on 5005 port)
6946
// javaOptions.in(run) += "-agentlib:jdwp=transport=dt_socket,server=n,address=localhost:5005,suspend=y"
7047

dokkaJavaApi/.gitignore

Lines changed: 0 additions & 2 deletions
This file was deleted.

dokkaJavaApi/build.gradle.kts

Lines changed: 0 additions & 67 deletions
This file was deleted.

dokkaJavaApi/gradle.properties

Lines changed: 0 additions & 7 deletions
This file was deleted.
-57.5 KB
Binary file not shown.

dokkaJavaApi/gradle/wrapper/gradle-wrapper.properties

Lines changed: 0 additions & 5 deletions
This file was deleted.

dokkaJavaApi/gradlew

Lines changed: 0 additions & 185 deletions
This file was deleted.

0 commit comments

Comments
 (0)