From 3530d9b4c7e444e8a2e9706a991d2d2c67396ec0 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Wed, 13 Dec 2017 02:08:39 +0300
Subject: [PATCH] Download org.jetbrains:markdown:0.1.25 from bintray

---
 build.gradle.kts                           | 12 ++++--------
 idea/build.gradle.kts                      |  2 +-
 prepare/ide-lazy-resolver/build.gradle.kts |  2 +-
 prepare/idea-plugin/build.gradle.kts       |  2 +-
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index f73b964ada6..303ea13e8a1 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -20,7 +20,9 @@ buildscript {
             "https://plugins.gradle.org/m2",
             "http://dl.bintray.com/kotlin/kotlinx",
             "https://repo.gradle.org/gradle/libs-releases-local", // for native-platform
-            "https://jetbrains.bintray.com/intellij-third-party-dependencies") // for jflex
+            "https://jetbrains.bintray.com/intellij-third-party-dependencies", // for jflex
+            "https://dl.bintray.com/jetbrains/markdown" // for org.jetbrains:markdown
+    )
 
     extra["repos"] = repos
 
@@ -135,10 +137,7 @@ extra["versions.ant-launcher"] = "1.8.0"
 extra["versions.robolectric"] = "3.1"
 extra["versions.org.springframework"] = "4.2.0.RELEASE"
 extra["versions.jflex"] = "1.7.0"
-
-val markdownVer =  "4054 - Kotlin 1.0.2-dev-566".replace(" ", "%20") // fixed here, was last with "status:SUCCESS,tag:forKotlin"
-extra["markdownParserVersion"] = markdownVer
-extra["markdownParserRepo"] = "https://teamcity.jetbrains.com/guestAuth/repository/download/IntelliJMarkdownParser_Build/$markdownVer/([artifact]_[ext]/)[artifact](.[ext])"
+extra["versions.markdown"] = "0.1.25"
 
 val isTeamcityBuild = project.hasProperty("teamcity") || System.getenv("TEAMCITY_VERSION") != null
 val intellijUltimateEnabled = project.getBooleanProperty("intellijUltimateEnabled") ?: isTeamcityBuild
@@ -284,9 +283,6 @@ allprojects {
         for (repo in (rootProject.extra["repos"] as List<String>)) {
             maven { setUrl(repo) }
         }
-        ivy {
-            artifactPattern(rootProject.extra["markdownParserRepo"] as String)
-        }
         intellijSdkRepo(project)
         androidDxJarRepo(project)
     }
diff --git a/idea/build.gradle.kts b/idea/build.gradle.kts
index 526a0d05b4b..ffdc7964ea7 100644
--- a/idea/build.gradle.kts
+++ b/idea/build.gradle.kts
@@ -35,7 +35,7 @@ dependencies {
     compile(project(":kotlin-script-util")) { isTransitive = false }
 
     compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
-    compile("teamcity:markdown")
+    compile(commonDep("org.jetbrains", "markdown"))
 
     compileOnly(project(":kotlin-daemon-client"))
 
diff --git a/prepare/ide-lazy-resolver/build.gradle.kts b/prepare/ide-lazy-resolver/build.gradle.kts
index bb6a4983edf..8673612aa4a 100644
--- a/prepare/ide-lazy-resolver/build.gradle.kts
+++ b/prepare/ide-lazy-resolver/build.gradle.kts
@@ -7,7 +7,7 @@ apply { plugin("java") }
 val versions by configurations.creating
 val versionFilePath = "$rootDir/dependencies/dependencies.properties"
 val ideaVersion = findProperty("versions.intellijSdk").toString()
-val markdownVersion = findProperty("markdownParserVersion").toString()
+val markdownVersion = findProperty("versions.markdown").toString()
 
 val writeVersions by tasks.creating {
     val versionFile = File(versionFilePath)
diff --git a/prepare/idea-plugin/build.gradle.kts b/prepare/idea-plugin/build.gradle.kts
index 9792f7e426f..8cfed4763b7 100644
--- a/prepare/idea-plugin/build.gradle.kts
+++ b/prepare/idea-plugin/build.gradle.kts
@@ -65,7 +65,7 @@ dependencies {
     sideJars(commonDep("javax.inject"))
     sideJars(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
     sideJars(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-jdk8")) { isTransitive = false }
-    sideJars("teamcity:markdown")
+    sideJars(commonDep("org.jetbrains", "markdown"))
 }
 
 val jar = runtimeJar(task<ShadowJar>("shadowJar")) {