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

Add gradle plugin markers

Browse Source
This commit is contained in:
Ilya Chernikov
2017-09-07 16:48:05 +03:00
parent 9df5d53a9d
commit cf7312dea8
5 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/actions/ConfigureKotlinInProjectAction.kt
+1
View File
@@ -53,6 +53,7 @@ abstract class ConfigureKotlinInProjectAction : AnAction() {
} }
} }
class ConfigureKotlinJsInProjectAction: ConfigureKotlinInProjectAction() { class ConfigureKotlinJsInProjectAction: ConfigureKotlinInProjectAction() {
override fun getApplicableConfigurators(project: Project) = getAbleToRunConfigurators(project).filter { override fun getApplicableConfigurators(project: Project) = getAbleToRunConfigurators(project).filter {
it.targetPlatform == JsPlatform it.targetPlatform == JsPlatform
libraries/tools/kotlin-allopen/plugin-marker/build.gradle
+1 -1
View File
@@ -1,3 +1,3 @@
apply from: "$rootDir/pluginMarkers.gradle" apply from: "$rootDir/libraries/tools/gradle-tools/pluginMarkers.gradle"
pluginMarkerProject('kotlin-allopen') pluginMarkerProject('kotlin-allopen')
libraries/tools/kotlin-gradle-plugin/plugin-marker/build.gradle
+1 -1
View File
@@ -1,3 +1,3 @@
apply from: "$rootDir/pluginMarkers.gradle" apply from: "$rootDir/libraries/tools/gradle-tools/pluginMarkers.gradle"
pluginMarkerProject('kotlin-gradle-plugin') pluginMarkerProject('kotlin-gradle-plugin')
libraries/tools/kotlin-noarg/plugin-marker/build.gradle
+1 -1
View File
@@ -1,3 +1,3 @@
apply from: "$rootDir/pluginMarkers.gradle" apply from: "$rootDir/libraries/tools/gradle-tools/pluginMarkers.gradle"
pluginMarkerProject('kotlin-noarg') pluginMarkerProject('kotlin-noarg')
settings.gradle
+12 -1
View File
@@ -126,7 +126,13 @@ include ":kotlin-build-common",
":kotlin-annotation-processing-gradle", ":kotlin-annotation-processing-gradle",
":examples:kotlin-jsr223-local-example", ":examples:kotlin-jsr223-local-example",
":examples:kotlin-jsr223-daemon-local-eval-example", ":examples:kotlin-jsr223-daemon-local-eval-example",
":ultimate" ":ultimate",
// plugin markers:
':kotlin-gradle-plugin:plugin-marker',
':kotlin-allopen:plugin-marker',
':kotlin-noarg:plugin-marker'
rootProject.name = "kotlin" rootProject.name = "kotlin"
@@ -188,3 +194,8 @@ project(':kotlin-annotation-processing').projectDir = "$rootDir/plugins/kapt3" a
project(':examples:kotlin-jsr223-local-example').projectDir = "$rootDir/libraries/examples/kotlin-jsr223-local-example" as File project(':examples:kotlin-jsr223-local-example').projectDir = "$rootDir/libraries/examples/kotlin-jsr223-local-example" as File
project(':examples:kotlin-jsr223-daemon-local-eval-example').projectDir = "$rootDir/libraries/examples/kotlin-jsr223-daemon-local-eval-example" as File project(':examples:kotlin-jsr223-daemon-local-eval-example').projectDir = "$rootDir/libraries/examples/kotlin-jsr223-daemon-local-eval-example" as File
// plugin markers:
project(':kotlin-gradle-plugin:plugin-marker').projectDir = file("$rootDir/libraries/tools/kotlin-gradle-plugin/plugin-marker")
project(':kotlin-allopen:plugin-marker').projectDir = file("$rootDir/libraries/tools/kotlin-allopen/plugin-marker")
project(':kotlin-noarg:plugin-marker').projectDir = file("$rootDir/libraries/tools/kotlin-noarg/plugin-marker")