Skip to content

Commit 5f7ca5d

Browse files
tamarinvs19tamarinvs19
committed
Add setup ideVersion
1 parent 204d172 commit 5f7ca5d

File tree

8 files changed

+179
-49
lines changed

8 files changed

+179
-49
lines changed

‎.github/workflows/publish-plugin-from-branch.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
- plugin_type: IU
5050
extra_options: "-PideType=IU -PprojectType=Ultimate"
5151
- plugin_type: PY
52-
extra_options: "-PideType=PY -PprojectType=Ultimate -PideVersion=2023.2"
52+
extra_options: "-PideType=PY -PprojectType=Ultimate"
5353
runs-on: ubuntu-20.04
5454
container: unittestbot/java-env:java17-zulu-jdk-gradle7.6.1-kotlinc1.8.0
5555
steps:

‎gradle.properties‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
kotlin.code.style=official
22

3-
#Project Type
3+
# === IDE settings ===
4+
# Project Type
45
# - Community: for Java + Spring + Python (IC supported features)
56
# - Ultimate: for Java + Spring + Python (IU supported features) + JavaScript + Go
67
projectType=Ultimate
@@ -11,9 +12,8 @@ ultimateEdition=Ultimate
1112
# IU, IC, PC, PY
1213
# IC for AndroidStudio
1314
ideType=IC
14-
ideVersion=232.8660.185
15-
#ideVersion=2023.2
16-
pycharmIdeVersion=2023.2
15+
ideaVersion=232.8660.185
16+
pycharmVersion=2023.2
1717
# ALL, NOJS
1818
buildType=NOJS
1919

@@ -22,6 +22,7 @@ pythonIde=IC,IU,PC,PY
2222
jsIde=IU,PY
2323
jsBuild=ALL
2424
goIde=IU,GO
25+
androidStudioIde=IC
2526

2627
# In order to run Android Studio instead of IntelliJ Community, specify the path to your Android Studio installation
2728
#androidStudioPath=your_path_to_android_studio
@@ -32,6 +33,7 @@ pythonCommunityPluginVersion=232.8660.185
3233
pythonUltimatePluginVersion=232.8660.185
3334
# Version numbers: https://plugins.jetbrains.com/plugin/9568-go/versions
3435
goPluginVersion=232.8660.142
36+
# === IDE settings ===
3537

3638
junit5Version=5.8.2
3739
junit4Version=4.13.2

‎utbot-intellij-go/build.gradle.kts‎

Lines changed: 30 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,45 @@
1-
val projectType: String by rootProject
2-
val communityEdition: String by rootProject
3-
val ultimateEdition: String by rootProject
41
val intellijPluginVersion: String? by rootProject
52
val kotlinLoggingVersion: String? by rootProject
63
val apacheCommonsTextVersion: String? by rootProject
74
val jacksonVersion: String? by rootProject
8-
val ideType: String? by rootProject
9-
val ideVersion: String by rootProject
105
val kotlinPluginVersion: String by rootProject
6+
7+
// === IDE settings ===
8+
val projectType: String by rootProject
9+
val communityEdition: String by rootProject
10+
val ultimateEdition: String by rootProject
11+
12+
val ideType: String by rootProject
13+
val androidStudioPath: String? by rootProject
14+
15+
val ideaVersion: String? by rootProject
16+
val pycharmVersion: String? by rootProject
17+
val goVersion: String? by rootProject
18+
19+
val javaIde: String? by rootProject
20+
val pythonIde: String? by rootProject
21+
val jsIde: String? by rootProject
22+
val goIde: String? by rootProject
23+
24+
val ideVersion = when(ideType) {
25+
"PC", "PY" -> pycharmVersion
26+
"GO" -> goVersion
27+
else -> ideaVersion
28+
}
29+
1130
val pythonCommunityPluginVersion: String? by rootProject
1231
val pythonUltimatePluginVersion: String? by rootProject
1332
val goPluginVersion: String? by rootProject
14-
val androidStudioPath: String? by rootProject
33+
34+
// https://plugins.jetbrains.com/docs/intellij/android-studio.html#configuring-the-plugin-pluginxml-file
35+
val ideTypeOrAndroidStudio = if (androidStudioPath == null) ideType else "IC"
36+
37+
project.tasks.asMap["runIde"]?.enabled = false
38+
// === IDE settings ===
1539

1640
plugins {
1741
id("org.jetbrains.intellij") version "1.13.1"
1842
}
19-
project.tasks.asMap["runIde"]?.enabled = false
2043

2144
tasks {
2245
compileKotlin {

‎utbot-intellij-js/build.gradle.kts‎

Lines changed: 30 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,44 @@
1-
val projectType: String by rootProject
2-
val communityEdition: String by rootProject
3-
val ultimateEdition: String by rootProject
41
val intellijPluginVersion: String? by rootProject
52
val kotlinLoggingVersion: String? by rootProject
63
val apacheCommonsTextVersion: String? by rootProject
74
val jacksonVersion: String? by rootProject
8-
val ideType: String? by rootProject
9-
val ideVersion: String? by rootProject
5+
6+
// === IDE settings ===
7+
val projectType: String by rootProject
8+
val communityEdition: String by rootProject
9+
val ultimateEdition: String by rootProject
10+
11+
val ideType: String by rootProject
12+
val androidStudioPath: String? by rootProject
13+
14+
val ideaVersion: String? by rootProject
15+
val pycharmVersion: String? by rootProject
16+
val goVersion: String? by rootProject
17+
18+
val javaIde: String? by rootProject
19+
val pythonIde: String? by rootProject
20+
val jsIde: String? by rootProject
21+
val goIde: String? by rootProject
22+
23+
val ideVersion = when(ideType) {
24+
"PC", "PY" -> pycharmVersion
25+
"GO" -> goVersion
26+
else -> ideaVersion
27+
}
28+
1029
val pythonCommunityPluginVersion: String? by rootProject
1130
val pythonUltimatePluginVersion: String? by rootProject
1231
val goPluginVersion: String? by rootProject
13-
val androidStudioPath: String? by rootProject
32+
33+
// https://plugins.jetbrains.com/docs/intellij/android-studio.html#configuring-the-plugin-pluginxml-file
34+
val ideTypeOrAndroidStudio = if (androidStudioPath == null) ideType else "IC"
35+
36+
project.tasks.asMap["runIde"]?.enabled = false
37+
// === IDE settings ===
1438

1539
plugins {
1640
id("org.jetbrains.intellij") version "1.13.1"
1741
}
18-
project.tasks.asMap["runIde"]?.enabled = false
1942

2043
tasks {
2144
compileKotlin {

‎utbot-intellij-main/build.gradle.kts‎

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,40 @@
1+
val semVer: String? by rootProject
2+
val junit5Version: String by rootProject
3+
val junit4PlatformVersion: String by rootProject
4+
5+
// === IDE settings ===
16
val projectType: String by rootProject
27
val communityEdition: String by rootProject
38
val ultimateEdition: String by rootProject
49

5-
val ideType: String? by rootProject
6-
val ideVersion: String? by rootProject
7-
val pythonCommunityPluginVersion: String? by rootProject
8-
val pythonUltimatePluginVersion: String? by rootProject
9-
val goPluginVersion: String? by rootProject
10+
val ideType: String by rootProject
11+
val androidStudioPath: String? by rootProject
12+
13+
val ideaVersion: String? by rootProject
14+
val pycharmVersion: String? by rootProject
15+
val goVersion: String? by rootProject
1016

1117
val javaIde: String? by rootProject
1218
val pythonIde: String? by rootProject
1319
val jsIde: String? by rootProject
1420
val goIde: String? by rootProject
1521

16-
val semVer: String? by rootProject
17-
val androidStudioPath: String? by rootProject
22+
val ideVersion = when(ideType) {
23+
"PC", "PY" -> pycharmVersion
24+
"GO" -> goVersion
25+
else -> ideaVersion
26+
}
1827

19-
val junit5Version: String by rootProject
20-
val junit4PlatformVersion: String by rootProject
28+
val pythonCommunityPluginVersion: String? by rootProject
29+
val pythonUltimatePluginVersion: String? by rootProject
30+
val goPluginVersion: String? by rootProject
2131

2232
// https://plugins.jetbrains.com/docs/intellij/android-studio.html#configuring-the-plugin-pluginxml-file
2333
val ideTypeOrAndroidStudio = if (androidStudioPath == null) ideType else "IC"
2434

35+
project.tasks.asMap["runIde"]?.enabled = false
36+
// === IDE settings ===
37+
2538
plugins {
2639
id("org.jetbrains.intellij") version "1.13.1"
2740
}

‎utbot-intellij-python/build.gradle.kts‎

Lines changed: 30 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,44 @@
1-
val projectType: String by rootProject
2-
val communityEdition: String by rootProject
3-
val ultimateEdition: String by rootProject
41
val intellijPluginVersion: String? by rootProject
52
val kotlinLoggingVersion: String? by rootProject
63
val apacheCommonsTextVersion: String? by rootProject
74
val jacksonVersion: String? by rootProject
8-
val ideType: String? by rootProject
9-
val ideVersion: String by rootProject
5+
6+
// === IDE settings ===
7+
val projectType: String by rootProject
8+
val communityEdition: String by rootProject
9+
val ultimateEdition: String by rootProject
10+
11+
val ideType: String by rootProject
12+
val androidStudioPath: String? by rootProject
13+
14+
val ideaVersion: String? by rootProject
15+
val pycharmVersion: String? by rootProject
16+
val goVersion: String? by rootProject
17+
18+
val javaIde: String? by rootProject
19+
val pythonIde: String? by rootProject
20+
val jsIde: String? by rootProject
21+
val goIde: String? by rootProject
22+
23+
val ideVersion = when(ideType) {
24+
"PC", "PY" -> pycharmVersion
25+
"GO" -> goVersion
26+
else -> ideaVersion
27+
}
28+
1029
val pythonCommunityPluginVersion: String? by rootProject
1130
val pythonUltimatePluginVersion: String? by rootProject
1231
val goPluginVersion: String? by rootProject
13-
val androidStudioPath: String? by rootProject
32+
33+
// https://plugins.jetbrains.com/docs/intellij/android-studio.html#configuring-the-plugin-pluginxml-file
34+
val ideTypeOrAndroidStudio = if (androidStudioPath == null) ideType else "IC"
35+
36+
project.tasks.asMap["runIde"]?.enabled = false
37+
// === IDE settings ===
1438

1539
plugins {
1640
id("org.jetbrains.intellij") version "1.13.1"
1741
}
18-
project.tasks.asMap["runIde"]?.enabled = false
1942

2043
tasks {
2144
compileKotlin {

‎utbot-intellij/build.gradle.kts‎

Lines changed: 28 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,48 @@
1-
val projectType: String by rootProject
2-
val communityEdition: String by rootProject
3-
val ultimateEdition: String by rootProject
4-
51
val intellijPluginVersion: String? by rootProject
62
val kotlinLoggingVersion: String? by rootProject
73
val apacheCommonsTextVersion: String? by rootProject
84
val jacksonVersion: String? by rootProject
95

10-
val ideType: String? by rootProject
11-
val ideVersion: String? by rootProject
12-
val pythonCommunityPluginVersion: String? by rootProject
13-
val pythonUltimatePluginVersion: String? by rootProject
14-
val goPluginVersion: String? by rootProject
15-
166
val sootVersion: String? by rootProject
177
val kryoVersion: String? by rootProject
188
val rdVersion: String? by rootProject
199
val semVer: String? by rootProject
20-
val androidStudioPath: String? by rootProject
2110

2211
val junit5Version: String by rootProject
2312
val junit4PlatformVersion: String by rootProject
2413

14+
// === IDE settings ===
15+
val projectType: String by rootProject
16+
val communityEdition: String by rootProject
17+
val ultimateEdition: String by rootProject
18+
19+
val ideType: String by rootProject
20+
val androidStudioPath: String? by rootProject
21+
22+
val ideaVersion: String? by rootProject
23+
val pycharmVersion: String? by rootProject
24+
val goVersion: String? by rootProject
25+
26+
val javaIde: String? by rootProject
27+
val pythonIde: String? by rootProject
28+
val jsIde: String? by rootProject
29+
val goIde: String? by rootProject
30+
31+
val ideVersion = when(ideType) {
32+
"PC", "PY" -> pycharmVersion
33+
"GO" -> goVersion
34+
else -> ideaVersion
35+
}
36+
37+
val pythonCommunityPluginVersion: String? by rootProject
38+
val pythonUltimatePluginVersion: String? by rootProject
39+
val goPluginVersion: String? by rootProject
40+
2541
// https://plugins.jetbrains.com/docs/intellij/android-studio.html#configuring-the-plugin-pluginxml-file
2642
val ideTypeOrAndroidStudio = if (androidStudioPath == null) ideType else "IC"
2743

2844
project.tasks.asMap["runIde"]?.enabled = false
45+
// === IDE settings ===
2946

3047
plugins {
3148
id("org.jetbrains.intellij") version "1.13.1"

‎utbot-ui-commons/build.gradle.kts‎

Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,43 @@
11
val kotlinLoggingVersion: String by rootProject
2-
val ideType: String by rootProject
3-
val ideVersion: String by rootProject
42
val semVer: String? by rootProject
53
val slf4jVersion: String by rootProject
4+
5+
// === IDE settings ===
6+
val projectType: String by rootProject
7+
val communityEdition: String by rootProject
8+
val ultimateEdition: String by rootProject
9+
10+
val ideType: String by rootProject
611
val androidStudioPath: String? by rootProject
712

13+
val ideaVersion: String? by rootProject
14+
val pycharmVersion: String? by rootProject
15+
val goVersion: String? by rootProject
16+
17+
val javaIde: String? by rootProject
18+
val pythonIde: String? by rootProject
19+
val jsIde: String? by rootProject
20+
val goIde: String? by rootProject
21+
22+
val ideVersion = when(ideType) {
23+
"PC", "PY" -> pycharmVersion
24+
"GO" -> goVersion
25+
else -> ideaVersion
26+
}
27+
28+
val pythonCommunityPluginVersion: String? by rootProject
29+
val pythonUltimatePluginVersion: String? by rootProject
30+
val goPluginVersion: String? by rootProject
31+
32+
// https://plugins.jetbrains.com/docs/intellij/android-studio.html#configuring-the-plugin-pluginxml-file
33+
val ideTypeOrAndroidStudio = if (androidStudioPath == null) ideType else "IC"
34+
35+
project.tasks.asMap["runIde"]?.enabled = false
36+
// === IDE settings ===
37+
838
plugins {
939
id("org.jetbrains.intellij") version "1.13.1"
1040
}
11-
project.tasks.asMap["runIde"]?.enabled = false
1241

1342
intellij {
1443
version.set(ideVersion)

0 commit comments

Comments
 (0)