diff --git a/idea/idea-core/build.gradle.kts b/idea/idea-core/build.gradle.kts index cbd95d2e68f..d47386c1577 100644 --- a/idea/idea-core/build.gradle.kts +++ b/idea/idea-core/build.gradle.kts @@ -17,7 +17,6 @@ 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 } diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleProjectResolverExtension.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleProjectResolverExtension.kt index f696ce2c92b..accad1e0d51 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleProjectResolverExtension.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleProjectResolverExtension.kt @@ -38,8 +38,8 @@ import org.jetbrains.kotlin.idea.util.CopyableDataNodeUserDataProperty import org.jetbrains.kotlin.idea.util.DataNodeUserDataProperty import org.jetbrains.kotlin.idea.util.NotNullableCopyableDataNodeUserDataProperty import org.jetbrains.kotlin.idea.util.PsiPrecedences -import org.jetbrains.kotlin.statistics.KotlinEventTrigger -import org.jetbrains.kotlin.statistics.KotlinStatisticsTrigger +import org.jetbrains.kotlin.idea.statistics.KotlinEventTrigger +import org.jetbrains.kotlin.idea.statistics.KotlinStatisticsTrigger import org.jetbrains.plugins.gradle.model.ExternalProjectDependency import org.jetbrains.plugins.gradle.model.ExternalSourceSet import org.jetbrains.plugins.gradle.model.FileCollectionDependency diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/KtScratchFileCreationHelper.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/KtScratchFileCreationHelper.kt index 84b5f5a87a5..a731f44b1d9 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/KtScratchFileCreationHelper.kt +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/KtScratchFileCreationHelper.kt @@ -9,8 +9,8 @@ import com.intellij.ide.scratch.ScratchFileCreationHelper import com.intellij.openapi.actionSystem.DataContext import com.intellij.openapi.project.Project import org.jetbrains.kotlin.parsing.KotlinParserDefinition -import org.jetbrains.kotlin.statistics.KotlinEventTrigger -import org.jetbrains.kotlin.statistics.KotlinStatisticsTrigger +import org.jetbrains.kotlin.idea.statistics.KotlinEventTrigger +import org.jetbrains.kotlin.idea.statistics.KotlinStatisticsTrigger class KtScratchFileCreationHelper: ScratchFileCreationHelper() { diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinFileAction.kt b/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinFileAction.kt index fde48a7477a..5759abd0481 100644 --- a/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinFileAction.kt +++ b/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinFileAction.kt @@ -47,8 +47,8 @@ import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.psi.KtClass import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtNamedDeclaration -import org.jetbrains.kotlin.statistics.KotlinEventTrigger -import org.jetbrains.kotlin.statistics.KotlinStatisticsTrigger +import org.jetbrains.kotlin.idea.statistics.KotlinEventTrigger +import org.jetbrains.kotlin.idea.statistics.KotlinStatisticsTrigger import java.util.* class NewKotlinFileAction : CreateFileFromTemplateAction( diff --git a/idea/src/org/jetbrains/kotlin/idea/framework/TargetRetrieveActivity.kt b/idea/src/org/jetbrains/kotlin/idea/framework/TargetRetrieveActivity.kt index 72441b94001..ec02250ce30 100644 --- a/idea/src/org/jetbrains/kotlin/idea/framework/TargetRetrieveActivity.kt +++ b/idea/src/org/jetbrains/kotlin/idea/framework/TargetRetrieveActivity.kt @@ -15,8 +15,8 @@ import org.jetbrains.kotlin.platform.impl.isCommon import org.jetbrains.kotlin.platform.impl.isJavaScript import org.jetbrains.kotlin.platform.impl.isJvm import org.jetbrains.kotlin.platform.impl.isKotlinNative -import org.jetbrains.kotlin.statistics.KotlinEventTrigger -import org.jetbrains.kotlin.statistics.KotlinStatisticsTrigger +import org.jetbrains.kotlin.idea.statistics.KotlinEventTrigger +import org.jetbrains.kotlin.idea.statistics.KotlinStatisticsTrigger class TargetRetrieveActivity : StartupActivity { diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/KotlinPullUpHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/KotlinPullUpHandler.kt index c7b7a1701fc..8ac0791c2b1 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/KotlinPullUpHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/KotlinPullUpHandler.kt @@ -39,8 +39,8 @@ import org.jetbrains.kotlin.psi.KtClass import org.jetbrains.kotlin.psi.KtClassOrObject import org.jetbrains.kotlin.psi.KtNamedDeclaration import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType -import org.jetbrains.kotlin.statistics.KotlinEventTrigger -import org.jetbrains.kotlin.statistics.KotlinStatisticsTrigger +import org.jetbrains.kotlin.idea.statistics.KotlinEventTrigger +import org.jetbrains.kotlin.idea.statistics.KotlinStatisticsTrigger import org.jetbrains.kotlin.types.typeUtil.supertypes class KotlinPullUpHandler : AbstractPullPushMembersHandler( diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/pushDown/KotlinPushDownHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/pushDown/KotlinPushDownHandler.kt index 6bc0e91d17d..ffaf48ca4d1 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/pushDown/KotlinPushDownHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/pushDown/KotlinPushDownHandler.kt @@ -36,8 +36,8 @@ import org.jetbrains.kotlin.psi.KtClass import org.jetbrains.kotlin.psi.KtClassOrObject import org.jetbrains.kotlin.psi.KtNamedDeclaration import org.jetbrains.kotlin.psi.KtParameter -import org.jetbrains.kotlin.statistics.KotlinEventTrigger -import org.jetbrains.kotlin.statistics.KotlinStatisticsTrigger +import org.jetbrains.kotlin.idea.statistics.KotlinEventTrigger +import org.jetbrains.kotlin.idea.statistics.KotlinStatisticsTrigger val PUSH_MEMBERS_DOWN = "Push Members Down" diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/JavaMemberByKotlinReferenceInplaceRenameHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/JavaMemberByKotlinReferenceInplaceRenameHandler.kt index e08070b601b..7af45604a23 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/JavaMemberByKotlinReferenceInplaceRenameHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/JavaMemberByKotlinReferenceInplaceRenameHandler.kt @@ -32,8 +32,8 @@ import org.jetbrains.kotlin.idea.references.mainReference import org.jetbrains.kotlin.psi.KtPsiUtil import org.jetbrains.kotlin.psi.KtSimpleNameExpression import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType -import org.jetbrains.kotlin.statistics.KotlinEventTrigger -import org.jetbrains.kotlin.statistics.KotlinStatisticsTrigger +import org.jetbrains.kotlin.idea.statistics.KotlinEventTrigger +import org.jetbrains.kotlin.idea.statistics.KotlinStatisticsTrigger class JavaMemberByKotlinReferenceInplaceRenameHandler : MemberInplaceRenameHandler() { class Renamer( diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinAwareJavaGetterRenameProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinAwareJavaGetterRenameProcessor.kt index a1bfdbc261a..276244a8fd7 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinAwareJavaGetterRenameProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinAwareJavaGetterRenameProcessor.kt @@ -14,8 +14,8 @@ import org.jetbrains.kotlin.asJava.elements.KtLightMethod import org.jetbrains.kotlin.idea.references.SyntheticPropertyAccessorReference import org.jetbrains.kotlin.load.java.JvmAbi import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.statistics.KotlinEventTrigger -import org.jetbrains.kotlin.statistics.KotlinStatisticsTrigger +import org.jetbrains.kotlin.idea.statistics.KotlinEventTrigger +import org.jetbrains.kotlin.idea.statistics.KotlinStatisticsTrigger import org.jetbrains.kotlin.synthetic.SyntheticJavaPropertyDescriptor import org.jetbrains.kotlin.utils.ifEmpty diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinDirectoryAsPackageRenameHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinDirectoryAsPackageRenameHandler.kt index c0a57db4fbc..b303df01ab1 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinDirectoryAsPackageRenameHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinDirectoryAsPackageRenameHandler.kt @@ -24,8 +24,8 @@ import com.intellij.psi.PsiFile import com.intellij.refactoring.rename.DirectoryAsPackageRenameHandler import org.jetbrains.kotlin.psi.psiUtil.isIdentifier import org.jetbrains.kotlin.psi.psiUtil.quoteIfNeeded -import org.jetbrains.kotlin.statistics.KotlinEventTrigger -import org.jetbrains.kotlin.statistics.KotlinStatisticsTrigger +import org.jetbrains.kotlin.idea.statistics.KotlinEventTrigger +import org.jetbrains.kotlin.idea.statistics.KotlinStatisticsTrigger class KotlinDirectoryAsPackageRenameHandler : DirectoryAsPackageRenameHandler() { override fun isIdentifier(name: String, project: Project): Boolean = name.quoteIfNeeded().isIdentifier() diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFileProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFileProcessor.kt index 5e3f9d796e6..47f2a034b46 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFileProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFileProcessor.kt @@ -30,8 +30,8 @@ import org.jetbrains.kotlin.idea.KotlinFileType import org.jetbrains.kotlin.idea.util.ProjectRootsUtil import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils import org.jetbrains.kotlin.psi.KtFile -import org.jetbrains.kotlin.statistics.KotlinEventTrigger -import org.jetbrains.kotlin.statistics.KotlinStatisticsTrigger +import org.jetbrains.kotlin.idea.statistics.KotlinEventTrigger +import org.jetbrains.kotlin.idea.statistics.KotlinStatisticsTrigger class RenameKotlinFileProcessor : RenamePsiFileProcessor() { class FileRenamingPsiClassWrapper( diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFileProcessor.kt.173 b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFileProcessor.kt.173 index cb7fb4146ce..47bf96d9077 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFileProcessor.kt.173 +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFileProcessor.kt.173 @@ -30,8 +30,8 @@ import org.jetbrains.kotlin.idea.KotlinFileType import org.jetbrains.kotlin.idea.util.ProjectRootsUtil import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils import org.jetbrains.kotlin.psi.KtFile -import org.jetbrains.kotlin.statistics.KotlinEventTrigger -import org.jetbrains.kotlin.statistics.KotlinStatisticsTrigger +import org.jetbrains.kotlin.idea.statistics.KotlinEventTrigger +import org.jetbrains.kotlin.idea.statistics.KotlinStatisticsTrigger class RenameKotlinFileProcessor : RenamePsiFileProcessor() { class FileRenamingPsiClassWrapper( diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPsiProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPsiProcessor.kt index 1203ae0d5b2..054a2abe865 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPsiProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPsiProcessor.kt @@ -46,8 +46,8 @@ import org.jetbrains.kotlin.psi.psiUtil.isIdentifier import org.jetbrains.kotlin.psi.psiUtil.parents import org.jetbrains.kotlin.psi.psiUtil.quoteIfNeeded import org.jetbrains.kotlin.resolve.ImportPath -import org.jetbrains.kotlin.statistics.KotlinEventTrigger -import org.jetbrains.kotlin.statistics.KotlinStatisticsTrigger +import org.jetbrains.kotlin.idea.statistics.KotlinEventTrigger +import org.jetbrains.kotlin.idea.statistics.KotlinStatisticsTrigger import java.util.ArrayList import kotlin.collections.* diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameSyntheticDeclarationByReferenceHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameSyntheticDeclarationByReferenceHandler.kt index b27e7bf8b2e..ae959b3e329 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameSyntheticDeclarationByReferenceHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameSyntheticDeclarationByReferenceHandler.kt @@ -16,8 +16,8 @@ import org.jetbrains.kotlin.idea.caches.resolve.resolveToCall import org.jetbrains.kotlin.idea.codeInsight.CodeInsightUtils import org.jetbrains.kotlin.psi.KtSimpleNameExpression import org.jetbrains.kotlin.resolve.calls.tower.isSynthesized -import org.jetbrains.kotlin.statistics.KotlinEventTrigger -import org.jetbrains.kotlin.statistics.KotlinStatisticsTrigger +import org.jetbrains.kotlin.idea.statistics.KotlinEventTrigger +import org.jetbrains.kotlin.idea.statistics.KotlinStatisticsTrigger class RenameSyntheticDeclarationByReferenceHandler : RenameHandler { override fun isAvailableOnDataContext(dataContext: DataContext): Boolean { diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameSyntheticDeclarationByReferenceHandler.kt.181 b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameSyntheticDeclarationByReferenceHandler.kt.181 index 86e291f8afe..0e47f20e979 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameSyntheticDeclarationByReferenceHandler.kt.181 +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameSyntheticDeclarationByReferenceHandler.kt.181 @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.idea.refactoring.rename -import org.jetbrains.kotlin.statistics.KotlinStatisticsTrigger +import org.jetbrains.kotlin.idea.statistics.KotlinStatisticsTrigger import com.intellij.openapi.actionSystem.CommonDataKeys import com.intellij.openapi.actionSystem.DataContext import com.intellij.openapi.editor.Editor @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.idea.caches.resolve.resolveToCall import org.jetbrains.kotlin.idea.codeInsight.CodeInsightUtils import org.jetbrains.kotlin.psi.KtSimpleNameExpression import org.jetbrains.kotlin.resolve.calls.tower.isSynthesized -import org.jetbrains.kotlin.statistics.KotlinEventTrigger +import org.jetbrains.kotlin.idea.statistics.KotlinEventTrigger class RenameSyntheticDeclarationByReferenceHandler : RenameHandler { override fun isAvailableOnDataContext(dataContext: DataContext?): Boolean { diff --git a/usage-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/KotlinEventTriggers.kt b/idea/src/org/jetbrains/kotlin/idea/statistics/KotlinEventTriggers.kt similarity index 94% rename from usage-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/KotlinEventTriggers.kt rename to idea/src/org/jetbrains/kotlin/idea/statistics/KotlinEventTriggers.kt index 3efc02e5153..f34eb5a2f79 100644 --- a/usage-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/KotlinEventTriggers.kt +++ b/idea/src/org/jetbrains/kotlin/idea/statistics/KotlinEventTriggers.kt @@ -3,7 +3,7 @@ * that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.statistics +package org.jetbrains.kotlin.idea.statistics // Note: along with adding a trigger to this enum you sould also add its GROUP_ID to plugin.xml and get it whitelisted // (see https://confluence.jetbrains.com/display/FUS/IntelliJ+Reporting+API). diff --git a/usage-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/ProjectScopeStatsReporters.kt b/idea/src/org/jetbrains/kotlin/idea/statistics/ProjectScopeStatsReporters.kt similarity index 72% rename from usage-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/ProjectScopeStatsReporters.kt rename to idea/src/org/jetbrains/kotlin/idea/statistics/ProjectScopeStatsReporters.kt index a061f2d94c1..986601b4ec1 100644 --- a/usage-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/ProjectScopeStatsReporters.kt +++ b/idea/src/org/jetbrains/kotlin/idea/statistics/ProjectScopeStatsReporters.kt @@ -1,9 +1,9 @@ /* - * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * Copyright 2010-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license * that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.statistics +package org.jetbrains.kotlin.idea.statistics open class KotlinStatisticsTrigger { companion object { diff --git a/usage-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/ProjectScopeStatsReporters.kt.182 b/idea/src/org/jetbrains/kotlin/idea/statistics/ProjectScopeStatsReporters.kt.182 similarity index 88% rename from usage-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/ProjectScopeStatsReporters.kt.182 rename to idea/src/org/jetbrains/kotlin/idea/statistics/ProjectScopeStatsReporters.kt.182 index a4156305a0c..c347fd3324f 100644 --- a/usage-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/ProjectScopeStatsReporters.kt.182 +++ b/idea/src/org/jetbrains/kotlin/idea/statistics/ProjectScopeStatsReporters.kt.182 @@ -3,7 +3,7 @@ * that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.statistics +package org.jetbrains.kotlin.idea.statistics open class KotlinStatisticsTrigger { companion object { diff --git a/usage-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/ProjectScopeStatsReporters.kt.191 b/idea/src/org/jetbrains/kotlin/idea/statistics/ProjectScopeStatsReporters.kt.191 similarity index 92% rename from usage-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/ProjectScopeStatsReporters.kt.191 rename to idea/src/org/jetbrains/kotlin/idea/statistics/ProjectScopeStatsReporters.kt.191 index b2952b6f3c0..e5dcd34301b 100644 --- a/usage-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/ProjectScopeStatsReporters.kt.191 +++ b/idea/src/org/jetbrains/kotlin/idea/statistics/ProjectScopeStatsReporters.kt.191 @@ -3,7 +3,7 @@ * that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.statistics +package org.jetbrains.kotlin.idea.statistics import com.intellij.internal.statistic.service.fus.collectors.FUCounterUsageLogger; import com.intellij.internal.statistic.eventLog.FeatureUsageData; @@ -18,7 +18,7 @@ open class KotlinStatisticsTrigger { public fun trigger(trigger: KotlinEventTrigger, event: String) { val context = FeatureUsageData().addFeatureContext(FUSUsageContext.create(VERSION)); - FUCounterUsageLogger.getInstance().logEvent(trigger.GROUP_ID, key, data); + FUCounterUsageLogger.getInstance().logEvent(trigger.GROUP_ID, event, context); } } } \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 32e04e7bca4..c834840db22 100644 --- a/settings.gradle +++ b/settings.gradle @@ -184,7 +184,6 @@ include ":kotlin-build-common", ":libraries:tools:mutability-annotations-compat", ":include:kotlin-compiler", ":plugins:jvm-abi-gen", - ":usage-statistics", // plugin markers: ':kotlin-gradle-plugin:plugin-marker', @@ -351,7 +350,6 @@ project(':pill:generate-all-tests').projectDir = "$rootDir/plugins/pill/generate project(':kotlin-imports-dumper-compiler-plugin').projectDir = "$rootDir/plugins/imports-dumper" as File project(':libraries:kotlin-prepush-hook').projectDir = "$rootDir/libraries/tools/kotlin-prepush-hook" as File project(':plugins:jvm-abi-gen').projectDir = "$rootDir/plugins/jvm-abi-gen" as File -project(':usage-statistics').projectDir = "$rootDir/usage-statistics" as File // plugin markers: project(':kotlin-gradle-plugin:plugin-marker').projectDir = file("$rootDir/libraries/tools/kotlin-gradle-plugin/plugin-marker") diff --git a/usage-statistics/build.gradle.kts b/usage-statistics/build.gradle.kts deleted file mode 100644 index 1829a32f183..00000000000 --- a/usage-statistics/build.gradle.kts +++ /dev/null @@ -1,19 +0,0 @@ - -plugins { - kotlin("jvm") - id("jps-compatible") -} - -dependencies { - compile(intellijDep()) { - includeJars("platform-api", "platform-impl", "extensions", rootProject = rootProject) - isTransitive = false - } -} - -sourceSets { - "main" { projectDefault() } - "test" {} -} - -ideaPlugin() \ No newline at end of file