Skip to content

Commit 599084c

Browse files
shalom938shalom938
authored
Merge pull request #2379 from digma-ai/update-build-profiles
update build profiles
2 parents f92e7df + bd626f6 commit 599084c

File tree

5 files changed

+110
-10
lines changed

5 files changed

+110
-10
lines changed

‎.run/Run IDEA Community - 2024.3.run.xml‎

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.3" 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=p243"/>
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>

‎.run/Run IDEA Ultimate - 2024.3.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 IDEA Ultimate - 2024.3" 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=p243"/>
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.3.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.3" 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=p243"/>
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>

‎common-build-logic/src/main/kotlin/common/BuildProfile.kt‎

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ fun Project.useBinaryInstaller(): Boolean = !this.currentProfile().isEAP
7474

7575
object BuildProfiles {
7676

77-
enum class Profile { p231, p232, p233, p241, p242 }
77+
enum class Profile { p231, p232, p233, p241, p242, p243 }
7878

7979
fun Profile.greaterThan(other:Profile):Boolean{
8080
val thisNumber = this.name.substring(1).toInt()
@@ -102,8 +102,8 @@ object BuildProfiles {
102102
//update this list as new profiles are added or removed
103103
private val profileAliases = mapOf(
104104
"lowest" to Profile.p231.name,
105-
"latest" to Profile.p241.name,
106-
"eap" to Profile.p242.name,
105+
"latest" to Profile.p242.name,
106+
"eap" to Profile.p243.name,
107107
)
108108

109109

@@ -173,9 +173,9 @@ object BuildProfiles {
173173

174174
Profile.p241 to BuildProfile(
175175
profile = Profile.p241,
176-
platformVersion = "2024.1.4",
177-
riderVersion = "2024.1.4",
178-
pycharmVersion = "2024.1.4",
176+
platformVersion = "2024.1.5",
177+
riderVersion = "2024.1.5",
178+
pycharmVersion = "2024.1.5",
179179
riderTargetFramework = "net8.0",
180180
riderResharperVersionConstant = "PROFILE_2023_2",
181181
platformVersionCode = "241",
@@ -188,18 +188,38 @@ object BuildProfiles {
188188

189189

190190
Profile.p242 to BuildProfile(
191+
//todo: keeping this profile as EAP until rider 2024.2 is releases because there is no binary release of rider yet
192+
// that's instead of treating Idea and rider differently in build scripts
191193
isEAP = true,
194+
192195
profile = Profile.p242,
193-
platformVersion = "242-EAP-SNAPSHOT",
196+
platformVersion = "2024.2",
194197
riderVersion = "2024.2-EAP9-SNAPSHOT",
195-
pycharmVersion = "242-EAP-SNAPSHOT",
198+
pycharmVersion = "2024.2",
196199
riderTargetFramework = "net8.0",
197200
riderResharperVersionConstant = "PROFILE_2023_2",
198201
platformVersionCode = "242",
199202
pluginSinceBuild = "242",
200203
pluginUntilBuild = "242.*",
201204
kotlinTarget = KotlinVersion.KOTLIN_1_9.version,
202205
javaVersion = JavaVersion.VERSION_17.majorVersion,
206+
),
207+
208+
//todo: next EAP, currently same versions as 242 until 243 starts.
209+
// not built in github yet
210+
Profile.p243 to BuildProfile(
211+
isEAP = true,
212+
profile = Profile.p243,
213+
platformVersion = "2024.2",
214+
riderVersion = "2024.2-EAP9-SNAPSHOT",
215+
pycharmVersion = "2024.2",
216+
riderTargetFramework = "net8.0",
217+
riderResharperVersionConstant = "PROFILE_2023_2",
218+
platformVersionCode = "242",
219+
pluginSinceBuild = "243",
220+
pluginUntilBuild = "243.*",
221+
kotlinTarget = KotlinVersion.KOTLIN_1_9.version,
222+
javaVersion = JavaVersion.VERSION_17.majorVersion,
203223
)
204224

205225
)

‎common-build-logic/src/main/kotlin/common/rider/RiderCommon.kt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ fun rdGenVersion(profile: String): String {
77

88
val profileToUse: BuildProfiles.Profile = when (profile) {
99
"lowest" -> BuildProfiles.Profile.p231
10-
"latest" -> BuildProfiles.Profile.p241
11-
"eap" -> BuildProfiles.Profile.p242
10+
"latest" -> BuildProfiles.Profile.p242
11+
"eap" -> BuildProfiles.Profile.p243
1212
else -> BuildProfiles.Profile.valueOf(profile)
1313
}
1414

@@ -24,5 +24,6 @@ fun rdGenVersionByProfile(profile: BuildProfiles.Profile): String {
2424
BuildProfiles.Profile.p233 -> "2023.3.2"
2525
BuildProfiles.Profile.p241 -> "2023.3.2"
2626
BuildProfiles.Profile.p242 -> "2024.1.1"
27+
BuildProfiles.Profile.p243 -> "2024.1.1"
2728
}
2829
}

0 commit comments

Comments
 (0)