From d8d9a2689d82e82d0f6f6db5a4c35cda1fb2f3ed Mon Sep 17 00:00:00 2001 From: Abduqodiri Qurbonzoda Date: Tue, 22 Jun 2021 08:02:26 +0300 Subject: [PATCH] Add sourcelink to generated documentation --- .../tools/kotlin-dokka-stdlib/build-docs.xml | 37 ++++++++++++++----- .../tools/kotlin-dokka-stdlib/build.gradle | 1 + .../kotlin_big/build.gradle | 3 ++ 3 files changed, 31 insertions(+), 10 deletions(-) diff --git a/libraries/tools/kotlin-dokka-stdlib/build-docs.xml b/libraries/tools/kotlin-dokka-stdlib/build-docs.xml index aa03bb34712..11ec7b041ff 100644 --- a/libraries/tools/kotlin-dokka-stdlib/build-docs.xml +++ b/libraries/tools/kotlin-dokka-stdlib/build-docs.xml @@ -4,11 +4,12 @@ - + + @@ -111,6 +112,8 @@ + + @@ -143,6 +146,8 @@ + + @@ -165,6 +170,7 @@ + @@ -189,6 +195,8 @@ + + @@ -229,8 +237,6 @@ - - @@ -238,6 +244,8 @@ + + @@ -254,13 +262,6 @@ includeRootPackage="false" sincekotlin="1.3"> - @@ -269,6 +270,8 @@ + + @@ -302,6 +305,8 @@ + + @@ -319,6 +324,8 @@ includeRootPackage="false"> + + @@ -335,6 +342,8 @@ includeRootPackage="false"> + + @@ -352,6 +361,8 @@ includeRootPackage="false"> + + @@ -370,6 +381,8 @@ includeRootPackage="false"> + + @@ -388,6 +401,8 @@ sincekotlin="1.1"> + + @@ -405,6 +420,8 @@ sincekotlin="1.3"> + + diff --git a/libraries/tools/kotlin-dokka-stdlib/build.gradle b/libraries/tools/kotlin-dokka-stdlib/build.gradle index 52660b5793a..eab13cd9ee9 100644 --- a/libraries/tools/kotlin-dokka-stdlib/build.gradle +++ b/libraries/tools/kotlin-dokka-stdlib/build.gradle @@ -53,6 +53,7 @@ setupCallDokka.doLast { pAnt().ant_exe.path, "-f", file("build-docs.xml").path, "v2", + "-Dgithub_revision=${pKotlinBig().github_revision}", "-Dkotlin_root=${pKotlinBig().kotlin_root}", "-Dkotlin_libs=${pKotlinBig().kotlin_libs}", "-Dkotlin_native_root=${pKotlinNative().kotlin_native_root}", diff --git a/libraries/tools/kotlin-dokka-stdlib/kotlin_big/build.gradle b/libraries/tools/kotlin-dokka-stdlib/kotlin_big/build.gradle index 9eeef25969c..cefe78c1db2 100644 --- a/libraries/tools/kotlin-dokka-stdlib/kotlin_big/build.gradle +++ b/libraries/tools/kotlin-dokka-stdlib/kotlin_big/build.gradle @@ -6,11 +6,13 @@ final boolean isTeamcityBuild = System.getenv("TEAMCITY_VERSION") != null final File kotlinRootDir = rootProject.file( "../../../") final File kotlinLibsDir = new File(buildDir, 'libs') +final String githubRevision = isTeamcityBuild ? project.property("githubRevision") : "master" final String kotlinVersion = isTeamcityBuild ? project.property("deployVersion") : "1.5.255-SNAPSHOT" final String repo = isTeamcityBuild ? new File(buildDir, 'repo') : new File(kotlinRootDir, 'build/repo') println("# Extracting info:") println(" isTeamcityBuild: $isTeamcityBuild") +println(" githubRevision: $githubRevision") println(" kotlinVersion: $kotlinVersion") println(" repo: $repo") @@ -60,5 +62,6 @@ modules.forEach { module -> extractLibs.dependsOn libsTask } +project.extensions.github_revision = githubRevision project.extensions.kotlin_root = kotlinRootDir project.extensions.kotlin_libs = kotlinLibsDir