Skip to content

Commit f88a3fd

Browse files
authored
Fix scripts missing when connecting through JetBrains Gateway (#4205)
Plugin resources were being emitted to wrong directory
1 parent 0dc9e87 commit f88a3fd

File tree

4 files changed

+14
-12
lines changed

4 files changed

+14
-12
lines changed
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type" : "bugfix",
3+
"description" : "Fix scripts missing when connecting through JetBrains Gateway (#4188)"
4+
}

plugins/toolkit/intellij/build.gradle.kts

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,11 @@ intellij {
5050
}
5151

5252
tasks.prepareSandbox {
53-
from(resharperDlls) {
54-
into("aws-toolkit-jetbrains/dotnet")
55-
}
56-
from(gatewayResources) {
57-
into("aws-toolkit-jetbrains/gateway-resources")
58-
}
53+
intoChild(pluginName.map { "$it/dotnet" })
54+
.from(resharperDlls)
55+
56+
intoChild(pluginName.map { "$it/gateway-resources" })
57+
.from(gatewayResources)
5958
}
6059

6160
tasks.publishPlugin {

plugins/toolkit/jetbrains-gateway/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ plugins {
1414
}
1515

1616
intellij {
17+
pluginName.set("aws-toolkit-jetbrains")
1718
type.set("GW")
1819
}
1920

@@ -96,9 +97,8 @@ tasks.jar {
9697
}
9798

9899
tasks.withType<PrepareSandboxTask>().all {
99-
from(gatewayResourcesDir) {
100-
into("aws-toolkit-jetbrains/gateway-resources")
101-
}
100+
intoChild(pluginName.map { "$it/gateway-resources" })
101+
.from(gatewayResourcesDir)
102102
}
103103

104104
tasks.prepareSandbox {

plugins/toolkit/jetbrains-rider/build.gradle.kts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -308,9 +308,8 @@ intellij {
308308
tasks.withType<PrepareSandboxTask>().all {
309309
dependsOn(resharperDllsDir)
310310

311-
from(resharperDllsDir) {
312-
into("aws-toolkit-jetbrains/dotnet")
313-
}
311+
intoChild(pluginName.map { "$it/dotnet" })
312+
.from(resharperDllsDir)
314313
}
315314

316315
tasks.compileKotlin {

0 commit comments

Comments
 (0)