Add modules metadata and metadata.jvm

This commit is contained in:
Alexander Udalov
2018-02-15 19:47:27 +01:00
parent 54d6710923
commit 368af867b8
9 changed files with 124 additions and 8 deletions
+1
View File
@@ -7,6 +7,7 @@ javaHome = rootProject.extra["JDK_16"] as String
dependencies {
compile(project(":core:descriptors"))
compile(project(":core:deserialization"))
compile(project(":core:metadata.jvm"))
compile(project(":core:util.runtime"))
compile(commonDep("javax.inject"))
}
+1 -8
View File
@@ -1,5 +1,3 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
apply { plugin("kotlin") }
apply { plugin("jps-compatible") }
@@ -7,9 +5,9 @@ jvmTarget = "1.6"
javaHome = rootProject.extra["JDK_16"] as String
dependencies {
compile(project(":core:metadata"))
compile(project(":core:util.runtime"))
compile(project(":core:descriptors"))
compile(protobufLite())
compile(commonDep("javax.inject"))
}
@@ -19,11 +17,6 @@ sourceSets {
}
tasks.withType<JavaCompile> {
dependsOn(protobufLiteTask)
sourceCompatibility = "1.6"
targetCompatibility = "1.6"
}
tasks.withType<KotlinCompile> {
dependsOn(protobufLiteTask)
}
+18
View File
@@ -0,0 +1,18 @@
apply { plugin("kotlin") }
jvmTarget = "1.6"
javaHome = rootProject.extra["JDK_16"] as String
dependencies {
compile(project(":core:metadata"))
}
sourceSets {
"main" { projectDefault() }
"test" {}
}
tasks.withType<JavaCompile> {
sourceCompatibility = "1.6"
targetCompatibility = "1.6"
}
+26
View File
@@ -0,0 +1,26 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
apply { plugin("kotlin") }
jvmTarget = "1.6"
javaHome = rootProject.extra["JDK_16"] as String
dependencies {
compile(protobufLite())
compile(project(":kotlin-stdlib"))
}
sourceSets {
"main" { projectDefault() }
"test" {}
}
tasks.withType<JavaCompile> {
dependsOn(protobufLiteTask)
sourceCompatibility = "1.6"
targetCompatibility = "1.6"
}
tasks.withType<KotlinCompile> {
dependsOn(protobufLiteTask)
}