Skip to content

Commit 55eb536

Browse files
rlirli
authored
Bump to IJ EAP7 / Rider EAP5 (#4148)
1 parent e2c6e6c commit 55eb536

File tree

21 files changed

+150
-160
lines changed

21 files changed

+150
-160
lines changed

‎.run/Run AWS Toolkit - Core [2024.1].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 AWS Toolkit - Core [2024.1]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2024.1">
3+
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/jetbrains-core/build/idea-sandbox/system/log/idea.log" />
4+
<ExternalSystemSettings>
5+
<option name="executionName" />
6+
<option name="externalProjectPath" value="$PROJECT_DIR$/plugins/toolkit/jetbrains-core" />
7+
<option name="externalSystemIdString" value="GRADLE" />
8+
<option name="scriptParameters" value="-PideProfileName=2024.1" />
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 AWS Toolkit - Gateway [2024.1].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 AWS Toolkit - Gateway [2024.1]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2024.1">
3+
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/jetbrains-gateway/build/idea-sandbox/system/log/idea.log" />
4+
<ExternalSystemSettings>
5+
<option name="executionName" />
6+
<option name="externalProjectPath" value="$PROJECT_DIR$/plugins/toolkit/jetbrains-gateway" />
7+
<option name="externalSystemIdString" value="GRADLE" />
8+
<option name="scriptParameters" value="-PideProfileName=2024.1" />
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 AWS Toolkit - Rider [2024.1].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 AWS Toolkit - Rider [2024.1]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2024.1">
3+
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/jetbrains-rider/build/idea-sandbox/system/log/idea.log" />
4+
<ExternalSystemSettings>
5+
<option name="executionName" />
6+
<option name="externalProjectPath" value="$PROJECT_DIR$/plugins/toolkit/jetbrains-rider" />
7+
<option name="externalSystemIdString" value="GRADLE" />
8+
<option name="scriptParameters" value="-PideProfileName=2024.1" />
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 AWS Toolkit - Ultimate [2024.1].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 AWS Toolkit - Ultimate [2024.1]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2024.1">
3+
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/jetbrains-ultimate/build/idea-sandbox/system/log/idea.log" />
4+
<ExternalSystemSettings>
5+
<option name="executionName" />
6+
<option name="externalProjectPath" value="$PROJECT_DIR$/plugins/toolkit/jetbrains-ultimate" />
7+
<option name="externalSystemIdString" value="GRADLE" />
8+
<option name="scriptParameters" value="-PideProfileName=2024.1" />
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/intellij/IdeVersions.kt‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -147,23 +147,25 @@ object IdeVersions {
147147
name = "2024.1",
148148
gateway = ProductProfile(
149149
sdkFlavor = IdeFlavor.GW,
150-
sdkVersion = "241.9959-EAP-CANDIDATE-SNAPSHOT",
150+
sdkVersion = "241.14024-EAP-CANDIDATE-SNAPSHOT",
151151
plugins = arrayOf("org.jetbrains.plugins.terminal")
152152
),
153153
community = ProductProfile(
154154
sdkFlavor = IdeFlavor.IC,
155-
sdkVersion = "241.9959-EAP-CANDIDATE-SNAPSHOT",
155+
sdkVersion = "241.14024-EAP-CANDIDATE-SNAPSHOT",
156156
plugins = commonPlugins + listOf(
157157
"java",
158158
"com.intellij.gradle",
159159
"org.jetbrains.idea.maven",
160-
"PythonCore:241.9959.31",
161-
"Docker:241.9959.32"
160+
// transitive for python
161+
"org.toml.lang:241.14024.10",
162+
"PythonCore:241.14024.14",
163+
"Docker:241.14024.28"
162164
)
163165
),
164166
ultimate = ProductProfile(
165167
sdkFlavor = IdeFlavor.IU,
166-
sdkVersion = "241.9959-EAP-CANDIDATE-SNAPSHOT",
168+
sdkVersion = "241.14024-EAP-CANDIDATE-SNAPSHOT",
167169
plugins = commonPlugins + listOf(
168170
"JavaScript",
169171
// Transitive dependency needed for javascript
@@ -172,20 +174,22 @@ object IdeVersions {
172174
"JavaScriptDebugger",
173175
"com.intellij.database",
174176
"com.jetbrains.codeWithMe",
175-
"Pythonid:241.9959.31",
176-
"org.jetbrains.plugins.go:241.9959.31",
177+
// transitive for python
178+
"org.toml.lang:241.14024.10",
179+
"Pythonid:241.14024.14",
180+
"org.jetbrains.plugins.go:241.14024.14",
177181
// https://github.com/JetBrains/gradle-intellij-plugin/issues/1056
178182
"org.intellij.intelliLang"
179183
)
180184
),
181185
rider = RiderProfile(
182-
sdkVersion = "2024.1-EAP2-SNAPSHOT",
186+
sdkVersion = "2024.1-EAP5-SNAPSHOT",
183187
plugins = commonPlugins + listOf(
184188
"rider-plugins-appender" // Workaround for https://youtrack.jetbrains.com/issue/IDEA-179607
185189
),
186190
netFrameworkTarget = "net472",
187-
rdGenVersion = "2024.1.0-pre1",
188-
nugetVersion = "2024.1.0-eap02"
191+
rdGenVersion = "2024.1.1",
192+
nugetVersion = "2024.1.0-eap05"
189193
)
190194
),
191195

‎gradle/libs.versions.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ assertJ = "3.20.2" # Upgrading leads to SAM errors: https://youtrack.jetbrains.c
55
awsSdk = "2.20.111"
66
commonmark = "0.17.1"
77
detekt = "1.23.5"
8-
intellijGradle = "1.17.0"
8+
intellijGradle = "1.17.2"
99
intellijRemoteRobot = "0.11.21"
1010
jackson = "2.15.1"
1111
jacoco = "0.8.11"

‎plugins/toolkit/jetbrains-core/tst-231-232/software/aws/toolkits/jetbrains/utils/Compat.kt‎ renamed to ‎plugins/toolkit/jetbrains-core/tst-231-233/software/aws/toolkits/jetbrains/utils/Compat.kt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@ import org.jetbrains.idea.maven.model.MavenExplicitProfiles
99
import org.jetbrains.idea.maven.project.MavenProjectsManager
1010

1111
@Suppress("UNUSED_PARAMETER", "RedundantSuspendModifier")
12-
suspend fun MavenProjectsManager.addManagedFilesWithProfilesAndUpdate(
12+
suspend fun MavenProjectsManager.addManagedFilesWithProfiles(
1313
poms: List<VirtualFile>,
1414
profiles: MavenExplicitProfiles,
1515
nothing: Nothing?,
16-
nothing1: Nothing?
16+
nothing1: Nothing?,
17+
nothing3: Boolean
1718
) {
1819
resetManagedFilesAndProfilesInTests(poms, profiles)
1920
runInEdtAndWait {

‎plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/utils/JavaTestUtils.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ internal suspend fun HeavyJavaCodeInsightTestFixtureRule.setUpMavenProject(): Ps
259259
projectsManager.initForTests()
260260

261261
val poms = listOf(pomFile)
262-
projectsManager.addManagedFilesWithProfilesAndUpdate(poms, MavenExplicitProfiles.NONE, null, null)
262+
projectsManager.addManagedFilesWithProfiles(poms, MavenExplicitProfiles.NONE, null, null, true)
263263

264264
runInEdtAndWait {
265265
project.getServiceIfCreated(MavenProgressTracker::class.java)?.waitForProgressCompletion()

‎plugins/toolkit/jetbrains-gateway/it/software/aws/toolkits/jetbrains/gateway/DevEnvConnectTest.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ import kotlin.time.ExperimentalTime
6969
@ExtendWith(ApplicationExtension::class)
7070
@SsoLogin("codecatalyst-test-account")
7171
@DisabledIfEnvironmentVariable(named = "IS_PROD", matches = "false")
72-
@DisabledIfSystemProperty(named = "org.gradle.project.ideProfileName", matches = "2023.3", disabledReason = "Flakes on 233")
72+
@DisabledIfSystemProperty(named = "org.gradle.project.ideProfileName", matches = "202*.*", disabledReason = "Flakes on 233+")
7373
class DevEnvConnectTest : AfterAllCallback {
7474
companion object {
7575
@JvmField

‎plugins/toolkit/jetbrains-rider/bin/2024.1.0-pre1/rd-core-2024.1.0-pre1-sources.jar‎

-64.7 KB
Binary file not shown.

0 commit comments

Comments
 (0)