Switch reflect to compiled core classes

This commit is contained in:
Ilya Chernikov
2017-08-30 12:39:13 +03:00
parent d89b53dfea
commit fd1b677904
11 changed files with 39 additions and 24 deletions
@@ -15,7 +15,7 @@ dependencies {
testArtifacts project(':kotlin-stdlib-jre8')
testArtifacts project(':kotlin-reflect')
// legacy
testArtifacts project(':kotlin-runtime')
// testArtifacts project(':kotlin-runtime')
testArtifacts files(project(':kotlin-stdlib').tasks.originalStdlibJar)
}
+3 -7
View File
@@ -27,12 +27,6 @@ sourceSets {
main {
java {
srcDir annotationsSrc
srcDir "${core}/descriptor.loader.java/src"
srcDir "${core}/descriptors/src"
srcDir "${core}/descriptors.runtime/src"
srcDir "${core}/deserialization/src"
srcDir "${core}/util.runtime/src"
srcDir "${core}/reflection.jvm/src"
}
}
@@ -40,13 +34,15 @@ sourceSets {
configurations {
proguardDeps
shadows
shadows { transitive = false }
compileOnly.extendsFrom(shadows)
mainJar
}
dependencies {
proguardDeps project(':kotlin-stdlib')
shadows project(':core:util.runtime')
shadows project(':core')
shadows 'javax.inject:javax.inject:1'
shadows project(path: ':custom-dependencies:protobuf-lite', configuration: 'default')