azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch markdown usages to regular (teamcity) dependency

Browse Source
This commit is contained in:
Ilya Chernikov
2017-11-10 15:33:08 +01:00
committed by Vyacheslav Gerasimov
parent 78d2c655d5
commit 80ad969f7b
5 changed files with 42 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle.kts
+6
View File
@@ -128,6 +128,9 @@ extra["versions.kotlinx-coroutines-jdk8"] = "0.14.1"
extra["versions.json"] = "20160807"
extra["versions.native-platform"] = "0.14"
val markdownVer = "4054 - Kotlin 1.0.2-dev-566".replace(" ", "%20") // fixed here, was last with "status:SUCCESS,tag:forKotlin"
extra["markdownParserRepo"] = "https://teamcity.jetbrains.com/guestAuth/repository/download/IntelliJMarkdownParser_Build/$markdownVer/([artifact]_[ext]/)[artifact](.[ext])"
// the former "ideaSdk/core" dir contents without intellij-core.jar
extra["IntellijCoreDependencies"] =
listOf("annotations.jar",
@@ -274,6 +277,9 @@ allprojects {
for (repo in (rootProject.extra["repos"] as List<String>)) {
maven { setUrl(repo) }
}
ivy {
artifactPattern(rootProject.extra["markdownParserRepo"] as String)
}
}
configureJvmProject(javaHome!!, jvmTarget!!)
gradle/project-schema.json
+32 -7
View File
@@ -1032,6 +1032,7 @@
"compileOnly",
"default",
"distJar",
"fatJarContents",
"implementation",
"kapt",
"kaptTest",
@@ -2172,6 +2173,8 @@
"compileClasspath",
"compileOnly",
"default",
"idea",
"ideaPlugins",
"implementation",
"kapt",
"kaptTest",
@@ -2193,7 +2196,8 @@
"kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension",
"kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension",
"defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet",
"reporting": "org.gradle.api.reporting.ReportingExtension"
"reporting": "org.gradle.api.reporting.ReportingExtension",
"intellij": "org.jetbrains.intellij.IntelliJPluginExtension"
}
},
":compiler:android-tests": {
@@ -3300,13 +3304,28 @@
},
"configurations": [
"archives",
"default",
"relocated",
"shadow"
"relocatedProtobuf",
"relocatedProtobufSources"
],
"extensions": {
"ext": "org.gradle.api.plugins.ExtraPropertiesExtension",
"shadow": "com.github.jengelman.gradle.plugins.shadow.ShadowExtension"
"ext": "org.gradle.api.plugins.ExtraPropertiesExtension"
}
},
":custom-dependencies:protobuf-relocated": {
"conventions": {
},
"configurations": [
"archives",
"baseProtobuf",
"baseProtobufSources",
"default",
"sources"
],
"extensions": {
"ext": "org.gradle.api.plugins.ExtraPropertiesExtension"
}
},
":examples:annotation-processor-example": {
@@ -4571,6 +4590,8 @@
"compileClasspath",
"compileOnly",
"default",
"idea",
"ideaPlugins",
"implementation",
"kapt",
"kaptTest",
@@ -4592,7 +4613,8 @@
"kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension",
"kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension",
"defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet",
"reporting": "org.gradle.api.reporting.ReportingExtension"
"reporting": "org.gradle.api.reporting.ReportingExtension",
"intellij": "org.jetbrains.intellij.IntelliJPluginExtension"
}
},
":plugins:annotation-based-compiler-plugins-ide-support": {
@@ -5032,6 +5054,8 @@
"compileClasspath",
"compileOnly",
"default",
"idea",
"ideaPlugins",
"implementation",
"kapt",
"kaptTest",
@@ -5052,7 +5076,8 @@
"kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension",
"kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension",
"defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet",
"reporting": "org.gradle.api.reporting.ReportingExtension"
"reporting": "org.gradle.api.reporting.ReportingExtension",
"intellij": "org.jetbrains.intellij.IntelliJPluginExtension"
}
},
":kotlin-test:kotlin-test-js:kotlin-test-js-it": {
idea/build.gradle.kts
+1 -1
View File
@@ -37,7 +37,7 @@ dependencies {
compile(project(":kotlin-script-util")) { isTransitive = false }
compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
compile(preloadedDeps("markdown"))
compile("teamcity:markdown")
testCompile(project(":kotlin-test:kotlin-test-junit"))
testCompile(projectTests(":compiler:tests-common"))
prepare/idea-plugin/build.gradle.kts
+1 -1
View File
@@ -73,7 +73,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(preloadedDeps("markdown"))
sideJars("teamcity:markdown")
}
val jar = runtimeJar(task<ShadowJar>("shadowJar")) {
update_dependencies.xml
+2 -2
View File
@@ -8,8 +8,6 @@
<property name="kotlin.bootstrap.locator" value="buildType:bt345,tag:bootstrap,status:SUCCESS${kotlin.bootstrap.branch.locator}"/>
<property name="kotlin.bootstrap.locator.force" value="false"/>
<property name="markdown.locator" value="buildType:IntelliJMarkdownParser_Build,status:SUCCESS,tag:forKotlin"/>
<property name="bootstrap.build.no.tests" value="false"/>
<!-- Uncomment to enable force version increment in branch. Set override.version.disabled to temporary disable feature without commits -->
@@ -202,6 +200,8 @@
build.number.pattern="\d+\s-\sKotlin\s[\w-+\.]+"
/>
<!-- node.js -->
<antcall target="download-nodejs-and-npm"/>
</target>
<macrodef name="download_teamcity_artifact">