Rename kotlin-plugin project to idea-plugin
This commit is contained in:
+1
-1
@@ -266,7 +266,7 @@ val compilerCopyTask = task<Copy>("idea-plugin-copy-compiler") {
|
|||||||
task<Copy>("ideaPlugin") {
|
task<Copy>("ideaPlugin") {
|
||||||
dependsOn(compilerCopyTask)
|
dependsOn(compilerCopyTask)
|
||||||
dependsOnTaskIfExistsRec("idea-plugin")
|
dependsOnTaskIfExistsRec("idea-plugin")
|
||||||
shouldRunAfter(":prepare:kotlin-plugin:idea-plugin")
|
shouldRunAfter(":prepare:idea-plugin:idea-plugin")
|
||||||
into("$ideaPluginDir/lib")
|
into("$ideaPluginDir/lib")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -4232,7 +4232,7 @@
|
|||||||
"reporting": "org.gradle.api.reporting.ReportingExtension"
|
"reporting": "org.gradle.api.reporting.ReportingExtension"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
":prepare:kotlin-plugin": {
|
":prepare:idea-plugin": {
|
||||||
"conventions": {
|
"conventions": {
|
||||||
"base": "org.gradle.api.plugins.BasePluginConvention",
|
"base": "org.gradle.api.plugins.BasePluginConvention",
|
||||||
"java": "org.gradle.api.plugins.JavaPluginConvention"
|
"java": "org.gradle.api.plugins.JavaPluginConvention"
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ dependencies {
|
|||||||
|
|
||||||
|
|
||||||
val runIde by task<JavaExec> {
|
val runIde by task<JavaExec> {
|
||||||
dependsOn(":dist", ":prepare:kotlin-plugin:idea-plugin", ":dist-plugin")
|
dependsOn(":dist", ":prepare:idea-plugin:idea-plugin", ":dist-plugin")
|
||||||
|
|
||||||
classpath = the<JavaPluginConvention>().sourceSets["main"].runtimeClasspath
|
classpath = the<JavaPluginConvention>().sourceSets["main"].runtimeClasspath
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -103,7 +103,7 @@ include ":kotlin-build-common",
|
|||||||
":kotlin-build-common",
|
":kotlin-build-common",
|
||||||
":prepare:formatter",
|
":prepare:formatter",
|
||||||
":prepare:ide-lazy-resolver",
|
":prepare:ide-lazy-resolver",
|
||||||
":prepare:kotlin-plugin",
|
":prepare:idea-plugin",
|
||||||
":android-lint",
|
":android-lint",
|
||||||
":prepare:mock-runtime-for-test",
|
":prepare:mock-runtime-for-test",
|
||||||
":kotlin-compiler",
|
":kotlin-compiler",
|
||||||
|
|||||||
@@ -92,7 +92,7 @@ dependencies {
|
|||||||
testRuntime(ideaUltimatePluginDeps("*.jar", plugin = "java-decompiler"))
|
testRuntime(ideaUltimatePluginDeps("*.jar", plugin = "java-decompiler"))
|
||||||
testRuntime(files("${System.getProperty("java.home")}/../lib/tools.jar"))
|
testRuntime(files("${System.getProperty("java.home")}/../lib/tools.jar"))
|
||||||
|
|
||||||
ideaCommunityPlugin(projectRuntimeJar(":prepare:kotlin-plugin"))
|
ideaCommunityPlugin(projectRuntimeJar(":prepare:idea-plugin"))
|
||||||
}
|
}
|
||||||
|
|
||||||
val preparedResources = File(buildDir, "prepResources")
|
val preparedResources = File(buildDir, "prepResources")
|
||||||
@@ -133,7 +133,7 @@ val preparePluginXml by task<Copy> {
|
|||||||
val jar = runtimeJar(task<ShadowJar>("shadowJar")) {
|
val jar = runtimeJar(task<ShadowJar>("shadowJar")) {
|
||||||
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
|
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
|
||||||
dependsOn(preparePluginXml)
|
dependsOn(preparePluginXml)
|
||||||
project(":prepare:kotlin-plugin").afterEvaluate {
|
project(":prepare:idea-plugin").afterEvaluate {
|
||||||
ideaCommunityPlugin.files.forEach {
|
ideaCommunityPlugin.files.forEach {
|
||||||
from(zipTree(it), { exclude("META-INF/plugin.xml") })
|
from(zipTree(it), { exclude("META-INF/plugin.xml") })
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ dependencies {
|
|||||||
|
|
||||||
|
|
||||||
val runUltimate by task<JavaExec> {
|
val runUltimate by task<JavaExec> {
|
||||||
dependsOn(":dist", ":prepare:kotlin-plugin:idea-plugin", ":dist-plugin", ":ultimate:idea-ultimate-plugin")
|
dependsOn(":dist", ":prepare:idea-plugin:idea-plugin", ":dist-plugin", ":ultimate:idea-ultimate-plugin")
|
||||||
|
|
||||||
classpath = the<JavaPluginConvention>().sourceSets["main"].runtimeClasspath
|
classpath = the<JavaPluginConvention>().sourceSets["main"].runtimeClasspath
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user