Skip to content

build: add 2026.1 build target #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aseemxs wants to merge 5 commits into
base: main
Choose a base branch
from
+149 −8
Open

build: add 2026.1 build target #33

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f47d584
build(261): add 2026.1 build target
aseemxs Mar 10, 2026
c91136b
ci: add version matrix to unit test workflow
aseemxs Mar 11, 2026
2c86ab3
Potential fix for code scanning alert no. 1100: Workflow does not con…
aseemxs Mar 11, 2026
180129f
build: suppress RedundantSuspendModifier for cross-version compat
aseemxs Mar 12, 2026
d766bfc
build: suppress additional RedundantSuspendModifier in CodeWhispererC…
aseemxs Mar 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions .github/workflows/mac.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,22 @@

jobs:
build:
name: Mac
name: Mac (${{ matrix.version }})

runs-on: macos-latest

strategy:
fail-fast: false
matrix:
version: [ '2025.3', '2026.1' ]

steps:
- uses: actions/checkout@v2
- name: Set up JDK 21
uses: actions/setup-java@v1
with:
java-version: 21
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
run: ./gradlew check coverageReport --info --full-stacktrace --console plain
run: ./gradlew check coverageReport --info --full-stacktrace --console plain -PideProfileName=${{ matrix.version }}
2 changes: 1 addition & 1 deletion .github/workflows/prerelease.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
strategy:
matrix:
build_target: [ ':plugin-amazonq:buildPlugin' ]
version: [ '2025.1', '2025.2', '2025.3' ]
version: [ '2025.1', '2025.2', '2025.3', '2026.1' ]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand Down
25 changes: 25 additions & 0 deletions .run/Run Amazon Q - Community [2026.1].run.xml
View file
Open in desktop
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 [2026.1]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2026.1">
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/amazonq/build/idea-sandbox/IC-2026.1/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=2026.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 [2026.1].run.xml
View file
Open in desktop
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 [2026.1]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2026.1">
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/amazonq/build/idea-sandbox/RD-2026.1/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=2026.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 - Ultimate [2026.1].run.xml
View file
Open in desktop
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 [2026.1]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2026.1">
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/amazonq/build/idea-sandbox/IU-2026.1/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=2026.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
Open in desktop
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 = ["2025.1", "2025.2", "2025.3"]
mvs = ["2025.1", "2025.2", "2025.3", "2026.1"]
ides = [
IdeVariant("Community", "IC"),
IdeVariant("Rider", "RD"),
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/software/aws/toolkits/gradle/BuildScriptUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ fun Project.jvmTarget(): Provider<JavaVersion> = withCurrentProfileName {
// https://plugins.jetbrains.com/docs/intellij/using-kotlin.html#stdlib-miscellaneous
fun Project.kotlinTarget(): Provider<String> = withCurrentProfileName {
when (it) {
"2025.1", "2025.2", "2025.3" -> KotlinVersionEnum.KOTLIN_2_1
"2025.1", "2025.2", "2025.3", "2026.1" -> KotlinVersionEnum.KOTLIN_2_1
else -> error("not set")
}.version
}
Expand Down
42 changes: 42 additions & 0 deletions buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,48 @@ object IdeVersions {
rdGenVersion = "2025.3.1",
nugetVersion = "2025.3.0"
)
),
Profile(
name = "2026.1",
gateway = ProductProfile(
sdkVersion = "261.22158-EAP-CANDIDATE-SNAPSHOT",
bundledPlugins = listOf("org.jetbrains.plugins.terminal")
),
community = ProductProfile(
sdkVersion = "261.22158-EAP-CANDIDATE-SNAPSHOT",
bundledPlugins = commonPlugins + listOf(
"com.intellij.java",
"com.intellij.gradle",
"org.jetbrains.idea.maven",
"com.intellij.properties"
),
marketplacePlugins = listOf(
"org.toml.lang:261.22158.36",
"PythonCore:261.22158.46",
"Docker:261.22158.45",
"com.intellij.modules.json:261.22158.46"
)
),
ultimate = ProductProfile(
sdkVersion = "261.22158-EAP-CANDIDATE-SNAPSHOT",
bundledPlugins = commonPlugins + listOf(
"JavaScript",
"JavaScriptDebugger",
"com.intellij.database"
),
marketplacePlugins = listOf(
"Pythonid:261.22158.46",
"org.jetbrains.plugins.go:261.22158.46",
"com.intellij.modules.json:261.22158.46"
)
),
rider = RiderProfile(
sdkVersion = "2026.1-SNAPSHOT",
bundledPlugins = commonPlugins,
netFrameworkTarget = "net472",
rdGenVersion = "2026.1.3",
nugetVersion = "2026.1.0"
)
)
).associateBy { it.name }

Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/toolkit-intellij-subplugin.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ dependencies {

// OAuth modules split in 2025.3 (253) - must be explicitly bundled
val versionStr = version.get()
if (versionStr.contains("253")) {
if (versionStr.contains("253") || versionStr.contains("261")) {
bundledModule("intellij.platform.collaborationTools")
bundledModule("intellij.platform.collaborationTools.auth.base")
bundledModule("intellij.platform.collaborationTools.auth")
Expand Down
2 changes: 1 addition & 1 deletion kotlinResolution.settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencyResolutionManagement {
"1.8.0-intellij-11"
}

"2025.2", "2025.3" -> {
"2025.2", "2025.3", "2026.1" -> {
"1.10.1-intellij-5"
}

Expand Down
2 changes: 1 addition & 1 deletion plugins/amazonq/shared/jetbrains-ultimate/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ dependencies {
intellijPlatform {
// RD platform is only available in 2025.3 and later
when (providers.gradleProperty("ideProfileName").get()) {
"2025.2", "2025.3" -> {
"2025.2", "2025.3", "2026.1" -> {
bundledModule("intellij.rd.platform")
}
}
Expand Down
0 ...lkits/jetbrains/CwmProblemsViewMutator.kt → ...lkits/jetbrains/CwmProblemsViewMutator.kt
View file
Open in desktop
File renamed without changes.
13 changes: 13 additions & 0 deletions ...red/jetbrains-ultimate/src-261+/software/aws/toolkits/jetbrains/CwmProblemsViewMutator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0

package software.aws.toolkits.jetbrains

import com.intellij.openapi.project.Project
import com.intellij.openapi.wm.ToolWindow

// BackendToolWindowHost was removed in 2026.1 (261) — no-op until replacement API is identified
class CwmProblemsViewMutator : ProblemsViewMutator {
override fun mutateProblemsView(project: Project, runnable: (ToolWindow) -> Unit) {
}
}
Loading