Revert "Pack jvm builtins into kotlin-stdlib shipped with idea plugin"
This reverts commit 0b5aedb0a2.
This commit is contained in:
@@ -11,7 +11,6 @@ configureSourcesJar()
|
||||
|
||||
configurations {
|
||||
distSources
|
||||
withJvmBuiltins.extendsFrom(configurations.compile)
|
||||
}
|
||||
|
||||
sourceSets {
|
||||
@@ -47,7 +46,6 @@ configurations {
|
||||
attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, objects.named(LibraryElements, LibraryElements.JAR))
|
||||
}
|
||||
}
|
||||
builtinsJvm
|
||||
compileOnly.extendsFrom(builtins)
|
||||
}
|
||||
|
||||
@@ -62,7 +60,6 @@ dependencies {
|
||||
testCompile project(':kotlin-coroutines-experimental-compat')
|
||||
|
||||
builtins project(':core:builtins')
|
||||
builtinsJvm project(path: ':core:builtins', configuration: "runtimeElementsJvm")
|
||||
}
|
||||
|
||||
jar {
|
||||
@@ -100,26 +97,11 @@ configureModularJar {
|
||||
from zipTree(jar.outputs.files.singleFile)
|
||||
}
|
||||
|
||||
task withJvmBuiltinsJar(type: Jar) {
|
||||
dependsOn(jar)
|
||||
dependsOn(configurations.builtinsJvm)
|
||||
manifestAttributes(manifest, project, 'Main', true)
|
||||
destinationDirectory = file("$buildDir/lib/with-jvm-builtins")
|
||||
|
||||
from(zipTree(jar.outputs.files.singleFile)) {
|
||||
exclude("**/*.kotlin_builtins")
|
||||
}
|
||||
from {
|
||||
zipTree(configurations.builtinsJvm.singleFile)
|
||||
}
|
||||
}
|
||||
|
||||
artifacts {
|
||||
archives sourcesJar
|
||||
sources sourcesJar
|
||||
distSources distSourcesJar
|
||||
archives modularJar
|
||||
withJvmBuiltins withJvmBuiltinsJar
|
||||
}
|
||||
|
||||
DexMethodCountKt.dexMethodCount(project) { task ->
|
||||
|
||||
Reference in New Issue
Block a user