build: include 2025.1 in prerelease automation (#5330)

rli · samgst-amazon · commit e48aa0a5f8a9 · 2025-02-12T09:41:50.000-08:00
diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
@@ -17,7 +17,7 @@ jobs:
   generate_artifact_toolkit_standalone:
     strategy:
       matrix:
-        supported_versions: [ '2024.1', '2024.2', '2024.3' ]
+        supported_versions: [ '2024.1', '2024.2', '2024.3', '2025.1' ]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
diff --git a/plugins/amazonq/codewhisperer/jetbrains-ultimate/src-241-243/compat/com/intellij/lang/javascript/JavascriptLanguage.kt b/plugins/amazonq/codewhisperer/jetbrains-ultimate/src-241-243/compat/com/intellij/lang/javascript/JavascriptLanguage.kt
diff --git a/plugins/core/jetbrains-ultimate/src-241-243/compat/com/intellij/lang/javascript/JavascriptLanguage.kt b/plugins/core/jetbrains-ultimate/src-241-243/compat/com/intellij/lang/javascript/JavascriptLanguage.kt
@@ -0,0 +1,8 @@
+// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package compat.com.intellij.lang.javascript
+
+// probably not necessary, but inline to avoid loading this through core classpath
+inline val JavascriptLanguage
+    get() = com.intellij.lang.javascript.JavascriptLanguage.INSTANCE
diff --git a/plugins/core/jetbrains-ultimate/src-251+/compat/com/intellij/lang/javascript/JavascriptLanguage.kt b/plugins/core/jetbrains-ultimate/src-251+/compat/com/intellij/lang/javascript/JavascriptLanguage.kt
diff --git a/plugins/toolkit/jetbrains-core/detekt-baseline-main.xml b/plugins/toolkit/jetbrains-core/detekt-baseline-main.xml
@@ -2,7 +2,6 @@
 <SmellBaseline>
   <ManuallySuppressedIssues/>
   <CurrentIssues>
-    <ID>BannedImports:UploadFunctionContinueDialog.kt$import com.intellij.ui.layout.panel</ID>
     <ID>CommentWrapping:Attributes.kt$NullAttribute$/*Dynamo always expects the NUL field to contain true */</ID>
     <ID>CommentWrapping:ConfigureMaxResultsAction.kt$ConfigureMaxResultsAction$/* popup */</ID>
     <ID>CommentWrapping:ProjectFileBrowseListener.kt$/* infer disposable from UI context */</ID>
diff --git a/plugins/toolkit/jetbrains-core/detekt-baseline.xml b/plugins/toolkit/jetbrains-core/detekt-baseline.xml
@@ -2,7 +2,6 @@
 <SmellBaseline>
   <ManuallySuppressedIssues/>
   <CurrentIssues>
-    <ID>BannedImports:UploadFunctionContinueDialog.kt$import com.intellij.ui.layout.panel</ID>
     <ID>CommentWrapping:Attributes.kt$NullAttribute$/*Dynamo always expects the NUL field to contain true */</ID>
     <ID>CommentWrapping:ConfigureMaxResultsAction.kt$ConfigureMaxResultsAction$/* popup */</ID>
     <ID>CommentWrapping:ProjectFileBrowseListener.kt$/* infer disposable from UI context */</ID>
diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/execution/AwsConnectionExtension.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/execution/AwsConnectionExtension.kt
@@ -24,8 +24,7 @@ import software.aws.toolkits.jetbrains.core.execution.AwsCredentialInjectionOpti
 import software.aws.toolkits.jetbrains.core.region.AwsRegionProvider
 import software.aws.toolkits.resources.message
 import software.aws.toolkits.telemetry.AwsTelemetry
-import software.aws.toolkits.telemetry.Result.Failed
-import software.aws.toolkits.telemetry.Result.Succeeded
+import software.aws.toolkits.telemetry.MetricResult
 
 class AwsConnectionRunConfigurationExtension<T : RunConfigurationBase<*>> {
     fun addToTargetEnvironment(configuration: T, environment: MutableMap<String, TargetEnvironmentFunction<String>>, runtimeString: () -> String? = { null }) {
@@ -60,9 +59,9 @@ class AwsConnectionRunConfigurationExtension<T : RunConfigurationBase<*>> {
 
             val connection = getConnection(configuration, credentialConfiguration)
             environmentMutator(connection)
-            AwsTelemetry.injectCredentials(configuration.project, result = Succeeded, runtimeString = tryOrNull { runtimeString() })
+            AwsTelemetry.injectCredentials(configuration.project, result = MetricResult.Succeeded, runtimeString = tryOrNull { runtimeString() })
         } catch (e: Exception) {
-            AwsTelemetry.injectCredentials(configuration.project, result = Failed, runtimeString = tryOrNull { runtimeString() })
+            AwsTelemetry.injectCredentials(configuration.project, result = MetricResult.Failed, runtimeString = tryOrNull { runtimeString() })
             LOG.error(e) { message("run_configuration_extension.inject_aws_connection_exception") }
         }
     }
diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/sam/sync/SyncServerlessApplicationDialog.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/sam/sync/SyncServerlessApplicationDialog.kt
@@ -13,13 +13,13 @@ import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.ui.MutableCollectionComboBoxModel
 import com.intellij.ui.SimpleListCellRenderer
 import com.intellij.ui.components.JBTextField
+import com.intellij.ui.dsl.builder.AlignX
 import com.intellij.ui.dsl.builder.actionListener
 import com.intellij.ui.dsl.builder.bind
 import com.intellij.ui.dsl.builder.bindSelected
 import com.intellij.ui.dsl.builder.bindText
 import com.intellij.ui.dsl.builder.panel
 import com.intellij.ui.dsl.builder.toMutableProperty
-import com.intellij.ui.dsl.gridLayout.HorizontalAlign
 import com.intellij.ui.layout.selected
 import com.intellij.util.text.nullize
 import org.jetbrains.annotations.TestOnly
@@ -182,7 +182,7 @@ class SyncServerlessApplicationDialog(
                             }
                         }
                     cell(stackNameField)
-                        .horizontalAlign(HorizontalAlign.FILL)
+                        .align(AlignX.FILL)
                         .enabledIf(createStackButton.component.selected)
                         .bindText(::newStackName)
                         .validationOnApply { field ->
@@ -215,7 +215,7 @@ class SyncServerlessApplicationDialog(
                     }
                     stackSelector.reload(forceFetch = true)
                     cell(stackSelector)
-                        .horizontalAlign(HorizontalAlign.FILL)
+                        .align(AlignX.FILL)
                         .enabledIf(updateStackButton.component.selected)
                         .errorOnApply(message("serverless.application.sync.validation.stack.missing")) {
                             it.isEnabled && (it.isLoading || it.selected() == null)
@@ -228,19 +228,19 @@ class SyncServerlessApplicationDialog(
                     .withBinding(::templateParameters.toMutableProperty())
                     .validationOnApply {
                         validateParameters(it, templateFileParameters)
-                    }.horizontalAlign(HorizontalAlign.FILL)
+                    }.align(AlignX.FILL)
                     .component.toolTipText = message("serverless.application.sync.tooltip.template.parameters")
             }
             val tagsString = message("tags.title")
             row(tagsString) {
                 cell(tagsField)
-                    .horizontalAlign(HorizontalAlign.FILL)
+                    .align(AlignX.FILL)
                     .withBinding(::tags.toMutableProperty())
             }
 
             row(message("serverless.application.sync.label.bucket")) {
                 cell(s3BucketSelector)
-                    .horizontalAlign(HorizontalAlign.FILL)
+                    .align(AlignX.FILL)
                     .errorOnApply(message("serverless.application.sync.validation.s3.bucket.empty")) { it.isLoading || it.selected() == null }
                     .component.toolTipText = message("serverless.application.sync.tooltip.s3Bucket")
 
@@ -262,7 +262,7 @@ class SyncServerlessApplicationDialog(
 
             row(message("serverless.application.sync.label.repo")) {
                 cell(ecrRepoSelector)
-                    .horizontalAlign(HorizontalAlign.FILL)
+                    .align(AlignX.FILL)
                     .errorOnApply(message("serverless.application.sync.validation.ecr.repo.empty")) {
                         it.isVisible && (it.isLoading || it.selected() == null)
                     }.component.toolTipText = message("serverless.application.sync.tooltip.ecrRepo")
diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/upload/UploadFunctionContinueDialog.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/upload/UploadFunctionContinueDialog.kt
diff --git a/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/CawsConnectionProvider.kt b/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/CawsConnectionProvider.kt
@@ -24,9 +24,9 @@ import com.intellij.openapi.util.Disposer
 import com.intellij.remoteDev.downloader.CodeWithMeClientDownloader
 import com.intellij.ui.components.JBTabbedPane
 import com.intellij.ui.dsl.builder.Align
+import com.intellij.ui.dsl.builder.AlignX
+import com.intellij.ui.dsl.builder.AlignY
 import com.intellij.ui.dsl.builder.panel
-import com.intellij.ui.dsl.gridLayout.HorizontalAlign
-import com.intellij.ui.dsl.gridLayout.VerticalAlign
 import com.intellij.util.ui.JBFont
 import com.jetbrains.gateway.api.ConnectionRequestor
 import com.jetbrains.gateway.api.GatewayConnectionHandle
@@ -325,7 +325,7 @@ class CawsConnectionProvider : GatewayConnectionProvider {
                                         setCenterPanel(
                                             panel {
                                                 row {
-                                                    icon(AllIcons.General.ErrorDialog).verticalAlign(VerticalAlign.TOP)
+                                                    icon(AllIcons.General.ErrorDialog).align(AlignY.TOP)
 
                                                     panel {
                                                         row {
@@ -344,7 +344,7 @@ class CawsConnectionProvider : GatewayConnectionProvider {
                                                     collapsibleGroup(message("general.logs"), false) {
                                                         row {
                                                             cell(view)
-                                                                .horizontalAlign(HorizontalAlign.FILL)
+                                                                .align(AlignX.FILL)
                                                         }
                                                     }.expanded = false
                                                     // TODO: can't seem to reliably force a terminal redraw on initial expand
diff --git a/plugins/toolkit/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/services/lambda/nodejs/NodeJsDebugSupport.kt b/plugins/toolkit/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/services/lambda/nodejs/NodeJsDebugSupport.kt
@@ -10,14 +10,14 @@ import com.intellij.execution.process.ProcessEvent
 import com.intellij.execution.runners.ExecutionEnvironment
 import com.intellij.javascript.debugger.LocalFileSystemFileFinder
 import com.intellij.javascript.debugger.RemoteDebuggingFileFinder
-import com.intellij.lang.javascript.JavascriptLanguage
 import com.intellij.openapi.util.io.FileUtil
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.xdebugger.XDebugProcess
 import com.intellij.xdebugger.XDebugProcessStarter
 import com.intellij.xdebugger.XDebugSession
 import com.jetbrains.debugger.wip.WipLocalVmConnection
 import com.jetbrains.nodeJs.NodeChromeDebugProcess
+import compat.com.intellij.lang.javascript.JavascriptLanguage
 import org.jetbrains.io.LocalFileFinder
 import software.aws.toolkits.core.lambda.LambdaRuntime
 import software.aws.toolkits.jetbrains.services.PathMapping
@@ -39,7 +39,7 @@ class NodeJsRuntimeDebugSupport : RuntimeDebugSupport {
 
 abstract class NodeJsImageDebugSupport : ImageDebugSupport {
     override fun supportsPathMappings(): Boolean = true
-    override val languageId = JavascriptLanguage.INSTANCE.id
+    override val languageId = JavascriptLanguage.id
     override suspend fun createDebugProcess(
         context: Context,
         environment: ExecutionEnvironment,
diff --git a/plugins/toolkit/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/services/lambda/nodejs/NodeJsRuntimeGroup.kt b/plugins/toolkit/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/services/lambda/nodejs/NodeJsRuntimeGroup.kt
@@ -5,20 +5,20 @@ package software.aws.toolkits.jetbrains.services.lambda.nodejs
 
 import com.intellij.javascript.nodejs.interpreter.NodeJsInterpreterManager
 import com.intellij.lang.javascript.JavaScriptSupportLoader
-import com.intellij.lang.javascript.JavascriptLanguage
 import com.intellij.openapi.module.Module
 import com.intellij.openapi.module.ModuleType
 import com.intellij.openapi.module.WebModuleTypeBase
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.projectRoots.Sdk
+import compat.com.intellij.lang.javascript.JavascriptLanguage
 import software.aws.toolkits.core.lambda.LambdaRuntime
 import software.aws.toolkits.jetbrains.services.lambda.BuiltInRuntimeGroups
 import software.aws.toolkits.jetbrains.services.lambda.SdkBasedRuntimeGroup
 
 class NodeJsRuntimeGroup : SdkBasedRuntimeGroup() {
     override val id: String = BuiltInRuntimeGroups.NodeJs
     override val languageIds: Set<String> = setOf(
-        JavascriptLanguage.INSTANCE.id,
+        JavascriptLanguage.id,
         JavaScriptSupportLoader.ECMA_SCRIPT_6.id
     )
     override val supportsPathMappings: Boolean = true
diff --git a/ui-tests-starter/build.gradle.kts b/ui-tests-starter/build.gradle.kts
@@ -27,14 +27,24 @@ intellijPlatform {
     instrumentCode = false
 }
 
+tasks.initializeIntellijPlatformPlugin {
+    enabled = false
+}
+
+tasks.verifyPluginProjectConfiguration {
+    runtimeDirectory.set(null as File?)
+    enabled = false
+}
+
 val testPlugins by configurations.registering
 
 dependencies {
     // should really be set by the BOM, but too much work to figure out right now
     testImplementation("org.kodein.di:kodein-di-jvm:7.20.2")
     intellijPlatform {
         // shouldn't be needed? but IsolationException
-        intellijIdeaCommunity(ideProfile.community.sdkVersion)
+        val version = ideProfile.community.sdkVersion
+        intellijIdeaCommunity(version, !version.contains("SNAPSHOT"))
         testFramework(TestFrameworkType.Starter)
     }
 
