Remove JPS support for Android Extensions

This commit is contained in:
Yan Zhulanow
2018-12-27 19:16:13 +03:00
parent cca6ba38be
commit 34818b0bbe
30 changed files with 1 additions and 601 deletions
+1 -2
View File
@@ -18,8 +18,7 @@ val projectsToShadow = listOf(
":jps-plugin",
":kotlin-preloader",
":compiler:util",
":core:util.runtime",
":plugins:android-extensions-jps")
":core:util.runtime")
dependencies {
projectsToShadow.forEach {
-37
View File
@@ -1,37 +0,0 @@
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
description = "Kotlin JPS plugin"
plugins {
`java-base`
id("pill-configurable")
}
val projectsToShadow = listOf(
":kotlin-build-common",
":compiler:cli-common",
":kotlin-compiler-runner",
":compiler:daemon-common",
":core:descriptors",
":core:descriptors.jvm",
":idea:idea-jps-common",
":jps-plugin",
":kotlin-preloader",
":compiler:util",
":core:util.runtime")
dependencies {
projectsToShadow.forEach {
embeddedComponents(project(it)) { isTransitive = false }
}
embeddedComponents(projectRuntimeJar(":kotlin-daemon-client"))
}
runtimeJar<ShadowJar>(task<ShadowJar>("jar")) {
manifest.attributes.put("Main-Class", "org.jetbrains.kotlin.runner.Main")
manifest.attributes.put("Class-Path", "kotlin-stdlib.jar")
from(files("$rootDir/resources/kotlinManifest.properties"))
fromEmbeddedComponents()
}
ideaPlugin("lib/jps")
-37
View File
@@ -1,37 +0,0 @@
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
description = "Kotlin JPS plugin"
plugins {
`java-base`
id("pill-configurable")
}
val projectsToShadow = listOf(
":kotlin-build-common",
":compiler:cli-common",
":kotlin-compiler-runner",
":compiler:daemon-common",
":core:descriptors",
":core:descriptors.jvm",
":idea:idea-jps-common",
":jps-plugin",
":kotlin-preloader",
":compiler:util",
":core:util.runtime")
dependencies {
projectsToShadow.forEach {
embeddedComponents(project(it)) { isTransitive = false }
}
embeddedComponents(projectRuntimeJar(":kotlin-daemon-client"))
}
runtimeJar<ShadowJar>(task<ShadowJar>("jar")) {
manifest.attributes.put("Main-Class", "org.jetbrains.kotlin.runner.Main")
manifest.attributes.put("Class-Path", "kotlin-stdlib.jar")
from(files("$rootDir/resources/kotlinManifest.properties"))
fromEmbeddedComponents()
}
ideaPlugin("lib/jps")