Skip to content

Commit 6fc4bf8

Browse files
committed
fix
1 parent 8c2b209 commit 6fc4bf8

File tree

9 files changed

+36
-24
lines changed

9 files changed

+36
-24
lines changed

buildSrc/src/main/kotlin/temp-toolkit-intellij-root-conventions.gradle.kts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,13 @@ intellijPlatform {
5353
tasks.prepareSandbox {
5454
val pluginName = intellijPlatform.projectName
5555

56-
from(resharperDlls)
57-
.into(pluginName.map { "$it/dotnet" })
56+
from(resharperDlls) {
57+
into(pluginName.map { "$it/dotnet" })
58+
}
5859

59-
.from(gatewayResources)
60-
.into(pluginName.map { "$it/gateway-resources" })
60+
from(gatewayResources) {
61+
into(pluginName.map { "$it/gateway-resources" })
62+
}
6163
}
6264

6365
// We have no source in this project, so skip test task

plugins/amazonq/build.gradle.kts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,10 @@ val prepareBundledFlare by tasks.registering(Copy::class) {
133133
}
134134

135135
tasks.withType<PrepareSandboxTask>().configureEach {
136-
from(intellijPlatform.projectName.map { "$it/lib" })
137-
.into(file("contrib/QCT-Maven-6-16.jar"))
138-
from(intellijPlatform.projectName.map { "$it/flare" })
139-
.into(prepareBundledFlare)
136+
from(file("contrib/QCT-Maven-6-16.jar")) {
137+
into(intellijPlatform.projectName.map { "$it/lib" })
138+
}
139+
from(prepareBundledFlare) {
140+
into(intellijPlatform.projectName.map { "$it/flare" })
141+
}
140142
}

plugins/amazonq/codetransform/jetbrains-community/build.gradle.kts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ tasks.prepareTestSandbox {
3232
val pluginXmlJar = project(":plugin-amazonq").tasks.jar
3333

3434
dependsOn(pluginXmlJar)
35-
from(intellijPlatform.projectName.map { "$it/lib" })
36-
.into(pluginXmlJar)
35+
from(intellijPlatform.projectName.map { "$it/lib" }) {
36+
into(pluginXmlJar)
37+
}
3738
}

plugins/amazonq/codewhisperer/jetbrains-community/build.gradle.kts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ tasks.prepareTestSandbox {
3131
val pluginXmlJar = project(":plugin-amazonq").tasks.jar
3232

3333
dependsOn(pluginXmlJar)
34-
from(intellijPlatform.projectName.map { "$it/lib" })
35-
.into(pluginXmlJar)
34+
from(intellijPlatform.projectName.map { "$it/lib" }) {
35+
into(pluginXmlJar)
36+
}
3637
}

plugins/amazonq/codewhisperer/jetbrains-ultimate/build.gradle.kts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ tasks.prepareTestSandbox {
3131
val pluginXmlJar = project(":plugin-amazonq").tasks.jar
3232

3333
dependsOn(pluginXmlJar)
34-
from(intellijPlatform.projectName.map { "$it/lib" })
35-
.into(pluginXmlJar)
34+
from(intellijPlatform.projectName.map { "$it/lib" }) {
35+
into(pluginXmlJar)
36+
}
3637
}

plugins/amazonq/shared/jetbrains-community/build.gradle.kts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ tasks.prepareTestSandbox {
3030
val pluginXmlJar = project(":plugin-amazonq").tasks.jar
3131

3232
dependsOn(pluginXmlJar)
33-
from(intellijPlatform.projectName.map { "$it/lib" })
34-
.into(pluginXmlJar)
33+
from(intellijPlatform.projectName.map { "$it/lib" }) {
34+
into(pluginXmlJar)
35+
}
3536
}

plugins/core/jetbrains-community/build.gradle.kts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ tasks.prepareTestSandbox {
9595
val pluginXmlJar = project(":plugin-core").tasks.jar
9696

9797
dependsOn(pluginXmlJar)
98-
from(intellijPlatform.projectName.map { "$it/lib" })
99-
.into(pluginXmlJar)
98+
from(intellijPlatform.projectName.map { "$it/lib" }) {
99+
into(pluginXmlJar)
100+
}
100101
}

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,9 @@ tasks.jar {
138138
}
139139

140140
tasks.withType<PrepareSandboxTask>().configureEach {
141-
from(intellijPlatform.projectName.map { "$it/gateway-resources" })
142-
.into(gatewayResourcesDir)
141+
from(intellijPlatform.projectName.map { "$it/gateway-resources" }) {
142+
into(gatewayResourcesDir)
143+
}
143144
}
144145

145146
listOf(
@@ -150,8 +151,9 @@ listOf(
150151
runtimeClasspath.setFrom(gatewayOnlyRuntimeClasspath)
151152

152153
dependsOn(gatewayOnlyResourcesJar)
153-
from(intellijPlatform.projectName.map { "$it/lib" })
154-
.into(gatewayOnlyResourcesJar)
154+
from(intellijPlatform.projectName.map { "$it/lib" }) {
155+
into(gatewayOnlyResourcesJar)
156+
}
155157
}
156158
}
157159

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -338,8 +338,9 @@ tasks.withType<PrepareSandboxTask>().configureEach {
338338

339339
dependsOn(resharperDllsDir)
340340

341-
from(intellijPlatform.projectName.map { "$it/dotnet" })
342-
.into(resharperDllsDir)
341+
from(intellijPlatform.projectName.map { "$it/dotnet" }) {
342+
into(resharperDllsDir)
343+
}
343344
}
344345

345346
tasks.compileKotlin {

0 commit comments

Comments
 (0)