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

Fix compilation in bunches

Browse Source 
Change in bunches was forgotten in aeb7f8400a
This commit is contained in:
Dmitry Savvinov
2019-05-28 21:23:31 +03:00
parent 78ce34f223
commit 675f930566
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-gradle/src/org/jetbrains/kotlin/idea/gradle/execution/KotlinMPPGradleProjectTaskRunner.java.182
+3 -2
View File
@@ -1,3 +1,4 @@
/*
/* /*
* Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors. * 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. * 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); final KotlinFacet kotlinFacet = KotlinFacet.Companion.get(module);
if (kotlinFacet == null) return false; if (kotlinFacet == null) return false;
final TargetPlatform platform = kotlinFacet.getConfiguration().getSettings().getPlatform(); final TargetPlatform platform = kotlinFacet.getConfiguration().getSettings().getTargetPlatform();
if (platform == null) return false; if (platform == null) return false;
return KonanPlatformKt.isNative(platform); return KonanPlatformKt.isNative(platform);
@@ -309,7 +310,7 @@ class KotlinMPPGradleProjectTaskRunner extends ProjectTaskRunner
final KotlinFacetSettings facetSettings = kotlinFacet.getConfiguration().getSettings(); final KotlinFacetSettings facetSettings = kotlinFacet.getConfiguration().getSettings();
if (facetSettings.isTestModule()) return false; if (facetSettings.isTestModule()) return false;
final TargetPlatform platform = facetSettings.getPlatform(); final TargetPlatform platform = facetSettings.getTargetPlatform();
if (platform == null) return false; if (platform == null) return false;
return TargetPlatformKt.isCommon(platform); return TargetPlatformKt.isCommon(platform);
idea/idea-gradle/src/org/jetbrains/kotlin/idea/gradle/execution/KotlinMPPGradleProjectTaskRunner.java.183
+10 -5
View File
@@ -36,9 +36,14 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.config.KotlinFacetSettings; import org.jetbrains.kotlin.config.KotlinFacetSettings;
import org.jetbrains.kotlin.idea.facet.KotlinFacet; 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.CommonIdePlatformUtil;
import org.jetbrains.kotlin.platform.impl.NativeIdePlatformUtil; 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.CachedModuleDataFinder;
import org.jetbrains.plugins.gradle.execution.build.GradleProjectTaskRunner; import org.jetbrains.plugins.gradle.execution.build.GradleProjectTaskRunner;
import org.jetbrains.plugins.gradle.service.project.GradleBuildSrcProjectsResolver; import org.jetbrains.plugins.gradle.service.project.GradleBuildSrcProjectsResolver;
@@ -292,10 +297,10 @@ class KotlinMPPGradleProjectTaskRunner extends ProjectTaskRunner
final KotlinFacet kotlinFacet = KotlinFacet.Companion.get(module); final KotlinFacet kotlinFacet = KotlinFacet.Companion.get(module);
if (kotlinFacet == null) return false; if (kotlinFacet == null) return false;
final IdePlatform platform = kotlinFacet.getConfiguration().getSettings().getPlatform(); final TargetPlatform platform = kotlinFacet.getConfiguration().getSettings().getTargetPlatform();
if (platform == null) return false; if (platform == null) return false;
return NativeIdePlatformUtil.isKotlinNative(platform); return KonanPlatformKt.isNative(platform);
} }
private static boolean isCommonProductionSourceModule(Module module) { private static boolean isCommonProductionSourceModule(Module module) {
@@ -305,10 +310,10 @@ class KotlinMPPGradleProjectTaskRunner extends ProjectTaskRunner
final KotlinFacetSettings facetSettings = kotlinFacet.getConfiguration().getSettings(); final KotlinFacetSettings facetSettings = kotlinFacet.getConfiguration().getSettings();
if (facetSettings.isTestModule()) return false; if (facetSettings.isTestModule()) return false;
final IdePlatform platform = facetSettings.getPlatform(); final TargetPlatform platform = facetSettings.getTargetPlatform();
if (platform == null) return false; if (platform == null) return false;
return CommonIdePlatformUtil.isCommon(platform); return TargetPlatformKt.isCommon(platform);
} }
private static Collection<String> findNativeGradleBuildTasks(Collection<String> gradleTasks, String sourceSetName) { private static Collection<String> findNativeGradleBuildTasks(Collection<String> gradleTasks, String sourceSetName) {