Skip to content

Commit e1d7257

Browse files
rlirli
authored
Build for 231 (#3490)
1 parent fa0d368 commit e1d7257

File tree

80 files changed

+757
-481
lines changed

Some content is hidden

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

80 files changed

+757
-481
lines changed

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

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
11
<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>
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" />
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>

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

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="Run IDE - Core [2023.1]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2023.1">
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=2023.1" />
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+
<ForceTestExec>false</ForceTestExec>
23+
<method v="2" />
24+
</configuration>
25+
</component>

‎.run/Run IDE - Gateway [2023.1].run.xml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="Run IDE - Gateway [2023.1]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2023.1">
3+
<log_file alias="idea.log" path="$PROJECT_DIR$/jetbrains-gateway/build/idea-sandbox/system/log/idea.log" />
4+
<ExternalSystemSettings>
5+
<option name="executionName" />
6+
<option name="externalProjectPath" value="$PROJECT_DIR$/jetbrains-gateway" />
7+
<option name="externalSystemIdString" value="GRADLE" />
8+
<option name="scriptParameters" value="-PideProfileName=2023.1" />
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+
<ForceTestExec>false</ForceTestExec>
23+
<method v="2" />
24+
</configuration>
25+
</component>

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

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,25 @@
11
<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>
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" />
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+
<ForceTestExec>false</ForceTestExec>
23+
<method v="2" />
24+
</configuration>
25+
</component>

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

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="Run IDE - Rider [2023.1]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2023.1">
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=2023.1" />
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+
<ForceTestExec>false</ForceTestExec>
23+
<method v="2" />
24+
</configuration>
25+
</component>

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

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="Run IDE - Ultimate [2023.1]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2023.1">
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=2023.1" />
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+
<ForceTestExec>false</ForceTestExec>
23+
<method v="2" />
24+
</configuration>
25+
</component>

‎build.gradle.kts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,3 +64,8 @@ if (idea.project != null) { // may be null during script compilation
6464
fun org.gradle.plugins.ide.idea.model.IdeaProject.settings(configuration: ProjectSettings.() -> Unit) = (this as ExtensionAware).configure(configuration)
6565
fun ProjectSettings.taskTriggers(action: TaskTriggersConfig.() -> Unit, ) = (this as ExtensionAware).extensions.configure("taskTriggers", action)
6666

67+
// is there a better way to do this?
68+
// coverageReport has implicit dependency on 'test' outputs since the task outputs the test.exec file
69+
tasks.coverageReport {
70+
mustRunAfter(rootProject.subprojects.map { it.tasks.withType<AbstractTestTask>() })
71+
}

‎buildSrc/settings.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ dependencyResolutionManagement {
3939
content {
4040
// only allowed to pull snapshots of gradle-intellij-plugin from here
4141
includeModule("org.jetbrains.intellij", "org.jetbrains.intellij.gradle.plugin")
42+
includeModule("org.jetbrains.intellij.plugins", "gradle-intellij-plugin")
4243
}
4344
}
4445
}

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

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import org.gradle.api.Project
99
import org.gradle.api.provider.Provider
1010
import software.aws.toolkits.gradle.intellij.IdeVersions
1111
import java.io.IOException
12+
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion as KotlinVersionEnum
1213

1314
/**
1415
* Only run the given block if this build is running within a CI system (e.g. GitHub actions, CodeBuild etc)
@@ -21,18 +22,30 @@ fun Project.ciOnly(block: () -> Unit) {
2122

2223
fun Project.isCi() : Boolean = providers.environmentVariable("CI").isPresent
2324

24-
fun Project.jvmTarget(): Provider<JavaVersion> {
25+
fun Project.jvmTarget(): Provider<JavaVersion> = withCurrentProfileName {
26+
when (it) {
27+
"2021.3", "2022.1", "2022.2" -> JavaVersion.VERSION_11
28+
else -> JavaVersion.VERSION_17
29+
}
30+
}
31+
32+
// https://plugins.jetbrains.com/docs/intellij/using-kotlin.html#other-bundled-kotlin-libraries
33+
fun Project.kotlinTarget(): Provider<String> = withCurrentProfileName {
34+
when (it) {
35+
"2021.3" -> KotlinVersionEnum.KOTLIN_1_5
36+
"2022.1", "2022.2" -> KotlinVersionEnum.KOTLIN_1_6
37+
"2022.3" -> KotlinVersionEnum.KOTLIN_1_7
38+
else -> KotlinVersionEnum.KOTLIN_1_8
39+
}.version
40+
}
41+
42+
private fun<T : Any> Project.withCurrentProfileName(consumer: (String) -> T): Provider<T> {
2543
val name = IdeVersions.ideProfile(providers).map { it.name }
2644
return name.map {
27-
when (it) {
28-
"2021.3", "2022.1", "2022.2" -> JavaVersion.VERSION_11
29-
else -> JavaVersion.VERSION_17
30-
}
45+
consumer(it)
3146
}
3247
}
3348

34-
val kotlinTarget = "1.5"
35-
3649
fun Project.buildMetadata() =
3750
try {
3851
val git = Git.open(rootDir)

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

Lines changed: 54 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -147,28 +147,26 @@ object IdeVersions {
147147
),
148148
Profile(
149149
name = "2022.3",
150-
// allow the next MV so customers potentially don't need to wait for us to deploy new EAP
151-
// also gateway:latest can point to next MV and we don't have a good strategy to support this yet
152-
untilVersion = "224.*",
153150
gateway = ProductProfile(
154151
sdkFlavor = IdeFlavor.GW,
155152
sdkVersion = "223.7571-EAP-CANDIDATE-SNAPSHOT",
156153
plugins = arrayOf("org.jetbrains.plugins.terminal")
157154
),
158155
community = ProductProfile(
159156
sdkFlavor = IdeFlavor.IC,
160-
sdkVersion = "2022.3",
157+
// test failure related to null notification contexts in 2022.3
158+
sdkVersion = "2022.3.1",
161159
plugins = commonPlugins223 + listOf(
162160
"java",
163161
"com.intellij.gradle",
164162
"org.jetbrains.idea.maven",
165-
"PythonCore:223.7571.182",
166-
"Docker:223.7571.233"
163+
"PythonCore:223.8214.16",
164+
"Docker:223.8214.64"
167165
)
168166
),
169167
ultimate = ProductProfile(
170168
sdkFlavor = IdeFlavor.IU,
171-
sdkVersion = "2022.3",
169+
sdkVersion = "2022.3.1",
172170
plugins = commonPlugins223 + listOf(
173171
"JavaScript",
174172
// Transitive dependency needed for javascript
@@ -177,21 +175,65 @@ object IdeVersions {
177175
"JavaScriptDebugger",
178176
"com.intellij.database",
179177
"com.jetbrains.codeWithMe",
180-
"Pythonid:223.7571.182",
181-
"org.jetbrains.plugins.go:223.7571.182",
178+
"Pythonid:223.8214.52",
179+
"org.jetbrains.plugins.go:223.8214.52",
182180
// https://github.com/JetBrains/gradle-intellij-plugin/issues/1056
183181
"org.intellij.intelliLang"
184182
)
185183
),
186184
rider = RiderProfile(
187-
// fix is in 2022.3.1: https://youtrack.jetbrains.com/issue/RIDER-86051
188-
sdkVersion = "2022.3-SNAPSHOT",
185+
sdkVersion = "2022.3.1",
189186
plugins = commonPlugins223 + listOf(
190187
"rider-plugins-appender" // Workaround for https://youtrack.jetbrains.com/issue/IDEA-179607
191188
),
192189
netFrameworkTarget = "net472",
193190
rdGenVersion = "2022.3.4",
194-
nugetVersion = "2022.3.0"
191+
nugetVersion = "2022.3.1"
192+
)
193+
),
194+
Profile(
195+
name = "2023.1",
196+
gateway = ProductProfile(
197+
sdkFlavor = IdeFlavor.GW,
198+
sdkVersion = "231.8109-EAP-CANDIDATE-SNAPSHOT",
199+
plugins = arrayOf("org.jetbrains.plugins.terminal")
200+
),
201+
community = ProductProfile(
202+
sdkFlavor = IdeFlavor.IC,
203+
sdkVersion = "231.8109-EAP-CANDIDATE-SNAPSHOT",
204+
plugins = commonPlugins223 + listOf(
205+
"java",
206+
"com.intellij.gradle",
207+
"org.jetbrains.idea.maven",
208+
"PythonCore:231.8109.90",
209+
"Docker:231.8109.91"
210+
)
211+
),
212+
ultimate = ProductProfile(
213+
sdkFlavor = IdeFlavor.IU,
214+
sdkVersion = "231.8109-EAP-CANDIDATE-SNAPSHOT",
215+
plugins = commonPlugins223 + listOf(
216+
"JavaScript",
217+
// Transitive dependency needed for javascript
218+
// Can remove when https://github.com/JetBrains/gradle-intellij-plugin/issues/608 is fixed
219+
"com.intellij.css",
220+
"JavaScriptDebugger",
221+
"com.intellij.database",
222+
"com.jetbrains.codeWithMe",
223+
"Pythonid:231.8109.90",
224+
"org.jetbrains.plugins.go:231.8109.90",
225+
// https://github.com/JetBrains/gradle-intellij-plugin/issues/1056
226+
"org.intellij.intelliLang"
227+
)
228+
),
229+
rider = RiderProfile(
230+
sdkVersion = "2023.1-EAP8-SNAPSHOT",
231+
plugins = commonPlugins223 + listOf(
232+
"rider-plugins-appender" // Workaround for https://youtrack.jetbrains.com/issue/IDEA-179607
233+
),
234+
netFrameworkTarget = "net472",
235+
rdGenVersion = "2023.1.2",
236+
nugetVersion = "2023.1.0-eap08"
195237
)
196238
),
197239

0 commit comments

Comments
 (0)