Skip to content

Commit 4ba4758

Browse files
rlirli
authored
Build for 232 (#3697)
1 parent 20820b9 commit 4ba4758

File tree

35 files changed

+409
-146
lines changed

35 files changed

+409
-146
lines changed

‎.run/Run IDE - Core [2023.2].run.xml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="Run IDE - Core [2023.2]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2023.2">
3+
<log_file alias="idea.log" path="$PROJECT_DIR$/jetbrains-core/build/idea-sandbox/system/log/idea.log" />
4+
<ExternalSystemSettings>
5+
<option name="executionName" />
6+
<option name="externalProjectPath" value="$PROJECT_DIR$/jetbrains-core" />
7+
<option name="externalSystemIdString" value="GRADLE" />
8+
<option name="scriptParameters" value="-PideProfileName=2023.2" />
9+
<option name="taskDescriptions">
10+
<list />
11+
</option>
12+
<option name="taskNames">
13+
<list>
14+
<option value="runIde" />
15+
</list>
16+
</option>
17+
<option name="vmOptions" />
18+
</ExternalSystemSettings>
19+
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
20+
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
21+
<DebugAllEnabled>false</DebugAllEnabled>
22+
<ForceTestExec>false</ForceTestExec>
23+
<method v="2" />
24+
</configuration>
25+
</component>

‎.run/Run IDE - Gateway [2023.2].run.xml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="Run IDE - Gateway [2023.2]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2023.2">
3+
<log_file alias="idea.log" path="$PROJECT_DIR$/jetbrains-gateway/build/idea-sandbox/system/log/idea.log" />
4+
<ExternalSystemSettings>
5+
<option name="executionName" />
6+
<option name="externalProjectPath" value="$PROJECT_DIR$/jetbrains-gateway" />
7+
<option name="externalSystemIdString" value="GRADLE" />
8+
<option name="scriptParameters" value="-PideProfileName=2023.2" />
9+
<option name="taskDescriptions">
10+
<list />
11+
</option>
12+
<option name="taskNames">
13+
<list>
14+
<option value="runIde" />
15+
</list>
16+
</option>
17+
<option name="vmOptions" />
18+
</ExternalSystemSettings>
19+
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
20+
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
21+
<DebugAllEnabled>false</DebugAllEnabled>
22+
<ForceTestExec>false</ForceTestExec>
23+
<method v="2" />
24+
</configuration>
25+
</component>

‎.run/Run IDE - Rider [2023.2].run.xml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="Run IDE - Rider [2023.2]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2023.2">
3+
<log_file alias="idea.log" path="$PROJECT_DIR$/jetbrains-rider/build/idea-sandbox/system/log/idea.log" />
4+
<ExternalSystemSettings>
5+
<option name="executionName" />
6+
<option name="externalProjectPath" value="$PROJECT_DIR$/jetbrains-rider" />
7+
<option name="externalSystemIdString" value="GRADLE" />
8+
<option name="scriptParameters" value="-PideProfileName=2023.2" />
9+
<option name="taskDescriptions">
10+
<list />
11+
</option>
12+
<option name="taskNames">
13+
<list>
14+
<option value="runIde" />
15+
</list>
16+
</option>
17+
<option name="vmOptions" />
18+
</ExternalSystemSettings>
19+
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
20+
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
21+
<DebugAllEnabled>false</DebugAllEnabled>
22+
<ForceTestExec>false</ForceTestExec>
23+
<method v="2" />
24+
</configuration>
25+
</component>

‎.run/Run IDE - Ultimate [2023.2].run.xml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="Run IDE - Ultimate [2023.2]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2023.2">
3+
<log_file alias="idea.log" path="$PROJECT_DIR$/jetbrains-ultimate/build/idea-sandbox/system/log/idea.log" />
4+
<ExternalSystemSettings>
5+
<option name="executionName" />
6+
<option name="externalProjectPath" value="$PROJECT_DIR$/jetbrains-ultimate" />
7+
<option name="externalSystemIdString" value="GRADLE" />
8+
<option name="scriptParameters" value="-PideProfileName=2023.2" />
9+
<option name="taskDescriptions">
10+
<list />
11+
</option>
12+
<option name="taskNames">
13+
<list>
14+
<option value="runIde" />
15+
</list>
16+
</option>
17+
<option name="vmOptions" />
18+
</ExternalSystemSettings>
19+
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
20+
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
21+
<DebugAllEnabled>false</DebugAllEnabled>
22+
<ForceTestExec>false</ForceTestExec>
23+
<method v="2" />
24+
</configuration>
25+
</component>

‎buildSrc/src/main/kotlin/software/aws/toolkits/gradle/BuildScriptUtils.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ fun Project.kotlinTarget(): Provider<String> = withCurrentProfileName {
3939
}.version
4040
}
4141

42-
private fun<T : Any> Project.withCurrentProfileName(consumer: (String) -> T): Provider<T> {
42+
fun<T : Any> Project.withCurrentProfileName(consumer: (String) -> T): Provider<T> {
4343
val name = IdeVersions.ideProfile(providers).map { it.name }
4444
return name.map {
4545
consumer(it)

‎buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,51 @@ object IdeVersions {
152152
nugetVersion = "2023.1.0"
153153
)
154154
),
155+
Profile(
156+
name = "2023.2",
157+
gateway = ProductProfile(
158+
sdkFlavor = IdeFlavor.GW,
159+
sdkVersion = "232.6734-EAP-CANDIDATE-SNAPSHOT",
160+
plugins = arrayOf("org.jetbrains.plugins.terminal")
161+
),
162+
community = ProductProfile(
163+
sdkFlavor = IdeFlavor.IC,
164+
sdkVersion = "232.6734-EAP-CANDIDATE-SNAPSHOT",
165+
plugins = commonPlugins223 + listOf(
166+
"java",
167+
"com.intellij.gradle",
168+
"org.jetbrains.idea.maven",
169+
"PythonCore:232.6734.9",
170+
"Docker:232.6734.4"
171+
)
172+
),
173+
ultimate = ProductProfile(
174+
sdkFlavor = IdeFlavor.IU,
175+
sdkVersion = "232.6734-EAP-CANDIDATE-SNAPSHOT",
176+
plugins = commonPlugins223 + listOf(
177+
"JavaScript",
178+
// Transitive dependency needed for javascript
179+
// Can remove when https://github.com/JetBrains/gradle-intellij-plugin/issues/608 is fixed
180+
"com.intellij.css",
181+
"JavaScriptDebugger",
182+
"com.intellij.database",
183+
"com.jetbrains.codeWithMe",
184+
"Pythonid:232.6734.9",
185+
"org.jetbrains.plugins.go:232.6734.9",
186+
// https://github.com/JetBrains/gradle-intellij-plugin/issues/1056
187+
"org.intellij.intelliLang"
188+
)
189+
),
190+
rider = RiderProfile(
191+
sdkVersion = "2023.2-EAP2-SNAPSHOT",
192+
plugins = commonPlugins223 + listOf(
193+
"rider-plugins-appender" // Workaround for https://youtrack.jetbrains.com/issue/IDEA-179607
194+
),
195+
netFrameworkTarget = "net472",
196+
rdGenVersion = "2023.2.1",
197+
nugetVersion = "2023.2.0-eap02"
198+
)
199+
),
155200

156201
).associateBy { it.name }
157202

‎gradle/libs.versions.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ commonmark = "0.17.1"
77
detekt = "1.23.0"
88
intellijGradle = "1.13.2"
99
intellijRemoteRobot = "0.11.18"
10-
jackson = "2.13.3"
10+
jackson = "2.15.1"
1111
jacoco = "0.8.8"
1212
jgit = "6.5.0.202303070854-r"
1313
junit4 = "4.13.2"

‎jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/DeleteResourceDialog.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class DeleteResourceDialog(
3030
panel {
3131
row {
3232
warningIcon(grow)
33-
right { label(message("delete_resource.message", resourceType, resourceName)) }
33+
label(message("delete_resource.message", resourceType, resourceName))
3434
}
3535
row {
3636
deleteResourceConfirmation(grow)

‎jetbrains-core/src/software/aws/toolkits/jetbrains/services/apprunner/ui/CreationPanel.kt‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import software.aws.toolkits.jetbrains.services.iam.IamResources
2323
import software.aws.toolkits.jetbrains.services.iam.IamRole
2424
import software.aws.toolkits.jetbrains.ui.KeyValueTextField
2525
import software.aws.toolkits.jetbrains.ui.ResourceSelector
26+
import software.aws.toolkits.jetbrains.ui.intTextField
2627
import software.aws.toolkits.jetbrains.utils.toHumanReadable
2728
import software.aws.toolkits.jetbrains.utils.ui.contextualHelp
2829
import software.aws.toolkits.jetbrains.utils.ui.installOnParent
@@ -252,11 +253,9 @@ class CreationPanel(private val project: Project, ecrUri: String? = null) {
252253
cell(isFullWidth = true) {
253254
// TODO HACK making this flow right means we don't have issues with weird spacing above or
254255
// to the left
255-
this@row.right {
256-
repoPanel(grow)
257-
.installOnParent { repo.isSelected }
258-
.visibleIf(repo.selected)
259-
}
256+
repoPanel(grow)
257+
.installOnParent { repo.isSelected }
258+
.visibleIf(repo.selected)
260259

261260
imagePanel(grow)
262261
.installOnParent { ecr.isSelected || ecrPublic.isSelected }

‎jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecs/exec/EnableDisableExecuteCommandWarning.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,10 @@ class EnableDisableExecuteCommandWarning(private val project: Project, private v
2424
panel {
2525
row {
2626
warningIcon(grow)
27-
right {
28-
label(message("ecs.execute_command_enable_warning")).constraints(grow).visible(enable)
29-
label(message("ecs.execute_command_disable_warning")).constraints(grow).visible(!enable)
30-
}
27+
label(message("ecs.execute_command_enable_warning")).constraints(grow).visible(enable)
28+
label(message("ecs.execute_command_disable_warning")).constraints(grow).visible(!enable)
3129
}
30+
3231
row {
3332
checkBox(
3433
message("ecs.execute_command.production_warning.checkbox_label", serviceName),
@@ -37,6 +36,7 @@ class EnableDisableExecuteCommandWarning(private val project: Project, private v
3736
).withErrorOnApplyIf(message("general.confirm_proceed")) { !it.isSelected }
3837
.constraints(grow)
3938
}
39+
4040
row {
4141
checkBox(message("general.notification.action.hide_forever"), { dontDisplayWarning }, { dontDisplayWarning = it })
4242
}

0 commit comments

Comments
 (0)