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

Fix dependency resolution during gradle project configuration

Browse Source
This commit is contained in:
Ilya Chernikov
2019-08-13 16:37:24 +02:00
parent 50e758cbb7
commit 5208318f34
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/psi/build.gradle.kts
+7 -1
View File
@@ -39,4 +39,10 @@ sourceSets {
ant.importBuild("buildLexer.xml") ant.importBuild("buildLexer.xml")
ant.properties["builddir"] = buildDir.absolutePath ant.properties["builddir"] = buildDir.absolutePath
ant.properties["flex.classpath"] = jflexPath.asPath
tasks.findByName("lexer")!!.apply {
doFirst {
ant.properties["flex.classpath"] = jflexPath.asPath
}
}
include/kotlin-compiler/build.gradle.kts
+4 -4
View File
@@ -34,10 +34,10 @@ dependencies {
val jar: Jar by tasks val jar: Jar by tasks
jar.apply { jar.apply {
dependsOn(fatJarContents) dependsOn(fatJarContents)
from(compile.filter { it.extension == "jar" }.map { zipTree(it) }) from { compile.filter { it.extension == "jar" }.map { zipTree(it) } }
from(fatJarContents.map { zipTree(it) }) from { fatJarContents.map { zipTree(it) } }
from(fatJarContentsStripServices.map { zipTree(it) }) { exclude("META-INF/services/**") } from { fatJarContentsStripServices.map { zipTree(it).matching { exclude("META-INF/services/**") } } }
from(fatJarContentsStripMetadata.map { zipTree(it) }) { exclude("META-INF/jb/** META-INF/LICENSE") } from { fatJarContentsStripMetadata.map { zipTree(it).matching { exclude("META-INF/jb/** META-INF/LICENSE") } } }
manifest.attributes["Class-Path"] = compilerManifestClassPath manifest.attributes["Class-Path"] = compilerManifestClassPath
manifest.attributes["Main-Class"] = "org.jetbrains.kotlin.cli.jvm.K2JVMCompiler" manifest.attributes["Main-Class"] = "org.jetbrains.kotlin.cli.jvm.K2JVMCompiler"