Merge remote-tracking branch 'origin/vsoroka/gradle_on_targets'
authorVladislav.Soroka <Vladislav.Soroka@jetbrains.com>
Mon, 15 Feb 2021 11:45:30 +0000 (14:45 +0300)
committerintellij-monorepo-bot <intellij-monorepo-bot-no-reply@jetbrains.com>
Mon, 15 Feb 2021 11:45:30 +0000 (11:45 +0000)
commit01a632b2121204989885dd94af6b4dff21350a94
treeb7754221bbb4a6739c574f66a34d94499bb4f71b
parentbf3fd54bbcb49b881e71b8f2a4033ea79daf1db9
parentc177df57d73f548d5bffb0fe23d926a852326095
Merge remote-tracking branch 'origin/vsoroka/gradle_on_targets'

# Conflicts:
# community/platform/platform-impl/src/com/intellij/execution/wsl/target/WslTargetEnvironment.kt
# community/plugins/gradle/intellij.gradle.common.iml
# community/plugins/gradle/java/intellij.gradle.java.iml
# community/plugins/gradle/src/org/jetbrains/plugins/gradle/util/GradleUtil.java
# community/plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/ProjectImportAction.java
# platform/rdserver/src/execution/configurations/BackendRunContentHost.kt

GitOrigin-RevId: 16a57dda930f39990c664a6d478fa037d2666576
13 files changed:
.idea/modules.xml
platform/external-system-api/src/com/intellij/openapi/externalSystem/util/ExternalSystemApiUtil.java
platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemRunnableState.java
plugins/gradle/intellij.gradle.common.iml
plugins/gradle/java/intellij.gradle.java.iml
plugins/gradle/resources/messages/GradleBundle.properties
plugins/gradle/src/org/jetbrains/plugins/gradle/service/execution/GradleExecutionHelper.java
plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/CommonGradleProjectResolverExtension.java
plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectResolverUtil.java
plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/data/ExternalProjectDataCache.java
plugins/gradle/src/org/jetbrains/plugins/gradle/util/GradleUtil.java
plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/model/ProjectImportAction.java
plugins/gradle/tooling-extension-api/src/org/jetbrains/plugins/gradle/tooling/serialization/internal/adapter/AdapterUtils.java