From 93d93cd40e560a209d70258e3377471ac59ea46b Mon Sep 17 00:00:00 2001
From: Vadim Brilyantov <v.brilyantov@yandex.ru>
Date: Wed, 12 Dec 2018 15:07:15 +0300
Subject: [PATCH] fix report kotlin targets for android case

---
 .../KotlinGradleProjectResolverExtension.kt        | 14 +++++++++++++-
 libraries/stdlib/src/kotlin/util/KotlinVersion.kt  |  2 +-
 2 files changed, 14 insertions(+), 2 deletions(-)

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 da7f9706331..08bd8b20821 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
@@ -16,6 +16,7 @@
 
 package org.jetbrains.kotlin.idea.configuration
 
+import com.intellij.internal.statistic.service.fus.collectors.FUSApplicationUsageTrigger
 import com.intellij.openapi.externalSystem.model.DataNode
 import com.intellij.openapi.externalSystem.model.ProjectKeys
 import com.intellij.openapi.externalSystem.model.project.ExternalSystemSourceType
@@ -36,6 +37,7 @@ import org.jetbrains.kotlin.idea.inspections.gradle.getDependencyModules
 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.statistics.KotlinTargetTrigger
 import org.jetbrains.plugins.gradle.model.ExternalProjectDependency
 import org.jetbrains.plugins.gradle.model.ExternalSourceSet
 import org.jetbrains.plugins.gradle.model.FileCollectionDependency
@@ -188,7 +190,11 @@ class KotlinGradleProjectResolverExtension : AbstractProjectResolverExtension()
         ideModule: DataNode<ModuleData>,
         ideProject: DataNode<ProjectData>
     ) {
-        if (resolverCtx.getExtraProject(gradleModule, KotlinMPPGradleModel::class.java) != null) {
+        val mppModel = resolverCtx.getExtraProject(gradleModule, KotlinMPPGradleModel::class.java)
+        if (mppModel != null) {
+            mppModel.targets.filterNot { it.name == "metadata" }.forEach { target ->
+                FUSApplicationUsageTrigger.getInstance().trigger(KotlinTargetTrigger::class.java, target.name)
+            }
             return super.populateModuleDependencies(gradleModule, ideModule, ideProject)
         }
 
@@ -207,6 +213,12 @@ class KotlinGradleProjectResolverExtension : AbstractProjectResolverExtension()
         ideModule.compilerArgumentsBySourceSet = gradleModel.compilerArgumentsBySourceSet
         ideModule.coroutines = gradleModel.coroutines
         ideModule.platformPluginId = gradleModel.platformPluginId
+
+        FUSApplicationUsageTrigger.getInstance().trigger(
+                KotlinTargetTrigger::class.java,
+                gradleModel.platformPluginId ?: "none"
+        )
+
         addImplementedModuleNames(gradleModule, ideModule, ideProject, gradleModel)
 
         if (useModulePerSourceSet()) {
diff --git a/libraries/stdlib/src/kotlin/util/KotlinVersion.kt b/libraries/stdlib/src/kotlin/util/KotlinVersion.kt
index 8ca485d9a8e..20b1b1c3764 100644
--- a/libraries/stdlib/src/kotlin/util/KotlinVersion.kt
+++ b/libraries/stdlib/src/kotlin/util/KotlinVersion.kt
@@ -72,6 +72,6 @@ public class KotlinVersion(val major: Int, val minor: Int, val patch: Int) : Com
          * Returns the current version of the Kotlin standard library.
          */
         @kotlin.jvm.JvmField
-        public val CURRENT: KotlinVersion = KotlinVersion(1, 3, 111) // value is written here automatically during build
+        public val CURRENT: KotlinVersion = KotlinVersion(1, 3, 0) // value is written here automatically during build
     }
 }