diff --git a/.changes/next-release/removal-5979b9e4-898d-405a-9fc4-5919bb972a0e.json b/.changes/next-release/removal-5979b9e4-898d-405a-9fc4-5919bb972a0e.json new file mode 100644 index 00000000000..0a712912815 --- /dev/null +++ b/.changes/next-release/removal-5979b9e4-898d-405a-9fc4-5919bb972a0e.json @@ -0,0 +1,4 @@ +{ + "type" : "removal", + "description" : "Removed support for 2024.1.x IDEs" +} \ No newline at end of file diff --git a/.changes/next-release/removal-6b54ddb0-1385-4788-a225-ddae6ac958d2.json b/.changes/next-release/removal-6b54ddb0-1385-4788-a225-ddae6ac958d2.json new file mode 100644 index 00000000000..a9c2061c505 --- /dev/null +++ b/.changes/next-release/removal-6b54ddb0-1385-4788-a225-ddae6ac958d2.json @@ -0,0 +1,4 @@ +{ + "type" : "removal", + "description" : "Removed support for Gateway 2024.3" +} \ No newline at end of file diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index 7747ca912ff..8b5d44c0f46 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -18,7 +18,7 @@ jobs: strategy: matrix: build_target: [ ':plugin-core:buildPlugin', ':plugin-toolkit:intellij-standalone:buildPlugin', ':plugin-amazonq:buildPlugin' ] - version: [ '2024.1', '2024.2', '2024.3', '2025.1' ] + version: [ '2024.2', '2024.3', '2025.1' ] runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 diff --git a/.run/Run AWS Toolkit - Community [2024.1].run.xml b/.run/Run AWS Toolkit - Community [2024.1].run.xml deleted file mode 100644 index 3d66c9885ff..00000000000 --- a/.run/Run AWS Toolkit - Community [2024.1].run.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - false - true - false - false - - - \ No newline at end of file diff --git a/.run/Run AWS Toolkit - Gateway [2024.3].run.xml b/.run/Run AWS Toolkit - Gateway [2024.3].run.xml deleted file mode 100644 index f59c70407d5..00000000000 --- a/.run/Run AWS Toolkit - Gateway [2024.3].run.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - false - true - false - false - - - \ No newline at end of file diff --git a/.run/Run AWS Toolkit - Rider [2024.1].run.xml b/.run/Run AWS Toolkit - Rider [2024.1].run.xml deleted file mode 100644 index 6748da64f44..00000000000 --- a/.run/Run AWS Toolkit - Rider [2024.1].run.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - false - true - false - false - - - \ No newline at end of file diff --git a/.run/Run AWS Toolkit - Ultimate [2024.1].run.xml b/.run/Run AWS Toolkit - Ultimate [2024.1].run.xml deleted file mode 100644 index b1f9246c803..00000000000 --- a/.run/Run AWS Toolkit - Ultimate [2024.1].run.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - false - true - false - false - - - \ No newline at end of file diff --git a/.run/Run All - Community [2024.1].run.xml b/.run/Run All - Community [2024.1].run.xml deleted file mode 100644 index e1760d16510..00000000000 --- a/.run/Run All - Community [2024.1].run.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - false - true - false - false - - - \ No newline at end of file diff --git a/.run/Run All - Rider [2024.1].run.xml b/.run/Run All - Rider [2024.1].run.xml deleted file mode 100644 index 2fe2c1b538f..00000000000 --- a/.run/Run All - Rider [2024.1].run.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - false - true - false - false - - - \ No newline at end of file diff --git a/.run/Run All - Ultimate [2024.1].run.xml b/.run/Run All - Ultimate [2024.1].run.xml deleted file mode 100644 index 606517ed2ed..00000000000 --- a/.run/Run All - Ultimate [2024.1].run.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - false - true - false - false - - - \ No newline at end of file diff --git a/.run/Run Amazon Q - Community [2024.1].run.xml b/.run/Run Amazon Q - Community [2024.1].run.xml deleted file mode 100644 index 48037481044..00000000000 --- a/.run/Run Amazon Q - Community [2024.1].run.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - false - true - false - false - - - \ No newline at end of file diff --git a/.run/Run Amazon Q - Rider [2024.1].run.xml b/.run/Run Amazon Q - Rider [2024.1].run.xml deleted file mode 100644 index a66d2fb3045..00000000000 --- a/.run/Run Amazon Q - Rider [2024.1].run.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - false - true - false - false - - - \ No newline at end of file diff --git a/.run/Run Amazon Q - Ultimate [2024.1].run.xml b/.run/Run Amazon Q - Ultimate [2024.1].run.xml deleted file mode 100644 index c16f5123324..00000000000 --- a/.run/Run Amazon Q - Ultimate [2024.1].run.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - false - true - false - false - - - \ No newline at end of file diff --git a/.run/generateConfigs.py b/.run/generateConfigs.py index 7a939d627c8..2041a6a85e9 100644 --- a/.run/generateConfigs.py +++ b/.run/generateConfigs.py @@ -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", "2025.1"] + mvs = ["2024.2", "2024.3", "2025.1"] ides = [ IdeVariant("Community", "IC"), IdeVariant("Rider", "RD"), diff --git a/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/BuildScriptUtils.kt b/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/BuildScriptUtils.kt index 84c520c9b12..b5b02fc20b8 100644 --- a/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/BuildScriptUtils.kt +++ b/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/BuildScriptUtils.kt @@ -22,16 +22,13 @@ fun Project.ciOnly(block: () -> Unit) { fun Project.isCi() : Boolean = providers.environmentVariable("CI").isPresent fun Project.jvmTarget(): Provider = withCurrentProfileName { - when (it) { - "2023.3", "2024.1" -> JavaVersion.VERSION_17 - else -> JavaVersion.VERSION_21 - } + JavaVersion.VERSION_21 } // https://plugins.jetbrains.com/docs/intellij/using-kotlin.html#stdlib-miscellaneous fun Project.kotlinTarget(): Provider = withCurrentProfileName { when (it) { - "2023.3", "2024.1", "2024.2" -> KotlinVersionEnum.KOTLIN_1_9 + "2024.2" -> KotlinVersionEnum.KOTLIN_1_9 "2024.3" -> KotlinVersionEnum.KOTLIN_2_0 "2025.1" -> KotlinVersionEnum.KOTLIN_2_1 else -> error("not set") diff --git a/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt b/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt index 9a9107d503b..db4062b9f68 100644 --- a/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt +++ b/buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt @@ -26,78 +26,6 @@ object IdeVersions { ) private val ideProfiles = listOf( - Profile( - name = "2023.3", - community = ProductProfile( - sdkVersion = "2023.3", - bundledPlugins = commonPlugins + listOf( - "com.intellij.java", - "com.intellij.gradle", - "org.jetbrains.idea.maven", - ), - marketplacePlugins = listOf( - "PythonCore:233.11799.241", - "Docker:233.11799.244" - ) - ), - ultimate = ProductProfile( - sdkVersion = "2023.3", - bundledPlugins = commonPlugins + listOf( - "JavaScript", - "JavaScriptDebugger", - "com.intellij.database", - "com.jetbrains.codeWithMe", - ), - marketplacePlugins = listOf( - "Pythonid:233.11799.241", - "org.jetbrains.plugins.go:233.11799.196", - ) - ), - rider = RiderProfile( - sdkVersion = "2023.3", - bundledPlugins = commonPlugins, - netFrameworkTarget = "net472", - rdGenVersion = "2023.3.2", - nugetVersion = "2023.3.0" - ) - ), - Profile( - name = "2024.1", - community = ProductProfile( - sdkVersion = "2024.1", - bundledPlugins = commonPlugins + listOf( - "com.intellij.java", - "com.intellij.gradle", - "org.jetbrains.idea.maven", - ), - marketplacePlugins = listOf( - "org.toml.lang:241.14494.150", - "PythonCore:241.14494.240", - "Docker:241.14494.251" - ) - ), - ultimate = ProductProfile( - sdkVersion = "2024.1", - bundledPlugins = commonPlugins + listOf( - "JavaScript", - "JavaScriptDebugger", - "com.intellij.database", - "com.jetbrains.codeWithMe", - ), - marketplacePlugins = listOf( - "org.toml.lang:241.14494.150", - "Pythonid:241.14494.314", - "org.jetbrains.plugins.go:241.14494.240", - ) - ), - rider = RiderProfile( - sdkVersion = "2024.1", - bundledPlugins = commonPlugins, - netFrameworkTarget = "net472", - rdGenVersion = "2024.1.1", - nugetVersion = "2024.1.0" - ) - ), Profile( name = "2024.2", community = ProductProfile( @@ -137,10 +65,6 @@ object IdeVersions { ), Profile( name = "2024.3", - gateway = ProductProfile( - sdkVersion = "243.21565.196-CUSTOM-SNAPSHOT", - bundledPlugins = listOf("org.jetbrains.plugins.terminal") - ), community = ProductProfile( sdkVersion = "2024.3", bundledPlugins = commonPlugins + listOf( diff --git a/kotlinResolution.settings.gradle.kts b/kotlinResolution.settings.gradle.kts index cf5ce3351f2..d78853740bc 100644 --- a/kotlinResolution.settings.gradle.kts +++ b/kotlinResolution.settings.gradle.kts @@ -6,10 +6,6 @@ dependencyResolutionManagement { maybeCreate("libs").apply { // pull value from IJ library list: https://github.com/JetBrains/intellij-community/blob//.idea/libraries/kotlinx_coroutines_core.xml val version = when (providers.gradleProperty("ideProfileName").getOrNull() ?: return@apply) { - "2023.3", "2024.1" -> { - "1.7.3" - } - "2024.2" -> { "1.8.0-intellij-9" } diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src-241/software/aws/toolkits/jetbrains/services/codewhisperer/inlay/InlineCompletionRemoteRendererFactory.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src-241/software/aws/toolkits/jetbrains/services/codewhisperer/inlay/InlineCompletionRemoteRendererFactory.kt deleted file mode 100644 index 9c2319ed18a..00000000000 --- a/plugins/amazonq/codewhisperer/jetbrains-community/src-241/software/aws/toolkits/jetbrains/services/codewhisperer/inlay/InlineCompletionRemoteRendererFactory.kt +++ /dev/null @@ -1,65 +0,0 @@ -// Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. -// SPDX-License-Identifier: Apache-2.0 -package software.aws.toolkits.jetbrains.services.codewhisperer.inlay - -import com.intellij.codeInsight.inline.completion.render.InlineBlockElementRenderer -import com.intellij.openapi.editor.Editor -import com.intellij.openapi.editor.EditorCustomElementRenderer -import com.intellij.openapi.editor.markup.TextAttributes -import com.intellij.xdebugger.ui.DebuggerColors - -// from 232-241.1, we have `InlineSuffixRenderer`, but with 241.2+ it becomes `InlineCompletionLineRenderer` -// for both line and block inlays. Also InlineBlockElementRenderer is deprecated -// 242 is not yet handled by this -object InlineCompletionRemoteRendererFactory { - private var hasOldLineConstructor = true - private val lineConstructor = run { - val clazz = - try { - Class.forName("com.intellij.codeInsight.inline.completion.render.InlineSuffixRenderer") - } catch (e: ClassNotFoundException) { - hasOldLineConstructor = false - Class.forName("com.intellij.codeInsight.inline.completion.render.InlineCompletionLineRenderer") - } - if (hasOldLineConstructor) { - clazz.getConstructor(Editor::class.java, String::class.java) - } else { - clazz.getConstructor(Editor::class.java, String::class.java, TextAttributes::class.java) - } - } - private var hasNewBlockConstructor = true - private val blockConstructor = run { - val clazz = - try { - Class.forName("com.intellij.codeInsight.inline.completion.render.InlineCompletionLineRenderer") - } catch (e: ClassNotFoundException) { - hasNewBlockConstructor = false - Class.forName("com.intellij.codeInsight.inline.completion.render.InlineBlockElementRenderer") - } - clazz.getConstructor(Editor::class.java, List::class.java) - } - - fun createLineInlay(editor: Editor, text: String): EditorCustomElementRenderer = - ( - if (hasOldLineConstructor) { - lineConstructor.newInstance(editor, text) - } else { - lineConstructor.newInstance(editor, text, editor.colorsScheme.getAttributes(DebuggerColors.INLINED_VALUES_EXECUTION_LINE)) - } - ) as EditorCustomElementRenderer - - fun createBlockInlays(editor: Editor, block: List): List = - if (hasNewBlockConstructor) { - // 241.2+ - val textBlockClazz = Class.forName("com.intellij.codeInsight.inline.completion.render.InlineCompletionRenderTextBlock") - val textBlockConstructor = textBlockClazz.getConstructor(String::class.java, TextAttributes::class.java) - block.map { - blockConstructor.newInstance( - editor, - listOf(textBlockConstructor.newInstance(it, editor.colorsScheme.getAttributes(DebuggerColors.INLINED_VALUES_EXECUTION_LINE))) - ) as EditorCustomElementRenderer - } - } else { - listOf(InlineBlockElementRenderer(editor, block)) - } -} diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src-242+/software/aws/toolkits/jetbrains/services/codewhisperer/inlay/InlineCompletionRemoteRendererFactory.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/inlay/InlineCompletionRemoteRendererFactory.kt similarity index 60% rename from plugins/amazonq/codewhisperer/jetbrains-community/src-242+/software/aws/toolkits/jetbrains/services/codewhisperer/inlay/InlineCompletionRemoteRendererFactory.kt rename to plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/inlay/InlineCompletionRemoteRendererFactory.kt index 68e82ab604e..e62d0fb1a1a 100644 --- a/plugins/amazonq/codewhisperer/jetbrains-community/src-242+/software/aws/toolkits/jetbrains/services/codewhisperer/inlay/InlineCompletionRemoteRendererFactory.kt +++ b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/inlay/InlineCompletionRemoteRendererFactory.kt @@ -1,5 +1,6 @@ -// Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. +// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 + package software.aws.toolkits.jetbrains.services.codewhisperer.inlay import com.intellij.codeInsight.inline.completion.render.InlineCompletionLineRenderer @@ -13,13 +14,24 @@ import com.intellij.xdebugger.ui.DebuggerColors ) object InlineCompletionRemoteRendererFactory { fun createLineInlay(editor: Editor, text: String): EditorCustomElementRenderer = - InlineCompletionLineRenderer(editor, text, editor.colorsScheme.getAttributes(DebuggerColors.INLINED_VALUES_EXECUTION_LINE)) + InlineCompletionLineRenderer( + editor, + text, + editor.colorsScheme.getAttributes(DebuggerColors.INLINED_VALUES_EXECUTION_LINE) + ) fun createBlockInlays(editor: Editor, block: List): List = block.map { InlineCompletionLineRenderer( editor, - listOf(InlineCompletionRenderTextBlock(it, editor.colorsScheme.getAttributes(DebuggerColors.INLINED_VALUES_EXECUTION_LINE))) + listOf( + InlineCompletionRenderTextBlock( + it, + editor.colorsScheme.getAttributes( + DebuggerColors.INLINED_VALUES_EXECUTION_LINE + ) + ) + ) ) } } diff --git a/plugins/core/jetbrains-community/src-241-242/software/aws/toolkits/jetbrains/PluginVersionChecker.kt b/plugins/core/jetbrains-community/src-242/software/aws/toolkits/jetbrains/PluginVersionChecker.kt similarity index 100% rename from plugins/core/jetbrains-community/src-241-242/software/aws/toolkits/jetbrains/PluginVersionChecker.kt rename to plugins/core/jetbrains-community/src-242/software/aws/toolkits/jetbrains/PluginVersionChecker.kt diff --git a/plugins/core/jetbrains-ultimate/src-241-243/compat/com/intellij/lang/javascript/JavascriptLanguage.kt b/plugins/core/jetbrains-ultimate/src-242-243/compat/com/intellij/lang/javascript/JavascriptLanguage.kt similarity index 100% rename from plugins/core/jetbrains-ultimate/src-241-243/compat/com/intellij/lang/javascript/JavascriptLanguage.kt rename to plugins/core/jetbrains-ultimate/src-242-243/compat/com/intellij/lang/javascript/JavascriptLanguage.kt diff --git a/plugins/toolkit/intellij-standalone/resources-241/META-INF/plugin-shim.xml b/plugins/toolkit/intellij-standalone/resources-241/META-INF/plugin-shim.xml deleted file mode 100644 index 2e7ee872a64..00000000000 --- a/plugins/toolkit/intellij-standalone/resources-241/META-INF/plugin-shim.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - aws.toolkit.core - - - - - diff --git a/plugins/toolkit/intellij-standalone/resources-242+/META-INF/plugin-shim.xml b/plugins/toolkit/intellij-standalone/resources/META-INF/plugin-shim.xml similarity index 100% rename from plugins/toolkit/intellij-standalone/resources-242+/META-INF/plugin-shim.xml rename to plugins/toolkit/intellij-standalone/resources/META-INF/plugin-shim.xml diff --git a/plugins/toolkit/jetbrains-core/build.gradle.kts b/plugins/toolkit/jetbrains-core/build.gradle.kts index 737c1781753..97b3df5ee02 100644 --- a/plugins/toolkit/jetbrains-core/build.gradle.kts +++ b/plugins/toolkit/jetbrains-core/build.gradle.kts @@ -35,13 +35,8 @@ dependencies { intellijPlatform { localPlugin(project(":plugin-core")) - when (providers.gradleProperty("ideProfileName").get()) { - "2023.3", "2024.1" -> {} - else -> { - bundledModule("intellij.platform.vcs.dvcs.impl") - bundledModule("intellij.libraries.microba") - } - } + bundledModule("intellij.platform.vcs.dvcs.impl") + bundledModule("intellij.libraries.microba") } } diff --git a/plugins/toolkit/jetbrains-core/src-241/software/aws/toolkits/jetbrains/core/startup/PluginCoreEnforcementActivity.kt b/plugins/toolkit/jetbrains-core/src-241/software/aws/toolkits/jetbrains/core/startup/PluginCoreEnforcementActivity.kt deleted file mode 100644 index 7795b8e7994..00000000000 --- a/plugins/toolkit/jetbrains-core/src-241/software/aws/toolkits/jetbrains/core/startup/PluginCoreEnforcementActivity.kt +++ /dev/null @@ -1,49 +0,0 @@ -// Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. -// SPDX-License-Identifier: Apache-2.0 - -package software.aws.toolkits.jetbrains.core.startup - -import com.intellij.ide.ApplicationInitializedListener -import com.intellij.ide.plugins.PluginEnabler -import com.intellij.ide.plugins.PluginManagerCore -import com.intellij.openapi.application.ex.ApplicationManagerEx -import com.intellij.openapi.extensions.PluginId -import com.intellij.openapi.progress.EmptyProgressIndicator -import kotlinx.coroutines.CoroutineScope -import org.slf4j.LoggerFactory - -class PluginCoreEnforcementActivity : ApplicationInitializedListener { - - @Suppress("LazyLog") - override suspend fun execute(asyncScope: CoroutineScope) { - // can't reference anything in core - val log = LoggerFactory.getLogger(this::class.java) - - val coreId = PluginId.getId("aws.toolkit.core") - val coreDescriptor = PluginManagerCore.getPlugin(coreId) - if (coreDescriptor != null) { - if (!coreDescriptor.isEnabled) { - PluginEnabler.getInstance().enable(listOf(coreDescriptor)) - ApplicationManagerEx.getApplicationEx().restart(true) - } - // already installed - return - } - - log.info("Attempting to install $coreId") - if (lookForPluginToInstall(coreId, EmptyProgressIndicator())) { - log.info("Successfully installed $coreId, restarting") - } else { - // missing core and therefore unsafe to continue - val toolkit = PluginManagerCore.getPlugin(PluginId.getId("aws.toolkit")) - if (toolkit == null) { - log.info("Core is missing, but descriptor to disable toolkit was not found") - return - } - log.info("Disabling $toolkit due to missing core dependency") - PluginEnabler.getInstance().disable(listOf(toolkit)) - } - - ApplicationManagerEx.getApplicationEx().restart(true) - } -} diff --git a/plugins/toolkit/jetbrains-core/src-241-242/software/aws/toolkits/jetbrains/services/lambda/python/PyCharmSdkSelectionPanel.kt b/plugins/toolkit/jetbrains-core/src-242/software/aws/toolkits/jetbrains/services/lambda/python/PyCharmSdkSelectionPanel.kt similarity index 100% rename from plugins/toolkit/jetbrains-core/src-241-242/software/aws/toolkits/jetbrains/services/lambda/python/PyCharmSdkSelectionPanel.kt rename to plugins/toolkit/jetbrains-core/src-242/software/aws/toolkits/jetbrains/services/lambda/python/PyCharmSdkSelectionPanel.kt diff --git a/plugins/toolkit/jetbrains-core/src-241+/software/aws/toolkits/jetbrains/core/explorer/ActionToolbarLayoutUtil.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/ActionToolbarLayoutUtil.kt similarity index 100% rename from plugins/toolkit/jetbrains-core/src-241+/software/aws/toolkits/jetbrains/core/explorer/ActionToolbarLayoutUtil.kt rename to plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/ActionToolbarLayoutUtil.kt diff --git a/plugins/toolkit/jetbrains-gateway/src-243/compat/com/jetbrains/gateway/thinClientLink/StartNewClient.kt b/plugins/toolkit/jetbrains-gateway/src-243/compat/com/jetbrains/gateway/thinClientLink/StartNewClient.kt deleted file mode 100644 index 809f56c5776..00000000000 --- a/plugins/toolkit/jetbrains-gateway/src-243/compat/com/jetbrains/gateway/thinClientLink/StartNewClient.kt +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved. -// SPDX-License-Identifier: Apache-2.0 -package compat.com.jetbrains.gateway.thinClientLink - -import com.jetbrains.gateway.thinClientLink.LinkedClientManager -import com.jetbrains.rd.util.lifetime.Lifetime -import java.net.URI - -fun startNewClient(lifetime: Lifetime, initialLink: URI, remoteIdentity: String?, onStarted: () -> Unit) = - LinkedClientManager.getInstance().startNewClient(lifetime, initialLink, remoteIdentity, onStarted) diff --git a/plugins/toolkit/jetbrains-gateway/src-251+/src-243/compat/com/jetbrains/gateway/thinClientLink/StartNewClient.kt b/plugins/toolkit/jetbrains-gateway/src-251+/src-243/compat/com/jetbrains/gateway/thinClientLink/StartNewClient.kt deleted file mode 100644 index cf0fe783aec..00000000000 --- a/plugins/toolkit/jetbrains-gateway/src-251+/src-243/compat/com/jetbrains/gateway/thinClientLink/StartNewClient.kt +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved. -// SPDX-License-Identifier: Apache-2.0 -package compat.com.jetbrains.gateway.thinClientLink - -import com.jetbrains.gateway.thinClientLink.LinkedClientManager -import com.jetbrains.rd.util.lifetime.Lifetime -import java.net.URI - -fun startNewClient(lifetime: Lifetime, initialLink: URI, remoteIdentity: String?, onStarted: () -> Unit) = - LinkedClientManager.getInstance().startNewClient(lifetime, initialLink, remoteIdentity, null, onStarted) diff --git a/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/connection/workflow/StartBackend.kt b/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/connection/workflow/StartBackend.kt index 7c281d3dec2..d24b083a3b2 100644 --- a/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/connection/workflow/StartBackend.kt +++ b/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/connection/workflow/StartBackend.kt @@ -4,9 +4,9 @@ package software.aws.toolkits.jetbrains.gateway.connection.workflow import com.jetbrains.gateway.api.GatewayConnectionHandle +import com.jetbrains.gateway.thinClientLink.LinkedClientManager import com.jetbrains.rd.util.lifetime.LifetimeDefinition import com.jetbrains.rd.util.reactive.adviseEternal -import compat.com.jetbrains.gateway.thinClientLink.startNewClient import kotlinx.coroutines.delay import kotlinx.coroutines.runBlocking import software.aws.toolkits.core.utils.getLogger @@ -49,7 +49,11 @@ class StartBackend( val clientHandle = ThinClientTrackerService.getInstance().associate(envId) { val start = System.currentTimeMillis() val thinClientHandle = try { - startNewClient(lifetime, localLink, URLEncoder.encode(message("caws.workspace.backend.title"), Charsets.UTF_8)) { + LinkedClientManager.getInstance().startNewClient( + lifetime, + localLink, + URLEncoder.encode(message("caws.workspace.backend.title"), Charsets.UTF_8) + ) { CodecatalystTelemetry.devEnvironmentWorkflowStatistic( project = null, userId = lazilyGetUserId(), diff --git a/plugins/toolkit/jetbrains-rider/build.gradle.kts b/plugins/toolkit/jetbrains-rider/build.gradle.kts index f47398308eb..a42162c8fdd 100644 --- a/plugins/toolkit/jetbrains-rider/build.gradle.kts +++ b/plugins/toolkit/jetbrains-rider/build.gradle.kts @@ -74,7 +74,6 @@ dependencies { // FIX_WHEN_MIN_IS_251: https://github.com/JetBrains/intellij-platform-gradle-plugin/issues/1774 when (providers.gradleProperty("ideProfileName").get()) { - "2023.3", "2024.1" -> {} "2024.2", "2024.3", "2025.1" -> { bundledModule("intellij.rider") } diff --git a/plugins/toolkit/jetbrains-rider/resources-241+/META-INF/ext-rider-wizard.xml b/plugins/toolkit/jetbrains-rider/resources/META-INF/ext-rider-wizard.xml similarity index 100% rename from plugins/toolkit/jetbrains-rider/resources-241+/META-INF/ext-rider-wizard.xml rename to plugins/toolkit/jetbrains-rider/resources/META-INF/ext-rider-wizard.xml diff --git a/plugins/toolkit/jetbrains-rider/src-241/com/jetbrains/rider/model/RdProjectTemplate.kt b/plugins/toolkit/jetbrains-rider/src-241/com/jetbrains/rider/model/RdProjectTemplate.kt deleted file mode 100644 index 8da5e03ed3a..00000000000 --- a/plugins/toolkit/jetbrains-rider/src-241/com/jetbrains/rider/model/RdProjectTemplate.kt +++ /dev/null @@ -1,5 +0,0 @@ -// Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. -// SPDX-License-Identifier: Apache-2.0 -package com.jetbrains.rider.model - -typealias RdProjectTemplate = com.jetbrains.rider.model.RdProjectTemplate2 diff --git a/plugins/toolkit/jetbrains-rider/src-241+/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotNetSamProjectGenerator.kt b/plugins/toolkit/jetbrains-rider/src/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotNetSamProjectGenerator.kt similarity index 100% rename from plugins/toolkit/jetbrains-rider/src-241+/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotNetSamProjectGenerator.kt rename to plugins/toolkit/jetbrains-rider/src/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotNetSamProjectGenerator.kt diff --git a/plugins/toolkit/jetbrains-rider/src-241+/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotNetSamProjectGeneratorRoot.kt b/plugins/toolkit/jetbrains-rider/src/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotNetSamProjectGeneratorRoot.kt similarity index 100% rename from plugins/toolkit/jetbrains-rider/src-241+/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotNetSamProjectGeneratorRoot.kt rename to plugins/toolkit/jetbrains-rider/src/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotNetSamProjectGeneratorRoot.kt diff --git a/plugins/toolkit/jetbrains-rider/src-241+/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotNetSamProjectProvider.kt b/plugins/toolkit/jetbrains-rider/src/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotNetSamProjectProvider.kt similarity index 100% rename from plugins/toolkit/jetbrains-rider/src-241+/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotNetSamProjectProvider.kt rename to plugins/toolkit/jetbrains-rider/src/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotNetSamProjectProvider.kt diff --git a/plugins/toolkit/jetbrains-rider/tst-241-242/base/BaseTestWithMarkup.kt b/plugins/toolkit/jetbrains-rider/tst-242/base/BaseTestWithMarkup.kt similarity index 100% rename from plugins/toolkit/jetbrains-rider/tst-241-242/base/BaseTestWithMarkup.kt rename to plugins/toolkit/jetbrains-rider/tst-242/base/BaseTestWithMarkup.kt diff --git a/plugins/toolkit/jetbrains-rider/tst-241-242/base/BaseTestWithSolution.kt b/plugins/toolkit/jetbrains-rider/tst-242/base/BaseTestWithSolution.kt similarity index 100% rename from plugins/toolkit/jetbrains-rider/tst-241-242/base/BaseTestWithSolution.kt rename to plugins/toolkit/jetbrains-rider/tst-242/base/BaseTestWithSolution.kt diff --git a/plugins/toolkit/jetbrains-ultimate/tst-241+/software/aws/toolkits/jetbrains/go/VgoCompatShims.kt b/plugins/toolkit/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/go/VgoCompatShims.kt similarity index 89% rename from plugins/toolkit/jetbrains-ultimate/tst-241+/software/aws/toolkits/jetbrains/go/VgoCompatShims.kt rename to plugins/toolkit/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/go/VgoCompatShims.kt index bc1288ec419..87dd6a7660c 100644 --- a/plugins/toolkit/jetbrains-ultimate/tst-241+/software/aws/toolkits/jetbrains/go/VgoCompatShims.kt +++ b/plugins/toolkit/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/go/VgoCompatShims.kt @@ -1,4 +1,4 @@ -// Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. +// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 package software.aws.toolkits.jetbrains.go diff --git a/settings.gradle.kts b/settings.gradle.kts index 8d627901e74..a9a23c00f8d 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -100,13 +100,8 @@ include("ui-tests") include("sandbox-all") include("ui-tests-starter") when (providers.gradleProperty("ideProfileName").get()) { - // FIX_WHEN_MIN_IS_242: `tmp-all` test module no longer needed in 242+ - "2024.1" -> { - include("tmp-all") - project(":ui-tests-starter").projectDir = file("noop") - } + // FIX_WHEN_MIN_IS_243 "2024.2" -> { - // only available 243+ project(":ui-tests-starter").projectDir = file("noop") } } @@ -163,7 +158,7 @@ file("plugins").listFiles()?.forEach root@ { if (it.name == "jetbrains-gateway") { when (providers.gradleProperty("ideProfileName").get()) { // buildSrc is evaluated after settings so we can't key off of IdeVersions.kt - "2023.3", "2024.1", "2024.2" -> { + "2024.2", "2024.3" -> { return@forEach } } diff --git a/ui-tests-starter/tst-241-242/software/aws/toolkits/jetbrains/uitests/TestCIServer.kt b/ui-tests-starter/tst-242/software/aws/toolkits/jetbrains/uitests/TestCIServer.kt similarity index 100% rename from ui-tests-starter/tst-241-242/software/aws/toolkits/jetbrains/uitests/TestCIServer.kt rename to ui-tests-starter/tst-242/software/aws/toolkits/jetbrains/uitests/TestCIServer.kt