diff options
| author | Eugene Petrenko <eugene.petrenko@jetbrains.com> | 2018-09-13 11:41:33 +0300 |
|---|---|---|
| committer | Eugene Petrenko <eugene.petrenko@jetbrains.com> | 2018-09-13 11:41:33 +0300 |
| commit | 4c2f77cbcf5b97ac4c46380b318958a51fed1027 (patch) | |
| tree | a4d0acbc8eed0f7b20dcecef92956dd14430a0c3 | |
| parent | 66537f8df0b1990b3691f931b9972d2d7f3016a4 (diff) | |
| download | dokka-4c2f77cbcf5b97ac4c46380b318958a51fed1027.tar.gz dokka-4c2f77cbcf5b97ac4c46380b318958a51fed1027.tar.bz2 dokka-4c2f77cbcf5b97ac4c46380b318958a51fed1027.zip | |
add missing dependency, the kotlin-plugin.jar is not available in Maven (and maven folder), thus it is downloaded via TeamCity
| -rw-r--r-- | build.gradle | 19 | ||||
| -rw-r--r-- | core/build.gradle | 2 |
2 files changed, 20 insertions, 1 deletions
diff --git a/build.gradle b/build.gradle index 751bdc7b..bb1983fe 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ allprojects { final String buildNumber = System.getenv("BUILD_NUMBER") dokka_version = dokka_version_base + ( buildNumber == null ? "-SNAPSHOT" : ".$buildNumber" ) } - + if (project == rootProject) { println "Publication version: $dokka_version" } @@ -15,6 +15,7 @@ allprojects { def repo = { artifactPattern("https://teamcity.jetbrains.com/guestAuth/repository/download/Kotlin_dev_CompilerAllPlugins/[revision]/internal/[module](.[ext])") + artifactPattern("https://teamcity.jetbrains.com/guestAuth/repository/download/Kotlin_dev_CompilerAllPlugins/[revision]/[module](.[ext])") artifactPattern("https://teamcity.jetbrains.com/guestAuth/repository/download/IntelliJMarkdownParser_Build/[revision]/([module]_[ext]/)[module](.[ext])") } @@ -108,6 +109,22 @@ def ideaRT() { def repoLocation = uri(file("$buildDir/dist-maven")) +configurations { + kotlin_plugin_full +} + +dependencies { + final String ijVersion = "20" + ideaVersion.take(2) + "." + ideaVersion[2] + kotlin_plugin_full "teamcity:kotlin-plugin-$bundled_kotlin_compiler_version-IJ$ijVersion-1:$bundled_kotlin_compiler_version@zip" +} + +def kotlinPluginDependency() { + return zipTree(configurations.kotlin_plugin_full.singleFile).matching({ + include("Kotlin/lib/kotlin-plugin.jar") + }) +} + + allprojects { task publishToDistMaven { diff --git a/core/build.gradle b/core/build.gradle index a4538471..c90a7789 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -32,6 +32,8 @@ dependencies { compile "org.jetbrains:markdown:$markdownVersion" compile intellijCoreAnalysis() + + compile kotlinPluginDependency() compile 'org.jetbrains.kotlinx:kotlinx-html-jvm:0.6.8' |