Do not shade com.intellij in embeddable compiler
This commit is contained in:
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
package org.jetbrains.kotlin.gradle
|
package org.jetbrains.kotlin.gradle
|
||||||
|
|
||||||
import org.gradle.api.logging.LogLevel
|
import org.gradle.api.logging.LogLevel
|
||||||
import org.jetbrains.kotlin.com.intellij.openapi.util.io.FileUtil
|
import com.intellij.openapi.util.io.FileUtil
|
||||||
import org.jetbrains.kotlin.gradle.util.*
|
import org.jetbrains.kotlin.gradle.util.*
|
||||||
import org.junit.After
|
import org.junit.After
|
||||||
import org.junit.AfterClass
|
import org.junit.AfterClass
|
||||||
|
|||||||
+1
-1
@@ -17,7 +17,7 @@
|
|||||||
package org.jetbrains.kotlin.gradle
|
package org.jetbrains.kotlin.gradle
|
||||||
|
|
||||||
import org.gradle.api.logging.LogLevel
|
import org.gradle.api.logging.LogLevel
|
||||||
import org.jetbrains.kotlin.com.intellij.openapi.util.io.FileUtil
|
import com.intellij.openapi.util.io.FileUtil
|
||||||
import org.jetbrains.kotlin.gradle.plugin.CopyClassesToJavaOutputStatus
|
import org.jetbrains.kotlin.gradle.plugin.CopyClassesToJavaOutputStatus
|
||||||
import org.jetbrains.kotlin.gradle.tasks.USING_INCREMENTAL_COMPILATION_MESSAGE
|
import org.jetbrains.kotlin.gradle.tasks.USING_INCREMENTAL_COMPILATION_MESSAGE
|
||||||
import org.jetbrains.kotlin.gradle.util.checkBytecodeContains
|
import org.jetbrains.kotlin.gradle.util.checkBytecodeContains
|
||||||
|
|||||||
@@ -22,7 +22,8 @@ val compilerJar by configurations.creating
|
|||||||
val kotlinEmbeddableRootPackage = "org.jetbrains.kotlin"
|
val kotlinEmbeddableRootPackage = "org.jetbrains.kotlin"
|
||||||
|
|
||||||
val packagesToRelocate =
|
val packagesToRelocate =
|
||||||
listOf("com.intellij",
|
listOf(
|
||||||
|
// "com.intellij",
|
||||||
"com.google",
|
"com.google",
|
||||||
"com.sampullara",
|
"com.sampullara",
|
||||||
"org.apache",
|
"org.apache",
|
||||||
@@ -43,6 +44,8 @@ dependencies {
|
|||||||
compile(project(":kotlin-reflect"))
|
compile(project(":kotlin-reflect"))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
noDefaultJar()
|
||||||
|
|
||||||
runtimeJar(task<ShadowJar>("embeddable")) {
|
runtimeJar(task<ShadowJar>("embeddable")) {
|
||||||
destinationDir = File(buildDir, "libs")
|
destinationDir = File(buildDir, "libs")
|
||||||
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
|
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
|
||||||
|
|||||||
Reference in New Issue
Block a user