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

Update compiler artifact according to the changes in master

Browse Source
This commit is contained in:
Ilya Chernikov
2017-09-08 20:14:33 +03:00
parent 02ec70e9f1
commit fc3dda47c0
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle.kts
+1 -1
View File
@@ -96,7 +96,7 @@ extra["versions.protobuf-java"] = "2.6.1"
extra["versions.javax.inject"] = "1" extra["versions.javax.inject"] = "1"
extra["versions.jsr305"] = "1.3.9" extra["versions.jsr305"] = "1.3.9"
extra["versions.cli-parser"] = "1.1.2" extra["versions.cli-parser"] = "1.1.2"
extra["versions.jansi"] = "1.11" extra["versions.jansi"] = "1.16"
extra["versions.jline"] = "3.3.1" extra["versions.jline"] = "3.3.1"
extra["versions.junit"] = "4.12" extra["versions.junit"] = "4.12"
extra["versions.javaslang"] = "2.0.6" extra["versions.javaslang"] = "2.0.6"
prepare/compiler/build.gradle.kts
+14 -13
View File
@@ -43,15 +43,16 @@ val compilerModules: Array<String> by rootProject.extra
val packagesToRelocate = val packagesToRelocate =
listOf("com.intellij", listOf("com.intellij",
"com.google", "com.google",
"com.sampullara", "com.sampullara",
"org.apache", "org.apache",
"org.jdom", "org.jdom",
"org.picocontainer", "org.picocontainer",
"jline", "org.jline",
"gnu", "gnu",
"javax.inject", "javax.inject",
"org.fusesource") "org.fusesource",
"kotlinx.coroutines")
val ideaCoreSdkJars: Array<String> by rootProject.extra val ideaCoreSdkJars: Array<String> by rootProject.extra
val coreSdkJarsSimple = ideaCoreSdkJars.filterNot { it == "jdom" || it == "log4j" }.toTypedArray() val coreSdkJarsSimple = ideaCoreSdkJars.filterNot { it == "jdom" || it == "log4j" }.toTypedArray()
@@ -81,6 +82,7 @@ dependencies {
fatJarContents(commonDep("com.google.code.findbugs", "jsr305")) fatJarContents(commonDep("com.google.code.findbugs", "jsr305"))
fatJarContents(commonDep("io.javaslang", "javaslang")) fatJarContents(commonDep("io.javaslang", "javaslang"))
fatJarContents(preloadedDeps("json-org")) fatJarContents(preloadedDeps("json-org"))
fatJarContents(preloadedDeps("kotlinx-coroutines-core"))
proguardLibraryJars(files(firstFromJavaHomeThatExists("lib/rt.jar", "../Classes/classes.jar"), proguardLibraryJars(files(firstFromJavaHomeThatExists("lib/rt.jar", "../Classes/classes.jar"),
firstFromJavaHomeThatExists("lib/jsse.jar", "../Classes/jsse.jar"), firstFromJavaHomeThatExists("lib/jsse.jar", "../Classes/jsse.jar"),
@@ -88,7 +90,6 @@ dependencies {
proguardLibraryJars(projectDist(":kotlin-stdlib")) proguardLibraryJars(projectDist(":kotlin-stdlib"))
proguardLibraryJars(projectDist(":kotlin-script-runtime")) proguardLibraryJars(projectDist(":kotlin-script-runtime"))
proguardLibraryJars(projectDist(":kotlin-reflect")) proguardLibraryJars(projectDist(":kotlin-reflect"))
proguardLibraryJars(preloadedDeps("kotlinx-coroutines-core"))
} }
val packCompiler by task<ShadowJar> { val packCompiler by task<ShadowJar> {
@@ -99,9 +100,9 @@ val packCompiler by task<ShadowJar> {
setupPublicJar("before-proguard", "") setupPublicJar("before-proguard", "")
from(fatJarContents) from(fatJarContents)
ideaSdkDeps("jps-model.jar", subdir = "jps").forEach { from(it) { exclude("META-INF/services/**") } } ideaSdkDeps("jps-model.jar", subdir = "jps").forEach { from(zipTree(it)) { exclude("META-INF/services/**") } }
ideaSdkDeps("oromatcher").forEach { from(it) { exclude("META-INF/jb/** META-INF/LICENSE") } } ideaSdkDeps("oromatcher").forEach { from(zipTree(it)) { exclude("META-INF/jb/** META-INF/LICENSE") } }
ideaSdkCoreDeps("jdom", "log4j").forEach { from(it) { exclude("META-INF/jb/** META-INF/LICENSE") } } ideaSdkCoreDeps("jdom", "log4j").forEach { from(zipTree(it)) { exclude("META-INF/jb/** META-INF/LICENSE") } }
manifest.attributes.put("Class-Path", compilerManifestClassPath) manifest.attributes.put("Class-Path", compilerManifestClassPath)
manifest.attributes.put("Main-Class", "org.jetbrains.kotlin.cli.jvm.K2JVMCompiler") manifest.attributes.put("Main-Class", "org.jetbrains.kotlin.cli.jvm.K2JVMCompiler")