diff options
author | Ricki Hirner <hirner@bitfire.at> | 2021-07-29 16:10:09 +0300 |
---|---|---|
committer | Ricki Hirner <hirner@bitfire.at> | 2021-07-29 16:15:21 +0300 |
commit | f95c5b0fb29346976b319282c514496b50335e12 (patch) | |
tree | 9c896534e9489800623b5367900bddb9e312c302 | |
parent | 6ee90a223158b6f7f2320dee28157f91f40d112e (diff) |
Update dokka
-rw-r--r-- | .gitlab-ci.yml | 2 | ||||
-rw-r--r-- | build.gradle | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3e1bc60..aca2875 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,7 +20,7 @@ test: pages: script: - - ./gradlew dokka + - ./gradlew dokkaHtml - mkdir public && mv build/dokka public artifacts: paths: diff --git a/build.gradle b/build.gradle index f523a36..933090c 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ buildscript { ext.versions = [ kotlin: '1.5.21', - dokka: '0.10.1', + dokka: '1.5.0', // latest Apache Commons versions that don't require Java 8 (Android 7) commonsIO: '2.6', commonsText: '1.3' @@ -63,13 +63,14 @@ android { testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } - dokka.configuration { + // TODO currently doesn't work with dokka 1.5.0, but dokka 0.10.1 doesn't work with new gradle + /*dokka.configuration { sourceLink { - url = "https://gitlab.com/bitfireAT/vcard4android/tree/master/" - lineSuffix = "#L" + remoteUrl.set(java.net.URL("https://gitlab.com/bitfireAT/vcard4android/tree/master/")) + remoteLineSuffix.set("#L") } jdkVersion = 7 - } + }*/ } dependencies { |