Relocate package org.jetbrains.kotlin in kotlinx-metadata-jvm
To prevent clashes in scenarios where it's used together with the Kotlin compiler (e.g. in annotation processing) #KT-24945 Fixed
This commit is contained in:
@@ -6,10 +6,13 @@ configurations {
|
||||
|
||||
dependencies {
|
||||
compile project(':kotlin-stdlib')
|
||||
compile project(':kotlinx-metadata')
|
||||
compile project(':kotlinx-metadata-jvm')
|
||||
compileOnly project(':kotlinx-metadata')
|
||||
compileOnly project(':kotlinx-metadata-jvm')
|
||||
compile 'org.ow2.asm:asm:6.0'
|
||||
compile 'org.ow2.asm:asm-tree:6.0'
|
||||
|
||||
runtime project(path: ':kotlinx-metadata-jvm', configuration: 'runtime')
|
||||
|
||||
testCompile project(':kotlin-test:kotlin-test-junit')
|
||||
|
||||
testArtifacts project(':kotlin-stdlib')
|
||||
|
||||
@@ -7,14 +7,21 @@ plugins {
|
||||
}
|
||||
|
||||
val shadows by configurations.creating
|
||||
shadows.extendsFrom(configurations.getByName("compile"))
|
||||
|
||||
dependencies {
|
||||
compile(project(":kotlinx-metadata"))
|
||||
compile(project(":kotlinx-metadata-jvm"))
|
||||
compileOnly(project(":kotlinx-metadata"))
|
||||
compileOnly(project(":kotlinx-metadata-jvm"))
|
||||
compile("org.ow2.asm:asm:6.0")
|
||||
|
||||
testCompileOnly(project(":kotlinx-metadata"))
|
||||
testCompileOnly(project(":kotlinx-metadata-jvm"))
|
||||
testCompile(commonDep("junit:junit"))
|
||||
testCompile(projectTests(":generators:test-generator"))
|
||||
|
||||
testRuntime(project(":kotlinx-metadata-jvm", configuration = "runtime"))
|
||||
|
||||
shadows(project(":kotlinx-metadata-jvm", configuration = "runtime"))
|
||||
shadows("org.ow2.asm:asm:6.0")
|
||||
}
|
||||
|
||||
sourceSets {
|
||||
@@ -42,4 +49,9 @@ tasks {
|
||||
"assemble" {
|
||||
dependsOn(shadowJar)
|
||||
}
|
||||
}
|
||||
"test" {
|
||||
// These dependencies are needed because ForTestCompileRuntime loads jars from dist
|
||||
dependsOn(":kotlin-reflect:dist")
|
||||
dependsOn(":kotlin-script-runtime:dist")
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user