Skip to content

Commit da926ac

Browse files
rlirli
authored
Drop 222 IDEs and Gateway 231 (#3828)
1 parent 2c6f4b7 commit da926ac

File tree

47 files changed

+25
-196
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+25
-196
lines changed

‎.changes/next-release/removal-2346a3f8-d111-479f-8114-30ba2fb615c5.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type" : "removal",
3+
"description" : "Removed support for 2022.2.x IDEs"
4+
}

‎.changes/next-release/removal-57285858-c00f-42a9-bb72-5fe11048a6ff.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type" : "removal",
3+
"description" : "Removed support for Gateway 2023.1"
4+
}

‎README.md‎

Lines changed: 1 addition & 1 deletion

‎buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt‎

Lines changed: 10 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -12,67 +12,19 @@ enum class IdeFlavor { GW, IC, IU, RD }
1212

1313
object IdeVersions {
1414
private val commonPlugins = arrayOf(
15-
"git4idea",
15+
"vcs-git",
1616
"org.jetbrains.plugins.terminal",
1717
"org.jetbrains.plugins.yaml"
1818
)
1919

20-
// FIX_WHEN_MIN_IS_223
21-
private val commonPlugins223 = commonPlugins.map {
22-
when (it) {
23-
"git4idea" -> "vcs-git"
24-
else -> it
25-
}
26-
}.toTypedArray()
27-
2820
private val ideProfiles = listOf(
29-
Profile(
30-
name = "2022.2",
31-
community = ProductProfile(
32-
sdkFlavor = IdeFlavor.IC,
33-
sdkVersion = "2022.2",
34-
plugins = commonPlugins + listOf(
35-
"java",
36-
"com.intellij.gradle",
37-
"org.jetbrains.idea.maven",
38-
"PythonCore:222.3345.118",
39-
"Docker:222.3345.118"
40-
)
41-
),
42-
ultimate = ProductProfile(
43-
sdkFlavor = IdeFlavor.IU,
44-
sdkVersion = "2022.2",
45-
plugins = commonPlugins + listOf(
46-
"JavaScript",
47-
// Transitive dependency needed for javascript
48-
// Can remove when https://github.com/JetBrains/gradle-intellij-plugin/issues/608 is fixed
49-
"com.intellij.css",
50-
"JavaScriptDebugger",
51-
"com.intellij.database",
52-
"com.jetbrains.codeWithMe",
53-
"Pythonid:222.3345.118",
54-
"org.jetbrains.plugins.go:222.3345.118",
55-
// https://github.com/JetBrains/gradle-intellij-plugin/issues/1056
56-
"org.intellij.intelliLang"
57-
)
58-
),
59-
rider = RiderProfile(
60-
sdkVersion = "2022.2",
61-
plugins = commonPlugins + listOf(
62-
"rider-plugins-appender" // Workaround for https://youtrack.jetbrains.com/issue/IDEA-179607
63-
),
64-
netFrameworkTarget = "net472",
65-
rdGenVersion = "2022.2.4",
66-
nugetVersion = "2022.2.0"
67-
)
68-
),
6921
Profile(
7022
name = "2022.3",
7123
community = ProductProfile(
7224
sdkFlavor = IdeFlavor.IC,
7325
// test failure related to null notification contexts in 2022.3
7426
sdkVersion = "2022.3.1",
75-
plugins = commonPlugins223 + listOf(
27+
plugins = commonPlugins + listOf(
7628
"java",
7729
"com.intellij.gradle",
7830
"org.jetbrains.idea.maven",
@@ -83,7 +35,7 @@ object IdeVersions {
8335
ultimate = ProductProfile(
8436
sdkFlavor = IdeFlavor.IU,
8537
sdkVersion = "2022.3.1",
86-
plugins = commonPlugins223 + listOf(
38+
plugins = commonPlugins + listOf(
8739
"JavaScript",
8840
// Transitive dependency needed for javascript
8941
// Can remove when https://github.com/JetBrains/gradle-intellij-plugin/issues/608 is fixed
@@ -99,7 +51,7 @@ object IdeVersions {
9951
),
10052
rider = RiderProfile(
10153
sdkVersion = "2022.3.1",
102-
plugins = commonPlugins223 + listOf(
54+
plugins = commonPlugins + listOf(
10355
"rider-plugins-appender" // Workaround for https://youtrack.jetbrains.com/issue/IDEA-179607
10456
),
10557
netFrameworkTarget = "net472",
@@ -109,15 +61,10 @@ object IdeVersions {
10961
),
11062
Profile(
11163
name = "2023.1",
112-
gateway = ProductProfile(
113-
sdkFlavor = IdeFlavor.GW,
114-
sdkVersion = "231.8109-EAP-CANDIDATE-SNAPSHOT",
115-
plugins = arrayOf("org.jetbrains.plugins.terminal")
116-
),
11764
community = ProductProfile(
11865
sdkFlavor = IdeFlavor.IC,
11966
sdkVersion = "2023.1",
120-
plugins = commonPlugins223 + listOf(
67+
plugins = commonPlugins + listOf(
12168
"java",
12269
"com.intellij.gradle",
12370
"org.jetbrains.idea.maven",
@@ -128,7 +75,7 @@ object IdeVersions {
12875
ultimate = ProductProfile(
12976
sdkFlavor = IdeFlavor.IU,
13077
sdkVersion = "2023.1",
131-
plugins = commonPlugins223 + listOf(
78+
plugins = commonPlugins + listOf(
13279
"JavaScript",
13380
// Transitive dependency needed for javascript
13481
// Can remove when https://github.com/JetBrains/gradle-intellij-plugin/issues/608 is fixed
@@ -144,7 +91,7 @@ object IdeVersions {
14491
),
14592
rider = RiderProfile(
14693
sdkVersion = "2023.1",
147-
plugins = commonPlugins223 + listOf(
94+
plugins = commonPlugins + listOf(
14895
"rider-plugins-appender" // Workaround for https://youtrack.jetbrains.com/issue/IDEA-179607
14996
),
15097
netFrameworkTarget = "net472",
@@ -162,7 +109,7 @@ object IdeVersions {
162109
community = ProductProfile(
163110
sdkFlavor = IdeFlavor.IC,
164111
sdkVersion = "2023.2",
165-
plugins = commonPlugins223 + listOf(
112+
plugins = commonPlugins + listOf(
166113
"java",
167114
"com.intellij.gradle",
168115
"org.jetbrains.idea.maven",
@@ -173,7 +120,7 @@ object IdeVersions {
173120
ultimate = ProductProfile(
174121
sdkFlavor = IdeFlavor.IU,
175122
sdkVersion = "2023.2",
176-
plugins = commonPlugins223 + listOf(
123+
plugins = commonPlugins + listOf(
177124
"JavaScript",
178125
// Transitive dependency needed for javascript
179126
// Can remove when https://github.com/JetBrains/gradle-intellij-plugin/issues/608 is fixed
@@ -189,7 +136,7 @@ object IdeVersions {
189136
),
190137
rider = RiderProfile(
191138
sdkVersion = "2023.2",
192-
plugins = commonPlugins223 + listOf(
139+
plugins = commonPlugins + listOf(
193140
"rider-plugins-appender" // Workaround for https://youtrack.jetbrains.com/issue/IDEA-179607
194141
),
195142
netFrameworkTarget = "net472",

‎jetbrains-core/resources/META-INF/plugin.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,6 @@ with what features/services are supported.
102102
<xi:fallback/>
103103
</xi:include>
104104

105-
<xi:include href="/META-INF/IU-222.xml" xpointer="xpointer(/idea-plugin/*)">
106-
<xi:fallback/>
107-
</xi:include>
108-
109105
<xi:include href="/META-INF/RD.xml" xpointer="xpointer(/idea-plugin/*)">
110106
<xi:fallback/>
111107
</xi:include>

‎jetbrains-core/src-212+/software/aws/toolkits/jetbrains/core/CollaborationToolsUIUtil.kt‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎jetbrains-core/src-221-223/software/aws/toolkits/jetbrains/core/docker/DockerUtils.kt‎ renamed to ‎jetbrains-core/src-223/software/aws/toolkits/jetbrains/core/docker/DockerUtils.kt‎

File renamed without changes.

‎jetbrains-core/src-222+/software/aws/toolkits/jetbrains/core/docker/compatability/DockerRegistry.kt‎ renamed to ‎jetbrains-core/src/software/aws/toolkits/jetbrains/core/docker/compatability/DockerRegistry.kt‎

File renamed without changes.

‎jetbrains-core/src-222+/software/aws/toolkits/jetbrains/core/terminal/AwsLocalTerminalRunner.kt‎ renamed to ‎jetbrains-core/src/software/aws/toolkits/jetbrains/core/terminal/AwsLocalTerminalRunner.kt‎

File renamed without changes.

‎jetbrains-core/src/software/aws/toolkits/jetbrains/services/caws/CawsCloneDialogComponent.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
package software.aws.toolkits.jetbrains.services.caws
55

6+
import com.intellij.collaboration.ui.CollaborationToolsUIUtil
67
import com.intellij.dvcs.repo.ClonePathProvider
78
import com.intellij.dvcs.ui.CloneDvcsValidationUtils
89
import com.intellij.dvcs.ui.SelectChildTextFieldWithBrowseButton
@@ -37,7 +38,6 @@ import software.aws.toolkits.core.utils.getLogger
3738
import software.aws.toolkits.core.utils.warn
3839
import software.aws.toolkits.jetbrains.core.AwsClientManager
3940
import software.aws.toolkits.jetbrains.core.AwsResourceCache
40-
import software.aws.toolkits.jetbrains.core.CollaborationToolsUIUtil
4141
import software.aws.toolkits.jetbrains.core.coroutines.disposableCoroutineScope
4242
import software.aws.toolkits.jetbrains.core.coroutines.getCoroutineUiContext
4343
import software.aws.toolkits.jetbrains.core.credentials.sono.lazilyGetUserId

0 commit comments

Comments
 (0)