fix build for idea plugin with usage statistics

This commit is contained in:
Vadim Brilyantov
2018-11-26 18:03:53 +03:00
parent ae9f16d964
commit c307d07b47
3 changed files with 6 additions and 7 deletions
+1
View File
@@ -17,6 +17,7 @@ dependencies {
compile(project(":j2k"))
compile(project(":idea:ide-common"))
compile(project(":idea:idea-jps-common"))
compile(project(":usage-statistics"))
compile(project(":plugins:android-extensions-compiler"))
compile(project(":kotlin-scripting-compiler"))
compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
+4 -2
View File
@@ -7,8 +7,8 @@ plugins {
jvmTarget = "1.6"
dependencies {
testCompile(intellijDep()) {
includeJars("platform-api", rootProject = rootProject)
compile(intellijDep()) {
includeJars("platform-api", "platform-impl", rootProject = rootProject)
isTransitive = false
}
}
@@ -17,3 +17,5 @@ sourceSets {
"main" { projectDefault() }
"test" {}
}
ideaPlugin()
@@ -6,10 +6,6 @@
package org.jetbrains.kotlin.statistics
import com.intellij.internal.statistic.service.fus.collectors.ApplicationUsageTriggerCollector
import javax.annotation.processing.AbstractProcessor
import javax.annotation.processing.Processor
import javax.annotation.processing.RoundEnvironment
import javax.lang.model.element.TypeElement
open class KotlinStatisticsTrigger(private val groupIdSufix: String) : ApplicationUsageTriggerCollector() {
override fun getGroupId() = "statistics.kotlin.$groupIdSufix"
@@ -23,7 +19,7 @@ class KotlinVersionTrigger : KotlinGradlePluginStatisticsTrigger("kotlin_version
class KotlinProjectLibraryUsageTrigger : KotlinGradlePluginStatisticsTrigger("library")
open class KotlinIdeActionTrigger(groupIdSufix: String? = null) : KotlinIdeStatisticsTrigger("action" + (groupIdSufix?.let { ".$it" } ?: ""))
open class KotlinIdeActionTrigger(groupIdSufix: String? = null) : KotlinIdeStatisticsTrigger("action" + (if (groupIdSufix != null) ".$groupIdSufix" else ""))
class KotlinIdeUndoTrigger : KotlinIdeActionTrigger("undo")