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

Split core into descriptors, descriptors.jvm, deserialization, descriptors.runtime

Browse Source
This commit is contained in:
Alexander Udalov
2017-11-06 17:55:01 +01:00
parent 328e906b57
commit 02981038f3
26 changed files with 321 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle.kts
+33 -29
View File
@@ -119,35 +119,39 @@ extra["versions.android"] = "2.3.1"
extra["ideaCoreSdkJars"] = arrayOf("annotations", "asm-all", "guava", "intellij-core", "jdom", "jna", "log4j", "picocontainer",
"snappy-in-java", "streamex", "trove4j", "xpp3-1.1.4-min", "xstream")
extra["compilerModules"] = arrayOf(":compiler:util",
":compiler:container",
":compiler:conditional-preprocessor",
":compiler:resolution",
":compiler:serialization",
":compiler:frontend",
":compiler:frontend.java",
":compiler:frontend.script",
":compiler:cli-common",
":compiler:daemon-common",
":compiler:daemon",
":compiler:ir.tree",
":compiler:ir.psi2ir",
":compiler:backend-common",
":compiler:backend",
":compiler:plugin-api",
":compiler:light-classes",
":compiler:cli",
":compiler:incremental-compilation-impl",
":js:js.ast",
":js:js.serializer",
":js:js.parser",
":js:js.frontend",
":js:js.translator",
":js:js.dce",
":compiler",
":kotlin-build-common",
":core:util.runtime",
":core")
extra["compilerModules"] = arrayOf(
":compiler:util",
":compiler:container",
":compiler:conditional-preprocessor",
":compiler:resolution",
":compiler:serialization",
":compiler:frontend",
":compiler:frontend.java",
":compiler:frontend.script",
":compiler:cli-common",
":compiler:daemon-common",
":compiler:daemon",
":compiler:ir.tree",
":compiler:ir.psi2ir",
":compiler:backend-common",
":compiler:backend",
":compiler:plugin-api",
":compiler:light-classes",
":compiler:cli",
":compiler:incremental-compilation-impl",
":js:js.ast",
":js:js.serializer",
":js:js.parser",
":js:js.frontend",
":js:js.translator",
":js:js.dce",
":compiler",
":kotlin-build-common",
":core:descriptors",
":core:descriptors.jvm",
":core:deserialization",
":core:util.runtime"
)
val coreLibProjects = listOf(
":kotlin-stdlib",
compiler/android-tests/build.gradle.kts
+2 -1
View File
@@ -13,7 +13,8 @@ dependencies {
compile(ideaSdkDeps("openapi"))
testCompile(project(":compiler:incremental-compilation-impl"))
testCompile(project(":core"))
testCompile(project(":core:descriptors"))
testCompile(project(":core:descriptors.jvm"))
testCompile(project(":compiler:frontend.java"))
testCompile(projectTests(":jps-plugin"))
testCompile(ideaSdkDeps("jps-model.jar", subdir = "jps"))
compiler/backend-common/build.gradle.kts
+2 -1
View File
@@ -4,7 +4,8 @@ apply { plugin("kotlin") }
jvmTarget = "1.6"
dependencies {
compile(project(":core"))
compile(project(":core:descriptors"))
compile(project(":core:descriptors.jvm"))
compile(project(":compiler:util"))
compile(project(":compiler:frontend"))
compile(project(":compiler:ir.tree"))
compiler/daemon/daemon-common/build.gradle.kts
+2 -1
View File
@@ -4,7 +4,8 @@ apply { plugin("kotlin") }
jvmTarget = "1.6"
dependencies {
compile(project(":core"))
compile(project(":core:descriptors"))
compile(project(":core:descriptors.jvm"))
compile(project(":compiler:util"))
compile(project(":compiler:cli-common"))
compile(ideaSdkCoreDeps(*(rootProject.extra["ideaCoreSdkJars"] as Array<String>)))
compiler/frontend.java/build.gradle.kts
+2 -1
View File
@@ -4,7 +4,8 @@ apply { plugin("kotlin") }
jvmTarget = "1.6"
dependencies {
compile(project(":core"))
compile(project(":core:descriptors"))
compile(project(":core:descriptors.jvm"))
compile(project(":compiler:util"))
compile(project(":compiler:frontend"))
}
compiler/frontend/build.gradle.kts
+2 -2
View File
@@ -4,7 +4,8 @@ apply { plugin("kotlin") }
jvmTarget = "1.6"
dependencies {
compile(project(":core"))
compile(project(":core:descriptors"))
compile(project(":core:deserialization"))
compile(project(":compiler:util"))
compile(project(":compiler:container"))
compile(project(":compiler:resolution"))
@@ -16,4 +17,3 @@ sourceSets {
"main" { projectDefault() }
"test" {}
}
compiler/incremental-compilation-impl/build.gradle.kts
+3 -1
View File
@@ -4,7 +4,9 @@ apply { plugin("kotlin") }
jvmTarget = "1.6"
dependencies {
compile(project(":core"))
compile(project(":core:descriptors"))
compile(project(":core:descriptors.jvm"))
compile(project(":core:deserialization"))
compile(project(":compiler:util"))
compile(project(":compiler:frontend"))
compile(project(":compiler:frontend.java"))
compiler/resolution/build.gradle.kts
+1 -2
View File
@@ -5,11 +5,10 @@ jvmTarget = "1.6"
dependencies {
compile(project(":compiler:util"))
compile(project(":core"))
compile(project(":core:descriptors"))
}
sourceSets {
"main" { projectDefault() }
"test" {}
}
compiler/serialization/build.gradle.kts
+2 -2
View File
@@ -6,11 +6,11 @@ jvmTarget = "1.6"
dependencies {
compile(project(":compiler:util"))
compile(project(":compiler:frontend"))
compile(project(":core"))
compile(project(":core:descriptors"))
compile(project(":core:deserialization"))
}
sourceSets {
"main" { projectDefault() }
"test" {}
}
compiler/tests-common/build.gradle.kts
+4 -2
View File
@@ -2,8 +2,10 @@
apply { plugin("kotlin") }
dependencies {
testCompile(project(":core"))
testCompile(project(":core::util.runtime"))
testCompile(project(":core:descriptors"))
testCompile(project(":core:descriptors.jvm"))
testCompile(project(":core:deserialization"))
testCompile(project(":core:descriptors.runtime"))
testCompile(project(":compiler:util"))
testCompile(project(":compiler:backend"))
testCompile(project(":compiler:frontend"))
compiler/util/build.gradle.kts
+2 -1
View File
@@ -4,7 +4,8 @@ apply { plugin("kotlin") }
jvmTarget = "1.6"
dependencies {
compile(project(":core"))
compile(projectDist(":kotlin-stdlib"))
compile(project(":core:deserialization"))
compile(ideaSdkCoreDeps(*(rootProject.extra["ideaCoreSdkJars"] as Array<String>)))
compile(ideaSdkDeps("jps-model.jar", subdir = "jps"))
}
core/descriptors.jvm/build.gradle.kts
+21
View File
@@ -0,0 +1,21 @@
apply { plugin("kotlin") }
jvmTarget = "1.6"
javaHome = rootProject.extra["JDK_16"] as String
dependencies {
compile(project(":core:descriptors"))
compile(project(":core:deserialization"))
compile(project(":core:util.runtime"))
compile(commonDep("javax.inject"))
}
sourceSets {
"main" { projectDefault() }
"test" {}
}
tasks.withType<JavaCompile> {
sourceCompatibility = "1.6"
targetCompatibility = "1.6"
}
core/descriptors.runtime/build.gradle.kts
+20
View File
@@ -0,0 +1,20 @@
apply { plugin("kotlin") }
jvmTarget = "1.6"
javaHome = rootProject.extra["JDK_16"] as String
dependencies {
compile(project(":core:util.runtime"))
compile(project(":core:descriptors"))
compile(project(":core:descriptors.jvm"))
}
sourceSets {
"main" { projectDefault() }
"test" {}
}
tasks.withType<JavaCompile> {
sourceCompatibility = "1.6"
targetCompatibility = "1.6"
}
core/descriptors/build.gradle.kts
+19
View File
@@ -0,0 +1,19 @@
apply { plugin("kotlin") }
jvmTarget = "1.6"
javaHome = rootProject.extra["JDK_16"] as String
dependencies {
compile(project(":core:util.runtime"))
compile(projectDist(":kotlin-stdlib"))
}
sourceSets {
"main" { projectDefault() }
"test" {}
}
tasks.withType<JavaCompile> {
sourceCompatibility = "1.6"
targetCompatibility = "1.6"
}
core/build.gradle.kts → core/deserialization/build.gradle.kts
+3 -13
View File
@@ -1,5 +1,3 @@
import org.gradle.api.tasks.compile.JavaCompile
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
apply { plugin("kotlin") }
@@ -8,20 +6,14 @@ jvmTarget = "1.6"
javaHome = rootProject.extra["JDK_16"] as String
dependencies {
compile(projectDist(":kotlin-stdlib"))
compile(project("util.runtime"))
compile(project(":core:util.runtime"))
compile(project(":core:descriptors"))
compile(protobufLite())
compile(commonDep("javax.inject"))
}
sourceSets {
"main" {
java.srcDirs("descriptors/src",
"descriptors.jvm/src",
"descriptors.runtime/src",
"deserialization/src")
resources.srcDirs("descriptors.jvm/src", "deserialization/src").apply { include("META-INF/**") }
}
"main" { projectDefault() }
"test" {}
}
@@ -34,5 +26,3 @@ tasks.withType<JavaCompile> {
tasks.withType<KotlinCompile> {
dependsOn(protobufLiteTask)
}
generators/build.gradle.kts
-1
View File
@@ -3,7 +3,6 @@ apply { plugin("kotlin") }
dependencies {
compile(protobufFull())
compile(project(":core"))
compile(project(":idea"))
compile(project(":j2k"))
compile(project(":compiler:util"))
gradle/project-schema.json
+181 -28
View File
@@ -89,6 +89,7 @@
"testCompileClasspath",
"testCompileOnly",
"testImplementation",
"testJvm6ServerRuntime",
"testRuntime",
"testRuntimeClasspath",
"testRuntimeOnly",
@@ -104,37 +105,13 @@
},
":core": {
"conventions": {
"base": "org.gradle.api.plugins.BasePluginConvention",
"java": "org.gradle.api.plugins.JavaPluginConvention"
},
"configurations": [
"apiElements",
"archives",
"compile",
"compileClasspath",
"compileOnly",
"default",
"implementation",
"kapt",
"kaptTest",
"runtime",
"runtimeClasspath",
"runtimeElements",
"runtimeOnly",
"testCompile",
"testCompileClasspath",
"testCompileOnly",
"testImplementation",
"testRuntime",
"testRuntimeClasspath",
"testRuntimeOnly"
],
"extensions": {
"ext": "org.gradle.api.plugins.ExtraPropertiesExtension",
"kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension",
"kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension",
"defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet",
"reporting": "org.gradle.api.reporting.ReportingExtension"
"ext": "org.gradle.api.plugins.ExtraPropertiesExtension"
}
},
":custom-dependencies": {
@@ -1995,6 +1972,41 @@
"reporting": "org.gradle.api.reporting.ReportingExtension"
}
},
":test-instrumenter": {
"conventions": {
"base": "org.gradle.api.plugins.BasePluginConvention",
"java": "org.gradle.api.plugins.JavaPluginConvention"
},
"configurations": [
"apiElements",
"archives",
"compile",
"compileClasspath",
"compileOnly",
"default",
"implementation",
"kapt",
"kaptTest",
"runtime",
"runtimeClasspath",
"runtimeElements",
"runtimeOnly",
"testCompile",
"testCompileClasspath",
"testCompileOnly",
"testImplementation",
"testRuntime",
"testRuntimeClasspath",
"testRuntimeOnly"
],
"extensions": {
"ext": "org.gradle.api.plugins.ExtraPropertiesExtension",
"defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet",
"reporting": "org.gradle.api.reporting.ReportingExtension",
"kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension",
"kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension"
}
},
":tools": {
"conventions": {
@@ -2933,6 +2945,146 @@
"ext": "org.gradle.api.plugins.ExtraPropertiesExtension"
}
},
":core:descriptors": {
"conventions": {
"base": "org.gradle.api.plugins.BasePluginConvention",
"java": "org.gradle.api.plugins.JavaPluginConvention"
},
"configurations": [
"apiElements",
"archives",
"compile",
"compileClasspath",
"compileOnly",
"default",
"implementation",
"kapt",
"kaptTest",
"runtime",
"runtimeClasspath",
"runtimeElements",
"runtimeOnly",
"testCompile",
"testCompileClasspath",
"testCompileOnly",
"testImplementation",
"testRuntime",
"testRuntimeClasspath",
"testRuntimeOnly"
],
"extensions": {
"ext": "org.gradle.api.plugins.ExtraPropertiesExtension",
"kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension",
"kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension",
"defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet",
"reporting": "org.gradle.api.reporting.ReportingExtension"
}
},
":core:descriptors.jvm": {
"conventions": {
"base": "org.gradle.api.plugins.BasePluginConvention",
"java": "org.gradle.api.plugins.JavaPluginConvention"
},
"configurations": [
"apiElements",
"archives",
"compile",
"compileClasspath",
"compileOnly",
"default",
"implementation",
"kapt",
"kaptTest",
"runtime",
"runtimeClasspath",
"runtimeElements",
"runtimeOnly",
"testCompile",
"testCompileClasspath",
"testCompileOnly",
"testImplementation",
"testRuntime",
"testRuntimeClasspath",
"testRuntimeOnly"
],
"extensions": {
"ext": "org.gradle.api.plugins.ExtraPropertiesExtension",
"kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension",
"kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension",
"defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet",
"reporting": "org.gradle.api.reporting.ReportingExtension"
}
},
":core:descriptors.runtime": {
"conventions": {
"base": "org.gradle.api.plugins.BasePluginConvention",
"java": "org.gradle.api.plugins.JavaPluginConvention"
},
"configurations": [
"apiElements",
"archives",
"compile",
"compileClasspath",
"compileOnly",
"default",
"implementation",
"kapt",
"kaptTest",
"runtime",
"runtimeClasspath",
"runtimeElements",
"runtimeOnly",
"testCompile",
"testCompileClasspath",
"testCompileOnly",
"testImplementation",
"testRuntime",
"testRuntimeClasspath",
"testRuntimeOnly"
],
"extensions": {
"ext": "org.gradle.api.plugins.ExtraPropertiesExtension",
"kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension",
"kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension",
"defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet",
"reporting": "org.gradle.api.reporting.ReportingExtension"
}
},
":core:deserialization": {
"conventions": {
"base": "org.gradle.api.plugins.BasePluginConvention",
"java": "org.gradle.api.plugins.JavaPluginConvention"
},
"configurations": [
"apiElements",
"archives",
"compile",
"compileClasspath",
"compileOnly",
"default",
"implementation",
"kapt",
"kaptTest",
"runtime",
"runtimeClasspath",
"runtimeElements",
"runtimeOnly",
"testCompile",
"testCompileClasspath",
"testCompileOnly",
"testImplementation",
"testRuntime",
"testRuntimeClasspath",
"testRuntimeOnly"
],
"extensions": {
"ext": "org.gradle.api.plugins.ExtraPropertiesExtension",
"kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension",
"kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension",
"defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet",
"reporting": "org.gradle.api.reporting.ReportingExtension"
}
},
":core:util.runtime": {
"conventions": {
"base": "org.gradle.api.plugins.BasePluginConvention",
@@ -3114,7 +3266,8 @@
"testImplementation",
"testRuntime",
"testRuntimeClasspath",
"testRuntimeOnly"
"testRuntimeOnly",
"tests-jar"
],
"extensions": {
"ext": "org.gradle.api.plugins.ExtraPropertiesExtension",
idea/build.gradle.kts
+2 -1
View File
@@ -5,7 +5,8 @@ apply { plugin("kotlin") }
dependencies {
compile(project(":kotlin-stdlib"))
compile(project(":core"))
compile(project(":core:descriptors"))
compile(project(":core:descriptors.jvm"))
compile(project(":compiler:backend"))
compile(project(":compiler:cli-common"))
compile(project(":compiler:frontend"))
idea/idea-core/build.gradle.kts
+2 -1
View File
@@ -2,7 +2,8 @@ apply { plugin("kotlin") }
dependencies {
compile(projectDist(":kotlin-stdlib"))
compile(project(":core"))
compile(project(":core:descriptors"))
compile(project(":core:descriptors.jvm"))
compile(project(":compiler:frontend"))
compile(project(":compiler:frontend.java"))
compile(project(":compiler:frontend.script"))
jps-plugin/build.gradle.kts
+2 -1
View File
@@ -4,7 +4,8 @@ val compilerModules: Array<String> by rootProject.extra
dependencies {
compile(project(":kotlin-build-common"))
compile(project(":core"))
compile(project(":core:descriptors"))
compile(project(":core:descriptors.jvm"))
compile(project(":kotlin-compiler-runner"))
compile(project(":compiler:daemon-common"))
compile(projectRuntimeJar(":kotlin-daemon-client"))
js/js.translator/build.gradle.kts
+1 -1
View File
@@ -4,7 +4,7 @@ apply { plugin("kotlin") }
jvmTarget = "1.6"
dependencies {
compile(project(":core"))
compile(project(":core:descriptors"))
compile(project(":compiler:util"))
compile(project(":compiler:frontend"))
compile(project(":compiler:backend-common"))
libraries/tools/kotlin-reflect/build.gradle
+4 -1
View File
@@ -41,8 +41,11 @@ configurations {
dependencies {
proguardDeps project(':kotlin-stdlib')
shadows project(':core:descriptors')
shadows project(':core:descriptors.jvm')
shadows project(':core:deserialization')
shadows project(':core:descriptors.runtime')
shadows project(':core:util.runtime')
shadows project(':core')
shadows 'javax.inject:javax.inject:1'
shadows project(path: ':custom-dependencies:protobuf-lite', configuration: 'default')
prepare/idea-plugin/build.gradle.kts
+3 -1
View File
@@ -42,7 +42,9 @@ val projectsToShadow = listOf(
":compiler:cli-common",
":compiler:container",
":compiler:daemon-common",
":core",
":core:descriptors",
":core:descriptors.jvm",
":core:deserialization",
":eval4j",
":idea:formatter",
":compiler:frontend",
prepare/jps-plugin/build.gradle.kts
+2 -1
View File
@@ -23,7 +23,8 @@ val projectsToShadow = listOf(
":kotlin-compiler-runner",
":kotlin-daemon-client",
":compiler:daemon-common",
":core",
":core:descriptors",
":core:descriptors.jvm",
":idea:idea-jps-common",
":jps-plugin",
":kotlin-preloader",
settings.gradle
+4 -1
View File
@@ -49,7 +49,10 @@ include ":kotlin-build-common",
":js:js.tests",
":jps-plugin",
":kotlin-jps-plugin",
":core",
":core:descriptors",
":core:descriptors.jvm",
":core:deserialization",
":core:descriptors.runtime",
":core:builtins",
":core:util.runtime",
":custom-dependencies:protobuf-lite",
ultimate/build.gradle.kts
+2 -1
View File
@@ -23,7 +23,8 @@ evaluationDependsOn(":prepare:idea-plugin")
dependencies {
compile(projectDist(":kotlin-reflect"))
compile(projectDist(":kotlin-stdlib"))
compile(project(":core")) { isTransitive = false }
compile(project(":core:descriptors")) { isTransitive = false }
compile(project(":core:descriptors.jvm")) { isTransitive = false }
compile(project(":core:util.runtime")) { isTransitive = false }
compile(project(":compiler:light-classes")) { isTransitive = false }
compile(project(":compiler:frontend")) { isTransitive = false }