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

fix report kotlin targets for android case

Browse Source
This commit is contained in:
Vadim Brilyantov
2018-12-12 15:07:15 +03:00
parent df5ec5c218
commit 93d93cd40e
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleProjectResolverExtension.kt
+13 -1
View File
@@ -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()) {
libraries/stdlib/src/kotlin/util/KotlinVersion.kt
+1 -1
View File
@@ -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
}
}