Skip to content

Commit

Permalink
Add 251 EAP 1 profile (#5284)
Browse files Browse the repository at this point in the history
  • Loading branch information
@rli
rli authored Feb 4, 2025
1 parent 6d4e34f commit 8318155
Show file tree
Hide file tree
Showing 22 changed files with 321 additions and 20 deletions.
25 changes: 25 additions & 0 deletions .run/Run AWS Toolkit - Community [2025.1].run.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Run AWS Toolkit - Community [2025.1]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2025.1">
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij-standalone/build/idea-sandbox/system/log/idea.log" />
<ExternalSystemSettings>
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" value="-PrunIdeVariant=IC -PideProfileName=2025.1" />
<option name="taskDescriptions">
<list />
</option>
<option name="taskNames">
<list>
<option value=":plugin-toolkit:intellij-standalone:runIde" />
</list>
</option>
<option name="vmOptions" />
</ExternalSystemSettings>
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<RunAsTest>false</RunAsTest>
<method v="2" />
</configuration>
</component>
25 changes: 25 additions & 0 deletions .run/Run AWS Toolkit - Gateway [2025.1].run.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Run AWS Toolkit - Gateway [2025.1]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2025.1">
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/jetbrains-gateway/build/idea-sandbox/system/log/idea.log" />
<ExternalSystemSettings>
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" value=" -PideProfileName=2025.1" />
<option name="taskDescriptions">
<list />
</option>
<option name="taskNames">
<list>
<option value=":plugin-toolkit:jetbrains-gateway:runIde" />
</list>
</option>
<option name="vmOptions" />
</ExternalSystemSettings>
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<RunAsTest>false</RunAsTest>
<method v="2" />
</configuration>
</component>
25 changes: 25 additions & 0 deletions .run/Run AWS Toolkit - Rider [2025.1].run.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Run AWS Toolkit - Rider [2025.1]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2025.1">
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij-standalone/build/idea-sandbox/system/log/idea.log" />
<ExternalSystemSettings>
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" value="-PrunIdeVariant=RD -PideProfileName=2025.1" />
<option name="taskDescriptions">
<list />
</option>
<option name="taskNames">
<list>
<option value=":plugin-toolkit:intellij-standalone:runIde" />
</list>
</option>
<option name="vmOptions" />
</ExternalSystemSettings>
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<RunAsTest>false</RunAsTest>
<method v="2" />
</configuration>
</component>
25 changes: 25 additions & 0 deletions .run/Run AWS Toolkit - Ultimate [2025.1].run.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Run AWS Toolkit - Ultimate [2025.1]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2025.1">
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij-standalone/build/idea-sandbox/system/log/idea.log" />
<ExternalSystemSettings>
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" value="-PrunIdeVariant=IU -PideProfileName=2025.1" />
<option name="taskDescriptions">
<list />
</option>
<option name="taskNames">
<list>
<option value=":plugin-toolkit:intellij-standalone:runIde" />
</list>
</option>
<option name="vmOptions" />
</ExternalSystemSettings>
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<RunAsTest>false</RunAsTest>
<method v="2" />
</configuration>
</component>
25 changes: 25 additions & 0 deletions .run/Run All - Community [2025.1].run.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Run All - Community [2025.1]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2025.1">
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/sandbox-all/build/idea-sandbox/system/log/idea.log" />
<ExternalSystemSettings>
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" value="-PrunIdeVariant=IC -PideProfileName=2025.1" />
<option name="taskDescriptions">
<list />
</option>
<option name="taskNames">
<list>
<option value=":sandbox-all:runIde" />
</list>
</option>
<option name="vmOptions" />
</ExternalSystemSettings>
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<RunAsTest>false</RunAsTest>
<method v="2" />
</configuration>
</component>
25 changes: 25 additions & 0 deletions .run/Run All - Rider [2025.1].run.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Run All - Rider [2025.1]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2025.1">
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/sandbox-all/build/idea-sandbox/system/log/idea.log" />
<ExternalSystemSettings>
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" value="-PrunIdeVariant=RD -PideProfileName=2025.1" />
<option name="taskDescriptions">
<list />
</option>
<option name="taskNames">
<list>
<option value=":sandbox-all:runIde" />
</list>
</option>
<option name="vmOptions" />
</ExternalSystemSettings>
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<RunAsTest>false</RunAsTest>
<method v="2" />
</configuration>
</component>
25 changes: 25 additions & 0 deletions .run/Run All - Ultimate [2025.1].run.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Run All - Ultimate [2025.1]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2025.1">
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/sandbox-all/build/idea-sandbox/system/log/idea.log" />
<ExternalSystemSettings>
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" value="-PrunIdeVariant=IU -PideProfileName=2025.1" />
<option name="taskDescriptions">
<list />
</option>
<option name="taskNames">
<list>
<option value=":sandbox-all:runIde" />
</list>
</option>
<option name="vmOptions" />
</ExternalSystemSettings>
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<RunAsTest>false</RunAsTest>
<method v="2" />
</configuration>
</component>
25 changes: 25 additions & 0 deletions .run/Run Amazon Q - Community [2025.1].run.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Run Amazon Q - Community [2025.1]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2025.1">
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/amazonq/build/idea-sandbox/system/log/idea.log" />
<ExternalSystemSettings>
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" value="-PrunIdeVariant=IC -PideProfileName=2025.1" />
<option name="taskDescriptions">
<list />
</option>
<option name="taskNames">
<list>
<option value=":plugin-amazonq:runIde" />
</list>
</option>
<option name="vmOptions" />
</ExternalSystemSettings>
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<RunAsTest>false</RunAsTest>
<method v="2" />
</configuration>
</component>
25 changes: 25 additions & 0 deletions .run/Run Amazon Q - Rider [2025.1].run.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Run Amazon Q - Rider [2025.1]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2025.1">
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/amazonq/build/idea-sandbox/system/log/idea.log" />
<ExternalSystemSettings>
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" value="-PrunIdeVariant=RD -PideProfileName=2025.1" />
<option name="taskDescriptions">
<list />
</option>
<option name="taskNames">
<list>
<option value=":plugin-amazonq:runIde" />
</list>
</option>
<option name="vmOptions" />
</ExternalSystemSettings>
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<RunAsTest>false</RunAsTest>
<method v="2" />
</configuration>
</component>
2 changes: 1 addition & 1 deletion .run/Run Amazon Q - Ultimate [2024.1].run.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@
<RunAsTest>false</RunAsTest>
<method v="2" />
</configuration>
</component>
</component>
25 changes: 25 additions & 0 deletions .run/Run Amazon Q - Ultimate [2025.1].run.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Run Amazon Q - Ultimate [2025.1]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2025.1">
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/amazonq/build/idea-sandbox/system/log/idea.log" />
<ExternalSystemSettings>
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" value="-PrunIdeVariant=IU -PideProfileName=2025.1" />
<option name="taskDescriptions">
<list />
</option>
<option name="taskNames">
<list>
<option value=":plugin-amazonq:runIde" />
</list>
</option>
<option name="vmOptions" />
</ExternalSystemSettings>
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<RunAsTest>false</RunAsTest>
<method v="2" />
</configuration>
</component>
2 changes: 1 addition & 1 deletion .run/generateConfigs.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def write_config(mv: str, ide: IdeVariant, plugin: PluginVariant):
f.write(TEMPLATE.format(plugin = plugin, variant = ide, major_version = mv))

if __name__ == '__main__':
mvs = ["2024.1", "2024.2", "2024.3"]
mvs = ["2024.1", "2024.2", "2024.3", "2025.1"]
ides = [
IdeVariant("Community", "IC"),
IdeVariant("Rider", "RD"),
Expand Down
1 change: 1 addition & 0 deletions buildSrc/src/main/kotlin/software/aws/toolkits/gradle/BuildScriptUtils.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ fun Project.kotlinTarget(): Provider<String> = withCurrentProfileName {
when (it) {
"2023.3", "2024.1", "2024.2" -> KotlinVersionEnum.KOTLIN_1_9
"2024.3" -> KotlinVersionEnum.KOTLIN_2_0
"2025.1" -> KotlinVersionEnum.KOTLIN_2_1
else -> error("not set")
}.version
}
Expand Down
42 changes: 41 additions & 1 deletion buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,47 @@ object IdeVersions {
nugetVersion = " 2024.3.0"
)
),

Profile(
name = "2025.1",
gateway = ProductProfile(
sdkVersion = "251.14649-EAP-CANDIDATE-SNAPSHOT",
bundledPlugins = listOf("org.jetbrains.plugins.terminal")
),
community = ProductProfile(
sdkVersion = "251.14649-EAP-CANDIDATE-SNAPSHOT",
bundledPlugins = commonPlugins + listOf(
"com.intellij.java",
"com.intellij.gradle",
"org.jetbrains.idea.maven",
),
marketplacePlugins = listOf(
"org.toml.lang:251.14649.45",
"PythonCore:251.14649.49",
"Docker:251.14649.49"
)
),
ultimate = ProductProfile(
sdkVersion = "251.14649-EAP-CANDIDATE-SNAPSHOT",
bundledPlugins = commonPlugins + listOf(
"JavaScript",
"JavaScriptDebugger",
"com.intellij.database",
"com.jetbrains.codeWithMe",
),
marketplacePlugins = listOf(
"org.toml.lang:251.14649.45",
"Pythonid:251.14649.49",
"org.jetbrains.plugins.go:251.14649.49",
)
),
rider = RiderProfile(
sdkVersion = "2025.1-EAP1-SNAPSHOT",
bundledPlugins = commonPlugins,
netFrameworkTarget = "net472",
rdGenVersion = "2024.3.1",
nugetVersion = " 2025.1.0-eap01"
)
),
).associateBy { it.name }

fun ideProfile(project: Project): Profile = ideProfile(project.providers).get()
Expand Down
2 changes: 1 addition & 1 deletion kotlinResolution.settings.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ dependencyResolutionManagement {
"1.8.0-intellij-9"
}

"2024.3" -> {
"2024.3", "2025.1" -> {
"1.8.0-intellij-11"
}

Expand Down
6 changes: 2 additions & 4 deletions ...c/software/aws/toolkits/jetbrains/services/amazonq/gettingstarted/QGettingStartedPanel.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,8 @@ import com.intellij.openapi.project.Project
import com.intellij.openapi.util.Disposer
import com.intellij.ui.components.JBTextArea
import com.intellij.ui.components.panels.Wrapper
import com.intellij.ui.dsl.builder.Align
import com.intellij.ui.dsl.builder.panel
import com.intellij.ui.dsl.gridLayout.HorizontalAlign
import com.intellij.ui.dsl.gridLayout.VerticalAlign
import software.aws.toolkits.jetbrains.utils.isQWebviewsAvailable

class QGettingStartedPanel(
Expand All @@ -23,8 +22,7 @@ class QGettingStartedPanel(
val component = panel {
row {
cell(webviewContainer)
.horizontalAlign(HorizontalAlign.FILL)
.verticalAlign(VerticalAlign.FILL)
.align(Align.FILL)
}.resizableRow()
}

Expand Down
Loading

0 comments on commit 8318155

Please sign in to comment.