Download org.jetbrains:markdown:0.1.25 from bintray
This commit is contained in:
+4
-8
@@ -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)
|
||||
}
|
||||
|
||||
@@ -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"))
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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")) {
|
||||
|
||||
Reference in New Issue
Block a user