From 675f9305668ba33dec45e45ab524fc19d77c7d66 Mon Sep 17 00:00:00 2001 From: Dmitry Savvinov Date: Tue, 28 May 2019 21:23:31 +0300 Subject: [PATCH] Fix compilation in bunches Change in bunches was forgotten in aeb7f8400ae688b82f7b5774d54b1d0660ab5a14 --- .../KotlinMPPGradleProjectTaskRunner.java.182 | 5 +++-- .../KotlinMPPGradleProjectTaskRunner.java.183 | 15 ++++++++++----- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/gradle/execution/KotlinMPPGradleProjectTaskRunner.java.182 b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/gradle/execution/KotlinMPPGradleProjectTaskRunner.java.182 index 4b4402e00e8..7a3e1b6c82a 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/gradle/execution/KotlinMPPGradleProjectTaskRunner.java.182 +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/gradle/execution/KotlinMPPGradleProjectTaskRunner.java.182 @@ -1,3 +1,4 @@ +/* /* * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. @@ -296,7 +297,7 @@ class KotlinMPPGradleProjectTaskRunner extends ProjectTaskRunner final KotlinFacet kotlinFacet = KotlinFacet.Companion.get(module); if (kotlinFacet == null) return false; - final TargetPlatform platform = kotlinFacet.getConfiguration().getSettings().getPlatform(); + final TargetPlatform platform = kotlinFacet.getConfiguration().getSettings().getTargetPlatform(); if (platform == null) return false; return KonanPlatformKt.isNative(platform); @@ -309,7 +310,7 @@ class KotlinMPPGradleProjectTaskRunner extends ProjectTaskRunner final KotlinFacetSettings facetSettings = kotlinFacet.getConfiguration().getSettings(); if (facetSettings.isTestModule()) return false; - final TargetPlatform platform = facetSettings.getPlatform(); + final TargetPlatform platform = facetSettings.getTargetPlatform(); if (platform == null) return false; return TargetPlatformKt.isCommon(platform); diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/gradle/execution/KotlinMPPGradleProjectTaskRunner.java.183 b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/gradle/execution/KotlinMPPGradleProjectTaskRunner.java.183 index be80713e15e..6a89984de61 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/gradle/execution/KotlinMPPGradleProjectTaskRunner.java.183 +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/gradle/execution/KotlinMPPGradleProjectTaskRunner.java.183 @@ -36,9 +36,14 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.config.KotlinFacetSettings; import org.jetbrains.kotlin.idea.facet.KotlinFacet; -import org.jetbrains.kotlin.platform.IdePlatform; +import org.jetbrains.kotlin.konan.target.KonanTargetKt; +import org.jetbrains.kotlin.platform.IdePlatformKindUtil; +import org.jetbrains.kotlin.platform.TargetPlatformKt; import org.jetbrains.kotlin.platform.impl.CommonIdePlatformUtil; import org.jetbrains.kotlin.platform.impl.NativeIdePlatformUtil; +import org.jetbrains.kotlin.platform.TargetPlatform; +import org.jetbrains.kotlin.platform.PlatformUtilKt; +import org.jetbrains.kotlin.platform.konan.KonanPlatformKt; import org.jetbrains.plugins.gradle.execution.build.CachedModuleDataFinder; import org.jetbrains.plugins.gradle.execution.build.GradleProjectTaskRunner; import org.jetbrains.plugins.gradle.service.project.GradleBuildSrcProjectsResolver; @@ -292,10 +297,10 @@ class KotlinMPPGradleProjectTaskRunner extends ProjectTaskRunner final KotlinFacet kotlinFacet = KotlinFacet.Companion.get(module); if (kotlinFacet == null) return false; - final IdePlatform platform = kotlinFacet.getConfiguration().getSettings().getPlatform(); + final TargetPlatform platform = kotlinFacet.getConfiguration().getSettings().getTargetPlatform(); if (platform == null) return false; - return NativeIdePlatformUtil.isKotlinNative(platform); + return KonanPlatformKt.isNative(platform); } private static boolean isCommonProductionSourceModule(Module module) { @@ -305,10 +310,10 @@ class KotlinMPPGradleProjectTaskRunner extends ProjectTaskRunner final KotlinFacetSettings facetSettings = kotlinFacet.getConfiguration().getSettings(); if (facetSettings.isTestModule()) return false; - final IdePlatform platform = facetSettings.getPlatform(); + final TargetPlatform platform = facetSettings.getTargetPlatform(); if (platform == null) return false; - return CommonIdePlatformUtil.isCommon(platform); + return TargetPlatformKt.isCommon(platform); } private static Collection findNativeGradleBuildTasks(Collection gradleTasks, String sourceSetName) {