Skip to content

Commit 383b392

Browse files
Vassiliy-KudryashovVassiliy-Kudryashov
committed
Plugin compatibility with IDE 2022.3 (#1653)
1 parent a086199 commit 383b392

File tree

50 files changed

+523
-335
lines changed

Some content is hidden

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

50 files changed

+523
-335
lines changed

‎.github/workflows/build-and-run-tests-from-branch.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
matrix: ${{ fromJson(needs.prepare-matrices.outputs.framework-tests-matrix) }}
8080
runs-on: ubuntu-20.04
8181
container:
82-
image: unittestbot/java-env:java11-zulu-jdk-gradle7.4.2-kotlinc1.7.0
82+
image: unittestbot/java-env:java17-zulu-jdk-gradle7.6.1-kotlinc1.8.0
8383
volumes:
8484
- "/home/runner/runners:/home/runner/runners"
8585
- "/tmp/filebeat:/tmp/filebeat"
@@ -169,7 +169,7 @@ jobs:
169169
matrix: ${{ fromJson(needs.prepare-matrices.outputs.combined-projects-matrix) }}
170170
runs-on: ubuntu-20.04
171171
container:
172-
image: unittestbot/java-env:java11-zulu-jdk-gradle7.4.2-kotlinc1.7.0
172+
image: unittestbot/java-env:java17-zulu-jdk-gradle7.6.1-kotlinc1.8.0
173173
volumes:
174174
- "/home/runner/runners:/home/runner/runners"
175175
- "/tmp/filebeat:/tmp/filebeat"
@@ -245,7 +245,7 @@ jobs:
245245
project: [utbot-core, utbot-fuzzers, utbot-gradle, utbot-junit-contest, utbot-sample]
246246
runs-on: ubuntu-20.04
247247
container:
248-
image: unittestbot/java-env:java11-zulu-jdk-gradle7.4.2-kotlinc1.7.0
248+
image: unittestbot/java-env:java17-zulu-jdk-gradle7.6.1-kotlinc1.8.0
249249
volumes:
250250
- "/home/runner/runners:/home/runner/runners"
251251
- "/tmp/filebeat:/tmp/filebeat"

‎.github/workflows/build-and-run-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
directory: utbot-cli-python
4747
extra_options: ""
4848
runs-on: ubuntu-20.04
49-
container: unittestbot/java-env:java11-zulu-jdk-gradle7.4.2-kotlinc1.7.0
49+
container: unittestbot/java-env:java17-zulu-jdk-gradle7.6.1-kotlinc1.8.0
5050
steps:
5151
- uses: actions/checkout@v3
5252

‎.github/workflows/public-rider-plugin.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
public_rider_plugin:
3838
# The type of runner that the job will run on
3939
runs-on: ubuntu-20.04
40-
container: unittestbot/java-env:java11-zulu-jdk-gradle7.4.2-kotlinc1.7.0
40+
container: unittestbot/java-env:java17-zulu-jdk-gradle7.6.1-kotlinc1.8.0
4141

4242
# Steps represent a sequence of tasks that will be executed as part of the job
4343
steps:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
- plugin_type: IU
6363
extra_options: "-PideType=IU"
6464
runs-on: ubuntu-20.04
65-
container: unittestbot/java-env:java11-zulu-jdk-gradle7.4.2-kotlinc1.7.0
65+
container: unittestbot/java-env:java17-zulu-jdk-gradle7.6.1-kotlinc1.8.0
6666
steps:
6767
- uses: actions/checkout@v3
6868

‎.github/workflows/run-chosen-tests-from-branch.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ env:
3333
jobs:
3434
run-chosen-tests:
3535
runs-on: ubuntu-20.04
36-
container: unittestbot/java-env:java11-zulu-jdk-gradle7.4.2-kotlinc1.7.0
36+
container: unittestbot/java-env:java17-zulu-jdk-gradle7.6.1-kotlinc1.8.0
3737

3838
steps:
3939
- name: Print environment variables

‎build.gradle.kts

Lines changed: 49 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import java.text.SimpleDateFormat
2-
import org.gradle.api.JavaVersion.VERSION_11
2+
import org.gradle.api.JavaVersion.*
33
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
44

55
group = "org.utbot"
@@ -21,7 +21,7 @@ plugins {
2121

2222
configure<JavaPluginExtension> {
2323
sourceCompatibility = VERSION_11
24-
targetCompatibility = VERSION_11
24+
targetCompatibility = VERSION_17
2525
}
2626

2727
allprojects {
@@ -55,14 +55,57 @@ allprojects {
5555
withType<Test> {
5656
// uncomment if you want to see loggers output in console
5757
// this is useful if you debug in docker
58-
// testLogging.showStandardStreams = true
59-
// testLogging.showStackTraces = true
58+
testLogging.showStandardStreams = true
59+
testLogging.showStackTraces = true
6060

6161
// set heap size for the test JVM(s)
6262
minHeapSize = "128m"
6363
maxHeapSize = "3072m"
64-
65-
jvmArgs = listOf("-XX:MaxHeapSize=3072m")
64+
jvmArgs = listOf(
65+
"-XX:MaxHeapSize=3072m",
66+
"--add-opens", "java.base/java.lang.invoke=ALL-UNNAMED",
67+
"--add-opens", "java.base/java.util.concurrent=ALL-UNNAMED",
68+
"--add-opens", "java.base/java.util.concurrent.locks=ALL-UNNAMED",
69+
"--add-opens", "java.base/java.text=ALL-UNNAMED",
70+
"--add-opens", "java.base/sun.security.util=ALL-UNNAMED",
71+
"--add-opens", "java.base/sun.reflect.generics.repository=ALL-UNNAMED",
72+
"--add-opens", "java.base/java.security=ALL-UNNAMED",
73+
"--add-opens", "java.base/java.lang.ref=ALL-UNNAMED",
74+
"--add-opens", "java.base/java.math=ALL-UNNAMED",
75+
"--add-opens", "java.base/java.util.stream=ALL-UNNAMED",
76+
"--add-opens", "java.base/java.util=ALL-UNNAMED",
77+
"--add-opens", "java.base/jdk.internal.misc=ALL-UNNAMED",
78+
"--add-opens", "java.base/java.lang=ALL-UNNAMED",
79+
"--add-opens", "java.base/java.lang.reflect=ALL-UNNAMED",
80+
"--add-opens", "java.base/sun.security.provider=ALL-UNNAMED",
81+
"--add-opens", "java.base/jdk.internal.event=ALL-UNNAMED",
82+
"--add-opens", "java.base/jdk.internal.jimage=ALL-UNNAMED",
83+
"--add-opens", "java.base/jdk.internal.jimage.decompressor=ALL-UNNAMED",
84+
"--add-opens", "java.base/jdk.internal.jmod=ALL-UNNAMED",
85+
"--add-opens", "java.base/jdk.internal.jtrfs=ALL-UNNAMED",
86+
"--add-opens", "java.base/jdk.internal.loader=ALL-UNNAMED",
87+
"--add-opens", "java.base/jdk.internal.logger=ALL-UNNAMED",
88+
"--add-opens", "java.base/jdk.internal.math=ALL-UNNAMED",
89+
"--add-opens", "java.base/jdk.internal.misc=ALL-UNNAMED",
90+
"--add-opens", "java.base/jdk.internal.module=ALL-UNNAMED",
91+
"--add-opens", "java.base/jdk.internal.org.objectweb.asm.commons=ALL-UNNAMED",
92+
"--add-opens", "java.base/jdk.internal.org.objectweb.asm.signature=ALL-UNNAMED",
93+
"--add-opens", "java.base/jdk.internal.org.objectweb.asm.tree=ALL-UNNAMED",
94+
"--add-opens", "java.base/jdk.internal.org.objectweb.asm.tree.analysis=ALL-UNNAMED",
95+
"--add-opens", "java.base/jdk.internal.org.objectweb.asm.util=ALL-UNNAMED",
96+
"--add-opens", "java.base/jdk.internal.org.xml.sax=ALL-UNNAMED",
97+
"--add-opens", "java.base/jdk.internal.org.xml.sax.helpers=ALL-UNNAMED",
98+
"--add-opens", "java.base/jdk.internal.perf=ALL-UNNAMED",
99+
"--add-opens", "java.base/jdk.internal.platform=ALL-UNNAMED",
100+
"--add-opens", "java.base/jdk.internal.ref=ALL-UNNAMED",
101+
"--add-opens", "java.base/jdk.internal.reflect=ALL-UNNAMED",
102+
"--add-opens", "java.base/jdk.internal.util=ALL-UNNAMED",
103+
"--add-opens", "java.base/jdk.internal.util.jar=ALL-UNNAMED",
104+
"--add-opens", "java.base/jdk.internal.util.xml=ALL-UNNAMED",
105+
"--add-opens", "java.base/jdk.internal.util.xml.impl=ALL-UNNAMED",
106+
"--add-opens", "java.base/jdk.internal.vm=ALL-UNNAMED",
107+
"--add-opens", "java.base/jdk.internal.vm.annotation=ALL-UNNAMED"
108+
)
66109

67110
useJUnitPlatform {
68111
excludeTags = setOf("slow", "IntegrationTest")

‎gradle.properties

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ kotlin.code.style=official
33
# IU, IC, PC, PY
44
# IC for AndroidStudio
55
ideType=IC
6+
ideVersion=223.8617.56
67
# ALL, NOJS
78
buildType=NOJS
8-
ideVersion=222.4167.29
99

1010
pythonIde=IC,IU,PC,PY
1111
jsIde=IU,PY,WS
@@ -15,22 +15,20 @@ goIde=IU
1515
# In order to run Android Studion instead of Intellij Community, specify the path to your Android Studio installation
1616
#androidStudioPath=your_path_to_android_studio
1717

18-
#Version numbers: https://plugins.jetbrains.com/plugin/631-python/versions
19-
pythonCommunityPluginVersion=222.4167.37
20-
pythonUltimatePluginVersion=222.4167.37
21-
18+
# Version numbers: https://plugins.jetbrains.com/plugin/7322-python-community-edition/versions
19+
pythonCommunityPluginVersion=223.7571.182
20+
# Version numbers: https://plugins.jetbrains.com/plugin/631-python/versions
21+
pythonUltimatePluginVersion=223.7571.182
2222
# Version numbers: https://plugins.jetbrains.com/plugin/9568-go/versions
23-
goPluginVersion=222.4167.21
24-
25-
kotlinPluginVersion=222-1.7.20-release-201-IJ4167.29
23+
goPluginVersion=223.7571.182
2624

2725
junit5Version=5.8.0-RC1
2826
junit4Version=4.13.2
2927
junit4PlatformVersion=1.9.0
3028
mockitoVersion=3.5.13
3129
ksmtVersion=0.4.3
3230
sootVersion=4.4.0-FORK-2
33-
kotlinVersion=1.7.20
31+
kotlinVersion=1.8.0
3432
log4j2Version=2.13.3
3533
coroutinesVersion=1.6.3
3634
collectionsVersion=0.3.4
@@ -39,7 +37,7 @@ collectionsVersion=0.3.4
3937
# utbot-intellij/build.gradle.kts
4038
# utbot-rd/build.gradle
4139
# utbot-rider/build.gradle.kts
42-
intellijPluginVersion=1.7.0
40+
intellijPluginVersion=1.13.1
4341
# every time you bump rd version:
4442
# 1. regenerate all models
4543
# 2. check if rider plugin works

‎gradle/wrapper/gradle-wrapper.jar

2.81 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
4+
networkTimeout=10000
45
zipStoreBase=GRADLE_USER_HOME
56
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)