Skip to content

Commit 162acab

Browse files
rlirli
authored
Add 223 profile (#3315)
1 parent 32834d9 commit 162acab

File tree

50 files changed

+431
-221
lines changed

Some content is hidden

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

50 files changed

+431
-221
lines changed

‎.changes/next-release/feature-731c917b-7e1e-42b9-9038-6565cadeb51b.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.3 support"
4+
}

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
<!-- Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. -->
2-
<!-- SPDX-License-Identifier: Apache-2.0 -->
3-
41
<component name="ProjectRunConfigurationManager">
52
<configuration default="false" name="Run IDE - Core [2022.2]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2022.2">
63
<log_file alias="idea.log" path="$PROJECT_DIR$/jetbrains-core/build/idea-sandbox/system/log/idea.log" />

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

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

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
<!-- Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. -->
2-
<!-- SPDX-License-Identifier: Apache-2.0 -->
3-
41
<component name="ProjectRunConfigurationManager">
52
<configuration default="false" name="Run IDE - Rider [2022.2]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2022.2">
63
<log_file alias="idea.log" path="$PROJECT_DIR$/jetbrains-rider/build/idea-sandbox/system/log/idea.log" />

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

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

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
<!-- Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. -->
2-
<!-- SPDX-License-Identifier: Apache-2.0 -->
3-
41
<component name="ProjectRunConfigurationManager">
52
<configuration default="false" name="Run IDE - Ultimate [2022.2]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2022.2">
63
<log_file alias="idea.log" path="$PROJECT_DIR$/jetbrains-ultimate/build/idea-sandbox/system/log/idea.log" />

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

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

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

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ package software.aws.toolkits.gradle
55

66
import org.gradle.api.JavaVersion
77
import org.gradle.api.Project
8+
import org.gradle.api.provider.Provider
9+
import software.aws.toolkits.gradle.intellij.IdeVersions
810

911
/**
1012
* Only run the given block if this build is running within a CI system (e.g. GitHub actions, CodeBuild etc)
@@ -17,5 +19,14 @@ fun Project.ciOnly(block: () -> Unit) {
1719

1820
fun Project.isCi() : Boolean = providers.environmentVariable("CI").isPresent
1921

20-
val jvmTarget = JavaVersion.VERSION_11
22+
fun Project.jvmTarget(): Provider<JavaVersion> {
23+
val name = IdeVersions.ideProfile(providers).map { it.name }
24+
return name.map {
25+
when (it) {
26+
"2021.3", "2022.1", "2022.2" -> JavaVersion.VERSION_11
27+
else -> JavaVersion.VERSION_17
28+
}
29+
}
30+
}
31+
2132
val kotlinTarget = "1.5"

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

Lines changed: 41 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,13 +120,52 @@ object IdeVersions {
120120
)
121121
),
122122
rider = RiderProfile(
123-
sdkVersion = "2022.2-EAP8-SNAPSHOT",
123+
sdkVersion = "2022.2",
124124
plugins = commonPlugins + listOf(
125125
"rider-plugins-appender" // Workaround for https://youtrack.jetbrains.com/issue/IDEA-179607
126126
),
127127
netFrameworkTarget = "net472",
128128
rdGenVersion = "2022.2.4",
129-
nugetVersion = "2022.2.0-eap08"
129+
nugetVersion = "2022.2.0"
130+
)
131+
),
132+
Profile(
133+
name = "2022.3",
134+
community = ProductProfile(
135+
sdkFlavor = IdeFlavor.IC,
136+
sdkVersion = "223.4884-EAP-CANDIDATE-SNAPSHOT",
137+
plugins = commonPlugins + listOf(
138+
"java",
139+
"com.intellij.gradle",
140+
"org.jetbrains.idea.maven",
141+
"PythonCore:223.4884.65",
142+
"Docker:223.4884.75"
143+
)
144+
),
145+
ultimate = ProductProfile(
146+
sdkFlavor = IdeFlavor.IU,
147+
sdkVersion = "223.4884-EAP-CANDIDATE-SNAPSHOT",
148+
plugins = commonPlugins + listOf(
149+
"JavaScript",
150+
// Transitive dependency needed for javascript
151+
// Can remove when https://github.com/JetBrains/gradle-intellij-plugin/issues/608 is fixed
152+
"com.intellij.css",
153+
"JavaScriptDebugger",
154+
"com.intellij.database",
155+
"Pythonid:223.4884.69",
156+
"org.jetbrains.plugins.go:223.4884.65",
157+
// https://github.com/JetBrains/gradle-intellij-plugin/issues/1056
158+
"org.intellij.intelliLang"
159+
)
160+
),
161+
rider = RiderProfile(
162+
sdkVersion = "2022.3-EAP1-SNAPSHOT",
163+
plugins = commonPlugins + listOf(
164+
"rider-plugins-appender" // Workaround for https://youtrack.jetbrains.com/issue/IDEA-179607
165+
),
166+
netFrameworkTarget = "net472",
167+
rdGenVersion = "2022.3.2",
168+
nugetVersion = "2022.3.0-eap01"
130169
)
131170
)
132171

‎buildSrc/src/main/kotlin/toolkit-generate-sdks.gradle.kts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
import software.aws.toolkits.gradle.sdk.GenerateSdk
55
import software.aws.toolkits.gradle.sdk.GenerateSdkExtension
6+
import software.aws.toolkits.gradle.jvmTarget
67

78
val sdkGenerator = project.extensions.create<GenerateSdkExtension>("sdkGenerator")
89

@@ -25,8 +26,9 @@ sourceSets {
2526
}
2627

2728
java {
28-
sourceCompatibility = software.aws.toolkits.gradle.jvmTarget
29-
targetCompatibility = software.aws.toolkits.gradle.jvmTarget
29+
val target = project.jvmTarget().get()
30+
sourceCompatibility = target
31+
targetCompatibility = target
3032
}
3133

3234
tasks.withType<JavaCompile>().configureEach {

0 commit comments

Comments
 (0)