Skip to content

Commit 839da4d

Browse files
authored
Merge pull request #2038 from digma-ai/update-build-profile-to-2024.1
update build profile to 2024.1 release
2 parents ea99380 + 5085a9a commit 839da4d

File tree

6 files changed

+158
-6
lines changed

6 files changed

+158
-6
lines changed
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="Run IDEA Community - 2024.2" type="GradleRunConfiguration"
3+
factoryName="Gradle">
4+
<log_file alias="idea.log" path="$PROJECT_DIR$/build/idea-sandbox/system/log/idea_IC.log"/>
5+
<ExternalSystemSettings>
6+
<option name="executionName"/>
7+
<option name="externalProjectPath" value="$PROJECT_DIR$"/>
8+
<option name="externalSystemIdString" value="GRADLE"/>
9+
<option name="scriptParameters" value="-PbuildProfile=p242"/>
10+
<option name="taskDescriptions">
11+
<list/>
12+
</option>
13+
<option name="taskNames">
14+
<list>
15+
<option value="buildPlugin"/>
16+
<option value="runIde"/>
17+
</list>
18+
</option>
19+
<option name="vmOptions" value=""/>
20+
</ExternalSystemSettings>
21+
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
22+
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
23+
<DebugAllEnabled>false</DebugAllEnabled>
24+
<RunAsTest>false</RunAsTest>
25+
<method v="2"/>
26+
</configuration>
27+
</component>
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="Run IDEA Ultimate - 2024.2" type="GradleRunConfiguration" factoryName="Gradle">
3+
<log_file alias="idea.log" path="$PROJECT_DIR$/build/idea-sandbox/system/log/idea_IU.log"/>
4+
<ExternalSystemSettings>
5+
<option name="executionName"/>
6+
<option name="externalProjectPath" value="$PROJECT_DIR$"/>
7+
<option name="externalSystemIdString" value="GRADLE"/>
8+
<option name="scriptParameters" value="-PbuildWIthUltimate=true -PbuildProfile=p242"/>
9+
<option name="taskDescriptions">
10+
<list/>
11+
</option>
12+
<option name="taskNames">
13+
<list>
14+
<option value="buildPlugin"/>
15+
<option value="runIde"/>
16+
</list>
17+
</option>
18+
<option name="vmOptions" value=""/>
19+
</ExternalSystemSettings>
20+
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
21+
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
22+
<DebugAllEnabled>false</DebugAllEnabled>
23+
<RunAsTest>false</RunAsTest>
24+
<method v="2"/>
25+
</configuration>
26+
</component>

.run/Run Pycharm - 2024.2.run.xml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="Run Pycharm - 2024.2" type="GradleRunConfiguration" factoryName="Gradle">
3+
<log_file alias="idea.log" path="$PROJECT_DIR$/build/idea-sandbox/system/log/idea_PC.log"/>
4+
<ExternalSystemSettings>
5+
<option name="executionName"/>
6+
<option name="externalProjectPath" value="$PROJECT_DIR$"/>
7+
<option name="externalSystemIdString" value="GRADLE"/>
8+
<option name="scriptParameters" value="-PbuildWithPycharm=true -PbuildProfile=p242"/>
9+
<option name="taskDescriptions">
10+
<list/>
11+
</option>
12+
<option name="taskNames">
13+
<list>
14+
<option value="buildPlugin"/>
15+
<option value="runIde"/>
16+
</list>
17+
</option>
18+
<option name="vmOptions" value=""/>
19+
</ExternalSystemSettings>
20+
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
21+
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
22+
<DebugAllEnabled>false</DebugAllEnabled>
23+
<RunAsTest>false</RunAsTest>
24+
<method v="2"/>
25+
</configuration>
26+
</component>
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="Run Pycharm Pro - 2024.2" type="GradleRunConfiguration" factoryName="Gradle">
3+
<log_file alias="idea.log" path="$PROJECT_DIR$/build/idea-sandbox/system/log/idea_PY.log"/>
4+
<ExternalSystemSettings>
5+
<option name="executionName"/>
6+
<option name="externalProjectPath" value="$PROJECT_DIR$"/>
7+
<option name="externalSystemIdString" value="GRADLE"/>
8+
<option name="scriptParameters" value="-PbuildWithPycharmPro=true -PbuildProfile=p242"/>
9+
<option name="taskDescriptions">
10+
<list/>
11+
</option>
12+
<option name="taskNames">
13+
<list>
14+
<option value="buildPlugin"/>
15+
<option value="runIde"/>
16+
</list>
17+
</option>
18+
<option name="vmOptions" value=""/>
19+
</ExternalSystemSettings>
20+
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
21+
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
22+
<DebugAllEnabled>false</DebugAllEnabled>
23+
<RunAsTest>false</RunAsTest>
24+
<method v="2"/>
25+
</configuration>
26+
</component>

.run/Run Rider - 2024.2.run.xml

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

buildSrc/src/main/kotlin/common/BuildProfile.kt

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ fun Project.currentProfile(): BuildProfile = BuildProfiles.currentProfile(this)
7070

7171
object BuildProfiles {
7272

73-
enum class Profiles { p223, p231, p232, p233, p241 }
73+
enum class Profiles { p223, p231, p232, p233, p241, p242 }
7474

7575
fun currentProfile(project: Project): BuildProfile {
7676

@@ -92,7 +92,7 @@ object BuildProfiles {
9292
private val profileAliases = mapOf(
9393
"lowest" to Profiles.p223.name,
9494
"latest" to Profiles.p233.name,
95-
"eap" to Profiles.p241.name,
95+
"eap" to Profiles.p242.name,
9696
)
9797

9898

@@ -175,24 +175,45 @@ object BuildProfiles {
175175
javaVersion = JavaVersion.VERSION_17.majorVersion
176176
),
177177

178-
//EAP
178+
179179
Profiles.p241 to BuildProfile(
180180

181181
profile = Profiles.p241,
182+
platformVersion = "2024.1",
183+
riderVersion = "2024.1-EAP9-SNAPSHOT",
184+
pycharmVersion = "2024.1",
185+
riderResharperVersion = "2024.1-eap09",
186+
riderResharperVersionConstant = "PROFILE_2023_2",
187+
pythonPluginVersion = "241.14494.240",
188+
platformVersionCode = "241",
189+
pluginSinceBuild = "241",
190+
pluginUntilBuild = "241.*",
191+
versionToRunPluginVerifier = "2024.1",
192+
kotlinTarget = KotlinVersion.KOTLIN_1_8.version, //todo: maybe need to upgrade to 20
193+
javaVersion = JavaVersion.VERSION_17.majorVersion,
194+
),
195+
196+
//EAP
197+
//todo: currently same as 241, update to EAP when started, create launchers.
198+
// add to github matrix
199+
Profiles.p242 to BuildProfile(
200+
182201
isEAP = true,
183-
platformVersion = "241-EAP-SNAPSHOT",
202+
profile = Profiles.p242,
203+
platformVersion = "2024.1",
184204
riderVersion = "2024.1-EAP9-SNAPSHOT",
185-
pycharmVersion = "241-EAP-SNAPSHOT",
205+
pycharmVersion = "2024.1",
186206
riderResharperVersion = "2024.1-eap09",
187207
riderResharperVersionConstant = "PROFILE_2023_2",
188-
pythonPluginVersion = "241.14494.158",
208+
pythonPluginVersion = "241.14494.240",
189209
platformVersionCode = "241",
190210
pluginSinceBuild = "241",
191211
pluginUntilBuild = "241.*",
192212
versionToRunPluginVerifier = "2024.1",
193213
kotlinTarget = KotlinVersion.KOTLIN_1_8.version, //todo: maybe need to upgrade to 20
194214
javaVersion = JavaVersion.VERSION_17.majorVersion,
195215
)
216+
196217
)
197218

198219
}

0 commit comments

Comments
 (0)