Switch to idea NodeJS plugin usage via intellij gradle plugin

This commit is contained in:
Ilya Chernikov
2017-11-15 11:37:11 +01:00
committed by Vyacheslav Gerasimov
parent 69787bd0d1
commit 7f86fb9343
3 changed files with 7 additions and 23 deletions
+1
View File
@@ -130,6 +130,7 @@ extra["versions.native-platform"] = "0.14"
extra["versions.ant-launcher"] = "1.8.0"
extra["versions.robolectric"] = "3.1"
extra["versions.org.springframework"] = "4.2.0.RELEASE"
extra["versions.idea.NodeJS"] = "172.3757.32"
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])"
+3 -3
View File
@@ -34,7 +34,8 @@ configureIntellijPlugin {
"IntelliLang",
"testng",
"copyright",
"java-decompiler")
"java-decompiler",
"NodeJS:${rootProject.extra["versions.idea.NodeJS"]}")
}
val ideaProjectResources = project(":idea").the<JavaPluginConvention>().sourceSets["main"].output.resourcesDir
@@ -59,8 +60,6 @@ dependencies {
compile(project(":idea:ide-common")) { isTransitive = false }
compile(project(":idea:idea-gradle")) { isTransitive = false }
compile(ideaUltimatePreloadedDeps("*.jar", subdir = "nodejs_plugin/NodeJS/lib"))
testCompile(projectDist(":kotlin-test:kotlin-test-jvm"))
testCompile(project(":idea:idea-test-framework")) { isTransitive = false }
testCompile(project(":plugins:lint")) { isTransitive = false }
@@ -118,6 +117,7 @@ afterEvaluate {
compile(intellijPlugin("uml"))
compile(intellijPlugin("JavaScriptLanguage"))
compile(intellijPlugin("JavaScriptDebugger"))
compile(intellijPlugin("NodeJS"))
testCompile(intellij { include("gson-*.jar") })
testRuntime(intellij())
testRuntime(intellijPlugin("properties"))
+3 -20
View File
@@ -1,27 +1,10 @@
<project name="Update Ultimate Dependencies" default="update">
<dirname file="${basedir}" property="main.project.dir"/>
<property name="use.ultimate.by.default" value="true"/>
<property name="dependencies" value="${main.project.dir}/dependencies"/>
<property name="generators" value="${main.project.dir}/generators"/>
<import file="${main.project.dir}/update_dependencies.xml" as="main"/>
<property name="download" value="dependencies/download"/>
<macrodef name="get-nodejs-intellij-plugin">
<sequential>
<get src="http://plugins.jetbrains.com/plugin/download?updateId=37668" dest="${download}/nodejs_plugin.zip" usetimestamp="true"/>
<unzip src="${download}/nodejs_plugin.zip" dest="dependencies/nodejs_plugin" overwrite="true"/>
</sequential>
</macrodef>
<!-- not needed anymore, keeping temporarily for TC build configs compatibility -->
<target name="fetch-extras">
<mkdir dir="${download}"/>
<get-nodejs-intellij-plugin/>
</target>
<!-- Override fetch-third-party from the main buildfile -->
<target name="fetch-third-party" depends="main.make-dependency-dirs,fetch-extras"/>
<target name="fetch-third-party" depends="fetch-extras"/>
<target name="update" depends="fetch-extras"/>
</project>