Skip to content

Commit ad2686e

Browse files
shalom938shalom938
authored
Merge pull request #2659 from digma-ai/support-2025-eap
Support 2025.1 eap
2 parents 3846f9b + b110839 commit ad2686e

File tree

10 files changed

+26
-30
lines changed

10 files changed

+26
-30
lines changed

‎.github/workflows/build-branches.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
build-workflow:
1010
strategy:
1111
matrix:
12-
profile: [ p231, p232, p233, p241, p242, p243 ]
12+
profile: [ p231, p232, p233, p241, p242, p243, p251 ]
1313
uses: ./.github/workflows/build-workflow.yml
1414
with:
1515
build-profile: ${{ matrix.profile }}
@@ -19,7 +19,7 @@ jobs:
1919
build-workflow-with-rider:
2020
strategy:
2121
matrix:
22-
profile: [ p231, p232, p233, p241, p242, p243 ]
22+
profile: [ p231, p232, p233, p241, p242, p243, p251 ]
2323
uses: ./.github/workflows/build-workflow.yml
2424
with:
2525
build-profile: ${{ matrix.profile }}
@@ -31,7 +31,7 @@ jobs:
3131
# plugin-verifier-workflow:
3232
# strategy:
3333
# matrix:
34-
# profile: [ p231, p232, p233, p241, p242 ]
34+
# profile: [ p231, p232, p233, p241, p242, p251 ]
3535
# uses: ./.github/workflows/plugin-verifier-workflow.yml
3636
# with:
3737
# build-profile: ${{ matrix.profile }}

‎.github/workflows/build-main.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
build-workflow:
88
strategy:
99
matrix:
10-
profile: [ p231, p232, p233, p241, p242, p243 ]
10+
profile: [ p231, p232, p233, p241, p242, p243, p251 ]
1111
uses: ./.github/workflows/build-workflow.yml
1212
with:
1313
build-profile: ${{ matrix.profile }}
@@ -18,7 +18,7 @@ jobs:
1818
build-workflow-with-rider:
1919
strategy:
2020
matrix:
21-
profile: [ p231, p232, p233, p241, p242, p243 ]
21+
profile: [ p231, p232, p233, p241, p242, p243, p251 ]
2222
uses: ./.github/workflows/build-workflow.yml
2323
with:
2424
build-profile: ${{ matrix.profile }}
@@ -29,7 +29,7 @@ jobs:
2929
plugin-verifier-workflow:
3030
strategy:
3131
matrix:
32-
profile: [ p231, p232, p233, p241, p242, p243 ]
32+
profile: [ p231, p232, p233, p241, p242, p243, p251 ]
3333
uses: ./.github/workflows/plugin-verifier-workflow.yml
3434
with:
3535
build-profile: ${{ matrix.profile }}

‎.github/workflows/build-pull-request.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
build-workflow:
99
strategy:
1010
matrix:
11-
profile: [ p231, p232, p233, p241, p242, p243 ]
11+
profile: [ p231, p232, p233, p241, p242, p243, p251 ]
1212
uses: ./.github/workflows/build-workflow.yml
1313
with:
1414
build-profile: ${{ matrix.profile }}
@@ -19,7 +19,7 @@ jobs:
1919
build-workflow-with-rider:
2020
strategy:
2121
matrix:
22-
profile: [ p231, p232, p233, p241, p242, p243 ]
22+
profile: [ p231, p232, p233, p241, p242, p243, p251 ]
2323
uses: ./.github/workflows/build-workflow.yml
2424
with:
2525
build-profile: ${{ matrix.profile }}
@@ -30,7 +30,7 @@ jobs:
3030
plugin-verifier-workflow:
3131
strategy:
3232
matrix:
33-
profile: [ p231, p232, p233, p241, p242, p243 ]
33+
profile: [ p231, p232, p233, p241, p242, p243, p251 ]
3434
uses: ./.github/workflows/plugin-verifier-workflow.yml
3535
with:
3636
build-profile: ${{ matrix.profile }}

‎.github/workflows/publish-to-jetbrains-and-increment-version.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
publish-workflow:
1414
strategy:
1515
matrix:
16-
profile: [ p231, p232, p233, p241, p242, p243 ]
16+
profile: [ p231, p232, p233, p241, p242, p243, p251 ]
1717
uses: ./.github/workflows/publish-workflow.yml
1818
with:
1919
build-profile: ${{ matrix.profile }}

‎build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ plugins {
2121
id("plugin-project")
2222
id("org.jetbrains.changelog") version "2.2.0"
2323
id("org.jetbrains.qodana") version "0.1.13"
24-
id("org.jetbrains.kotlinx.kover") version "0.7.5"
24+
id("org.jetbrains.kotlinx.kover") version "0.9.1"
2525

2626
}
2727

@@ -250,7 +250,7 @@ tasks {
250250
//to upgrade gradle change the version here and run:
251251
//./gradlew wrapper --gradle-version 8.8
252252
//check that gradle/wrapper/gradle-wrapper.properties was changed
253-
gradleVersion = "8.11"
253+
gradleVersion = "8.12.1"
254254
distributionType = Wrapper.DistributionType.ALL
255255
distributionBase = Wrapper.PathBase.GRADLE_USER_HOME
256256
distributionPath = "wrapper/dists"

‎common-build-logic/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ repositories {
1313
dependencies {
1414
//when updating intellij-platform-gradle-plugin update also org.jetbrains.intellij.platform.settings plugin
1515
// in settings file to the same version. we need to maintain it in two places, unfortunately.
16-
implementation("org.jetbrains.intellij.platform:intellij-platform-gradle-plugin:2.1.0") // Update also org.jetbrains.intellij.platform.settings in settings.gradle.kts
17-
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21")
16+
implementation("org.jetbrains.intellij.platform:intellij-platform-gradle-plugin:2.2.1") // Update also org.jetbrains.intellij.platform.settings in settings.gradle.kts
17+
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.10")
1818
implementation("com.glovoapp.gradle:versioning:1.1.10")
1919
implementation("de.undercouch:gradle-download-task:5.6.0")
2020
}

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

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -218,8 +218,8 @@ object BuildProfiles {
218218

219219
Profile.p243 to BuildProfile(
220220
profile = Profile.p243,
221-
platformVersion = "2024.3.1.1",
222-
riderVersion = "2024.3.3",
221+
platformVersion = "2024.3.2.1",
222+
riderVersion = "2024.3.4",
223223
pycharmVersion = "2024.3",
224224
riderTargetFramework = "net8.0",
225225
riderResharperVersionConstant = "PROFILE_2023_2;PROFILE_2024_3",
@@ -231,18 +231,17 @@ object BuildProfiles {
231231
javaVersion = JavaVersion.VERSION_21.majorVersion,
232232
),
233233

234-
//todo: next EAP
235234
Profile.p251 to BuildProfile(
236235
isEAP = true,
237236
profile = Profile.p243,
238-
platformVersion = "2024.3",
239-
riderVersion = "2024.3",
240-
pycharmVersion = "2024.3",
237+
platformVersion = "251.17181-EAP-CANDIDATE-SNAPSHOT",
238+
riderVersion = "2025.1-EAP1-SNAPSHOT",
239+
pycharmVersion = "251-EAP-SNAPSHOT",
241240
riderTargetFramework = "net8.0",
242241
riderResharperVersionConstant = "PROFILE_2023_2;PROFILE_2024_3",
243-
platformVersionCode = "243",
244-
pluginSinceBuild = "243",
245-
pluginUntilBuild = "243.*",
242+
platformVersionCode = "251",
243+
pluginSinceBuild = "251",
244+
pluginUntilBuild = "251.*",
246245
kotlinTarget = KotlinVersion.KOTLIN_2_0,
247246
kotlinJvmTarget = JvmTarget.JVM_21,
248247
javaVersion = JavaVersion.VERSION_21.majorVersion,

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

Lines changed: 2 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.p242
11-
"eap" -> BuildProfiles.Profile.p243
10+
"latest" -> BuildProfiles.Profile.p243
11+
"eap" -> BuildProfiles.Profile.p251
1212
else -> BuildProfiles.Profile.valueOf(profile)
1313
}
1414

‎gradle.properties‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,5 @@ org.jetbrains.intellij.platform.downloadSources=true
5353

5454
### Intellij platform gradle plugin properties END
5555

56-
## todo: this disables kotlin incremental compilation, without disabling build fails with kotlin jvm 2.0.20
57-
## try to remove it and test if the build passes
58-
## see https://kotlinlang.org/docs/gradle-compilation-and-caches.html#incremental-compilation
59-
## see https://kotlinlang.org/docs/whatsnew2020.html#deprecated-incremental-compilation-based-on-jvm-history-files
56+
## todo: build fails with useClasspathSnapshot
6057
kotlin.incremental.useClasspathSnapshot=false

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-all.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)