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

Build: introduce javaPluginConvention extension on project

Browse Source 
`ExtensionAware.the<T>()` introduced in gradle 4.7 made existing calls `the<JavaPluginConvention>()` invalid (on wrong receiver)
This commit is contained in:
Vyacheslav Gerasimov
2018-06-09 20:43:16 +03:00
parent 94c636adc3
commit 992a31af88
34 changed files with 52 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ultimate/build.gradle.kts
+2 -2
View File
@@ -8,7 +8,7 @@ plugins {
kotlin("jvm")
}
val ideaProjectResources = project(":idea").the<JavaPluginConvention>().sourceSets["main"].output.resourcesDir
val ideaProjectResources = project(":idea").javaPluginConvention().sourceSets["main"].output.resourcesDir
evaluationDependsOn(":prepare:idea-plugin")
@@ -169,7 +169,7 @@ val jar = runtimeJar(task<ShadowJar>("shadowJar")) {
val communityPluginJar = project(communityPluginProject).configurations["runtimeJar"].artifacts.files.singleFile
from(zipTree(communityPluginJar), { exclude("META-INF/plugin.xml") })
from(preparedResources, { include("META-INF/plugin.xml") })
from(the<JavaPluginConvention>().sourceSets.getByName("main").output)
from(javaPluginConvention().sourceSets.getByName("main").output)
archiveName = "kotlin-plugin.jar"
}
ultimate/build.gradle.kts.173
+2 -2
View File
@@ -8,7 +8,7 @@ plugins {
kotlin("jvm")
}
val ideaProjectResources = project(":idea").the<JavaPluginConvention>().sourceSets["main"].output.resourcesDir
val ideaProjectResources = project(":idea").javaPluginConvention().sourceSets["main"].output.resourcesDir
evaluationDependsOn(":prepare:idea-plugin")
@@ -168,7 +168,7 @@ val jar = runtimeJar(task<ShadowJar>("shadowJar")) {
val communityPluginJar = project(communityPluginProject).configurations["runtimeJar"].artifacts.files.singleFile
from(zipTree(communityPluginJar), { exclude("META-INF/plugin.xml") })
from(preparedResources, { include("META-INF/plugin.xml") })
from(the<JavaPluginConvention>().sourceSets.getByName("main").output)
from(javaPluginConvention().sourceSets.getByName("main").output)
archiveName = "kotlin-plugin.jar"
}
ultimate/build.gradle.kts.as31
+2 -2
View File
@@ -10,7 +10,7 @@ plugins {
kotlin("jvm")
}
val ideaProjectResources = project(":idea").the<JavaPluginConvention>().sourceSets["main"].output.resourcesDir
val ideaProjectResources = project(":idea").javaPluginConvention().sourceSets["main"].output.resourcesDir
evaluationDependsOn(":prepare:idea-plugin")
@@ -170,7 +170,7 @@ val jar = runtimeJar(task<ShadowJar>("shadowJar")) {
val communityPluginJar = project(communityPluginProject).configurations["runtimeJar"].artifacts.files.singleFile
from(zipTree(communityPluginJar), { exclude("META-INF/plugin.xml") })
from(preparedResources, { include("META-INF/plugin.xml") })
from(the<JavaPluginConvention>().sourceSets.getByName("main").output)
from(javaPluginConvention().sourceSets.getByName("main").output)
archiveName = "kotlin-plugin.jar"
}
ultimate/build.gradle.kts.as32
+2 -2
View File
@@ -10,7 +10,7 @@ plugins {
kotlin("jvm")
}
val ideaProjectResources = project(":idea").the<JavaPluginConvention>().sourceSets["main"].output.resourcesDir
val ideaProjectResources = project(":idea").javaPluginConvention().sourceSets["main"].output.resourcesDir
evaluationDependsOn(":prepare:idea-plugin")
@@ -171,7 +171,7 @@ val jar = runtimeJar(task<ShadowJar>("shadowJar")) {
val communityPluginJar = project(communityPluginProject).configurations["runtimeJar"].artifacts.files.singleFile
from(zipTree(communityPluginJar), { exclude("META-INF/plugin.xml") })
from(preparedResources, { include("META-INF/plugin.xml") })
from(the<JavaPluginConvention>().sourceSets.getByName("main").output)
from(javaPluginConvention().sourceSets.getByName("main").output)
archiveName = "kotlin-plugin.jar"
}