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

Fix build after rebase on master

Browse Source
This commit is contained in:
Ilya Chernikov
2017-09-11 22:34:01 +02:00
parent 46884bec84
commit d92cce6e6a
5 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/src/main/kotlin/dependencies.kt
+6
View File
@@ -38,6 +38,12 @@ fun Project.preloadedDeps(vararg artifactBaseNames: String, baseDir: File = File
return files(*matchingFiles.map { it.canonicalPath }.toTypedArray()) return files(*matchingFiles.map { it.canonicalPath }.toTypedArray())
} }
fun Project.ideaUltimatePreloadedDeps(vararg artifactBaseNames: String, subdir: String? = null): ConfigurableFileCollection {
val ultimateDepsDir = File(rootDir, "ultimate", "dependencies")
return if (ultimateDepsDir.isDirectory) preloadedDeps(*artifactBaseNames, baseDir = ultimateDepsDir, subdir = subdir)
else files()
}
fun Project.ideaSdkDeps(vararg artifactBaseNames: String, subdir: String = "lib"): ConfigurableFileCollection = fun Project.ideaSdkDeps(vararg artifactBaseNames: String, subdir: String = "lib"): ConfigurableFileCollection =
preloadedDeps(*artifactBaseNames, baseDir = File(rootDir, "ideaSDK"), subdir = subdir) preloadedDeps(*artifactBaseNames, baseDir = File(rootDir, "ideaSDK"), subdir = subdir)
generators/build.gradle.kts
-1
View File
@@ -38,7 +38,6 @@ dependencies {
testCompile(project(":compiler:incremental-compilation-impl")) testCompile(project(":compiler:incremental-compilation-impl"))
testCompile(commonDep("junit:junit")) testCompile(commonDep("junit:junit"))
testCompile(ideaSdkDeps("openapi", "idea")) testCompile(ideaSdkDeps("openapi", "idea"))
testCompile(preloadedDeps("uast-tests"))
testRuntime(ideaSdkDeps("*.jar")) testRuntime(ideaSdkDeps("*.jar"))
testRuntime(ideaPluginDeps("idea-junit", "resources_en", plugin = "junit")) testRuntime(ideaPluginDeps("idea-junit", "resources_en", plugin = "junit"))
testRuntime(ideaPluginDeps("IntelliLang", plugin = "IntelliLang")) testRuntime(ideaPluginDeps("IntelliLang", plugin = "IntelliLang"))
idea/idea-gradle/build.gradle.kts
+1 -1
View File
@@ -2,7 +2,7 @@ apply { plugin("kotlin") }
dependencies { dependencies {
compileOnly(ideaSdkDeps("openapi", "idea")) compileOnly(ideaSdkDeps("openapi", "idea", "external-system-rt"))
compileOnly(ideaPluginDeps("gradle-tooling-api", "gradle", plugin = "gradle")) compileOnly(ideaPluginDeps("gradle-tooling-api", "gradle", plugin = "gradle"))
compileOnly(ideaPluginDeps("Groovy", plugin = "Groovy")) compileOnly(ideaPluginDeps("Groovy", plugin = "Groovy"))
plugins/uast-kotlin/build.gradle.kts
-1
View File
@@ -15,7 +15,6 @@ dependencies {
testCompile(project(":compiler:util")) testCompile(project(":compiler:util"))
testCompile(project(":compiler:cli")) testCompile(project(":compiler:cli"))
testCompile(project(":idea:idea-android")) testCompile(project(":idea:idea-android"))
testCompile(preloadedDeps("uast-tests"))
testRuntime(ideaSdkDeps("*.jar")) testRuntime(ideaSdkDeps("*.jar"))
} }
ultimate/build.gradle.kts
+1
View File
@@ -33,6 +33,7 @@ dependencies {
compile(project(":idea:ide-common")) { isTransitive = false } compile(project(":idea:ide-common")) { isTransitive = false }
compile(project(":idea:idea-gradle")) { isTransitive = false } compile(project(":idea:idea-gradle")) { isTransitive = false }
compile(ideaUltimatePreloadedDeps("*.jar", subdir = "nodejs_plugin/NodeJS/lib"))
compile(ideaUltimateSdkCoreDeps("annotations", "trove4j", "intellij-core")) compile(ideaUltimateSdkCoreDeps("annotations", "trove4j", "intellij-core"))
compile(ideaUltimateSdkDeps("openapi", "idea", "util")) compile(ideaUltimateSdkDeps("openapi", "idea", "util"))
// compile(ideaUltimatePluginDeps("gradle-tooling-api", plugin = "gradle")) // compile(ideaUltimatePluginDeps("gradle-tooling-api", plugin = "gradle"))