Skip to content

Commit abcb756

Browse files
manodnyabmanodnyab
authored
Add 2022.2 (222) Support (#3171)
1 parent d1c8986 commit abcb756

File tree

13 files changed

+139
-15
lines changed

13 files changed

+139
-15
lines changed

‎.changes/next-release/feature-9b51699b-e6ac-46d9-97e8-3902dc391340.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type" : "feature",
3+
"description" : "Added 2022.2 support"
4+
}

‎.run/Run IDE - Core [2022.2].run.xml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<!-- Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. -->
2+
<!-- SPDX-License-Identifier: Apache-2.0 -->
3+
4+
<component name="ProjectRunConfigurationManager">
5+
<configuration default="false" name="Run IDE - Core [2022.2]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2022.2">
6+
<log_file alias="idea.log" path="$PROJECT_DIR$/jetbrains-core/build/idea-sandbox/system/log/idea.log" />
7+
<ExternalSystemSettings>
8+
<option name="executionName" />
9+
<option name="externalProjectPath" value="$PROJECT_DIR$/jetbrains-core" />
10+
<option name="externalSystemIdString" value="GRADLE" />
11+
<option name="scriptParameters" value="-PideProfileName=2022.2 runIde" />
12+
<option name="taskDescriptions">
13+
<list />
14+
</option>
15+
<option name="taskNames">
16+
<list />
17+
</option>
18+
<option name="vmOptions" />
19+
</ExternalSystemSettings>
20+
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
21+
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
22+
<DebugAllEnabled>false</DebugAllEnabled>
23+
<method v="2" />
24+
</configuration>
25+
</component>

‎.run/Run IDE - Rider [2022.2].run.xml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<!-- Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. -->
2+
<!-- SPDX-License-Identifier: Apache-2.0 -->
3+
4+
<component name="ProjectRunConfigurationManager">
5+
<configuration default="false" name="Run IDE - Rider [2022.2]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2022.2">
6+
<log_file alias="idea.log" path="$PROJECT_DIR$/jetbrains-rider/build/idea-sandbox/system/log/idea.log" />
7+
<ExternalSystemSettings>
8+
<option name="executionName" />
9+
<option name="externalProjectPath" value="$PROJECT_DIR$/jetbrains-rider" />
10+
<option name="externalSystemIdString" value="GRADLE" />
11+
<option name="scriptParameters" value="-PideProfileName=2022.2 runIde" />
12+
<option name="taskDescriptions">
13+
<list />
14+
</option>
15+
<option name="taskNames">
16+
<list />
17+
</option>
18+
<option name="vmOptions" />
19+
</ExternalSystemSettings>
20+
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
21+
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
22+
<DebugAllEnabled>false</DebugAllEnabled>
23+
<method v="2" />
24+
</configuration>
25+
</component>

‎.run/Run IDE - Ultimate [2022.2].run.xml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<!-- Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. -->
2+
<!-- SPDX-License-Identifier: Apache-2.0 -->
3+
4+
<component name="ProjectRunConfigurationManager">
5+
<configuration default="false" name="Run IDE - Ultimate [2022.2]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2022.2">
6+
<log_file alias="idea.log" path="$PROJECT_DIR$/jetbrains-ultimate/build/idea-sandbox/system/log/idea.log" />
7+
<ExternalSystemSettings>
8+
<option name="executionName" />
9+
<option name="externalProjectPath" value="$PROJECT_DIR$/jetbrains-ultimate" />
10+
<option name="externalSystemIdString" value="GRADLE" />
11+
<option name="scriptParameters" value="-PideProfileName=2022.2" />
12+
<option name="taskDescriptions">
13+
<list />
14+
</option>
15+
<option name="taskNames">
16+
<list>
17+
<option value="runIde" />
18+
</list>
19+
</option>
20+
<option name="vmOptions" />
21+
</ExternalSystemSettings>
22+
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
23+
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
24+
<DebugAllEnabled>false</DebugAllEnabled>
25+
<method v="2" />
26+
</configuration>
27+
</component>

‎buildSrc/settings.gradle.kts‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,7 @@ dependencyResolutionManagement {
2828
url = uri("https://oss.sonatype.org/content/repositories/snapshots/")
2929
content {
3030
// only allowed to pull snapshots of gradle-intellij-plugin from here
31-
includeModule("org.jetbrains.intellij.plugins", "gradle-intellij-plugin")
32-
}
33-
mavenContent {
34-
snapshotsOnly()
31+
includeModule("org.jetbrains.intellij", "org.jetbrains.intellij.gradle.plugin")
3532
}
3633
}
3734
}

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

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,45 @@ object IdeVersions {
126126
rdGenVersion = "2022.1.3",
127127
nugetVersion = "2022.1.0"
128128
)
129+
),
130+
Profile(
131+
name = "2022.2",
132+
community = ProductProfile(
133+
sdkFlavor = IdeFlavor.IC,
134+
sdkVersion = "222.2964-EAP-CANDIDATE-SNAPSHOT",
135+
plugins = commonPlugins + listOf(
136+
"java",
137+
"com.intellij.gradle",
138+
"org.jetbrains.idea.maven",
139+
"PythonCore:222.2964.16",
140+
"Docker:222.2964.63"
141+
)
142+
),
143+
ultimate = ProductProfile(
144+
sdkFlavor = IdeFlavor.IU,
145+
sdkVersion = "222.2964-EAP-CANDIDATE-SNAPSHOT",
146+
plugins = commonPlugins + listOf(
147+
"JavaScript",
148+
// Transitive dependency needed for javascript
149+
// Can remove when https://github.com/JetBrains/gradle-intellij-plugin/issues/608 is fixed
150+
"com.intellij.css",
151+
"JavaScriptDebugger",
152+
"com.intellij.database",
153+
"Pythonid:222.2964.55",
154+
"org.jetbrains.plugins.go:222.2964.55"
155+
)
156+
),
157+
rider = RiderProfile(
158+
sdkVersion = "2022.2-EAP4-SNAPSHOT",
159+
plugins = commonPlugins + listOf(
160+
"rider-plugins-appender" // Workaround for https://youtrack.jetbrains.com/issue/IDEA-179607
161+
),
162+
netFrameworkTarget = "net472",
163+
rdGenVersion = "2022.2.1",
164+
nugetVersion = "2022.2.0-eap04"
165+
)
129166
)
167+
130168
).associateBy { it.name }
131169

132170
fun ideProfile(project: Project): Profile = ideProfile(project.providers).get()

‎buildspec/linuxIntegrationTests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: 0.2
22

33
cache:
44
paths:
5-
- '/root/.gradle/caches/**/*'
5+
# - '/root/.gradle/caches/**/*'
66
- '/root/.gradle/wrapper/**/*'
77

88
env:

‎buildspec/linuxTests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: 0.2
22

33
cache:
44
paths:
5-
- '/root/.gradle/caches/**/*'
5+
# - '/root/.gradle/caches/**/*'
66
- '/root/.gradle/wrapper/**/*'
77

88
env:

‎gradle/libs.versions.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ assertJ = "3.20.2" # Upgrading leads to SAM errors: https://youtrack.jetbrains.c
44
awsSdk = "2.17.138"
55
commonmark = "0.17.1"
66
detekt = "1.20.0"
7-
intellijGradle = "1.5.2"
8-
intellijRemoteRobot = "0.11.11"
7+
intellijGradle = "1.7.0-20220613.010908-17"
8+
intellijRemoteRobot = "0.11.14"
99
jackson = "2.11.1"
1010
jacoco = "0.8.7"
1111
jgit = "5.11.0.202103091610-r"
@@ -55,7 +55,7 @@ detekt-api = { module = "io.gitlab.arturbosch.detekt:detekt-api", version.ref =
5555
detekt-formattingRules = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version.ref = "detekt" }
5656
detekt-test = { module = "io.gitlab.arturbosch.detekt:detekt-test", version.ref = "detekt" }
5757
gradlePlugin-detekt = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detekt" }
58-
gradlePlugin-intellij = { module = "org.jetbrains.intellij.plugins:gradle-intellij-plugin", version.ref = "intellijGradle" }
58+
gradlePlugin-intellij = { module = "org.jetbrains.intellij:org.jetbrains.intellij.gradle.plugin", version.ref = "intellijGradle" }
5959
gradlePlugin-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
6060
gradlePlugin-testLogger = { module = "com.adarshr:gradle-test-logger-plugin", version.ref = "testLogger" }
6161
gradlePlugin-testRetry = { module = "org.gradle:test-retry-gradle-plugin", version.ref = "testRetry" }

‎jetbrains-core/build.gradle.kts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,11 @@ tasks.jar {
5050
}
5151
}
5252

53+
tasks.testJar {
54+
// classpath.index is a duplicated
55+
duplicatesStrategy = DuplicatesStrategy.INCLUDE
56+
}
57+
5358
tasks.processTestResources {
5459
// TODO how can we remove this. Fails due to:
5560
// "customerUploadedEventSchemaMultipleTypes.json.txt is a duplicate but no duplicate handling strategy has been set"

0 commit comments

Comments
 (0)