azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch reflect to compiled core classes

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
prepare/mock-runtime-for-test/build.gradle.kts
+23 -11
View File
@@ -7,21 +7,21 @@ jvmTarget = "1.6"
javaHome = rootProject.extra["JDK_16"] as String
dependencies {
compile(projectDist(":kotlin-stdlib"))
// compile(projectDist(":kotlin-stdlib"))
}
sourceSets {
"main" {
java.apply {
srcDir(File(rootDir, "core", "runtime.jvm", "src"))
.include("kotlin/TypeAliases.kt",
"kotlin/text/TypeAliases.kt")
srcDir(File(rootDir, "libraries", "stdlib", "src"))
.include("kotlin/collections/TypeAliases.kt",
"kotlin/jvm/JvmVersion.kt",
"kotlin/util/Standard.kt",
"kotlin/internal/Annotations.kt")
}
// java.apply {
// srcDir(File(rootDir, "core", "runtime.jvm", "src"))
// .include("kotlin/TypeAliases.kt",
// "kotlin/text/TypeAliases.kt")
// srcDir(File(rootDir, "libraries", "stdlib", "src"))
// .include("kotlin/collections/TypeAliases.kt",
// "kotlin/jvm/JvmVersion.kt",
// "kotlin/util/Standard.kt",
// "kotlin/internal/Annotations.kt")
// }
}
"test" {}
}
@@ -35,6 +35,18 @@ tasks.withType<JavaCompile> {
val jar = runtimeJar {
dependsOn(":core:builtins:serialize")
from(fileTree("${rootProject.extra["distDir"]}/builtins")) { include("kotlin/**") }
dependsOn(":kotlin-stdlib:classes")
project(":kotlin-stdlib").let { p ->
p.pluginManager.withPlugin("java") {
from(p.the<JavaPluginConvention>().sourceSets.getByName("main").output) {
include("kotlin/**/TypeAliases*.class",
"kotlin/jvm/JvmVersion.class",
"kotlin/StandardKt*.class",
"kotlin/NotImplementedError*.class",
"kotlin/internal/*.class")
}
}
}
}
val distDir: String by rootProject.extra