Fix projects for gradle integration tests

2017-09-13 19:40:15 +02:00
parent 8ec5cc7d16
commit 1862c78bdc
23 changed files with 185 additions and 90 deletions
@@ -38,23 +38,8 @@ val compilerBaseName = name

 val outputJar = File(buildDir, "libs", "$compilerBaseName.jar")

-
-
 val compilerModules: Array<String> by rootProject.extra

-val packagesToRelocate =
-        listOf("com.intellij",
-               "com.google",
-               "com.sampullara",
-               "org.apache",
-               "org.jdom",
-               "org.picocontainer",
-               "org.jline",
-               "gnu",
-               "javax.inject",
-               "org.fusesource",
-               "kotlinx.coroutines")
-
 val ideaCoreSdkJars: Array<String> by rootProject.extra
 val coreSdkJarsSimple = ideaCoreSdkJars.filterNot { it == "jdom" || it == "log4j" }.toTypedArray()

@@ -132,6 +117,8 @@ val proguard by task<ProGuardTask> {
    printconfiguration("$buildDir/compiler.pro.dump")
 }

+noDefaultJar()
+
 dist(targetName = compilerBaseName + ".jar",
     fromTask = if (shrink) proguard
                else packCompiler)