Skip to content

Commit 1a6acf4

Browse files
authored
Upgrade Gradle Wrapper to 9.1.0 (#62)
1 parent 84b0eb9 commit 1a6acf4

File tree

5 files changed

+29
-23
lines changed

5 files changed

+29
-23
lines changed

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ repos:
1414
hooks:
1515
- id: prettier
1616
additional_dependencies:
17-
- prettier@3.3.3
18-
- "@prettier/[email protected].1"
17+
- prettier@3.6.2
18+
- "@prettier/[email protected].2"

build.gradle.kts

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,15 @@ repositories {
3030
}
3131

3232
dependencies {
33-
testImplementation("com.squareup.okhttp3:okhttp:4.12.0") // needed for connecting to remote robot
3433
testImplementation(libs.jupiter)
3534
testRuntimeOnly(libs.jupiterEngine)
36-
testRuntimeOnly("junit:junit:4.13.2") // https://github.com/JetBrains/intellij-platform-gradle-plugin/issues/1711
35+
testRuntimeOnly(libs.junitPlatformLauncher)
36+
testRuntimeOnly("junit:junit:4.13.2") // legacy JUnit 4 support
3737
testImplementation(libs.remoteRobot)
3838
testImplementation(libs.remoteRobotFixtures)
3939
intellijPlatform {
4040
pycharmCommunity(platformVersion)
4141
bundledPlugin("PythonCore")
42-
instrumentationTools()
4342
pluginVerifier()
4443
zipSigner()
4544
testFramework(TestFrameworkType.JUnit5)
@@ -101,13 +100,13 @@ intellijPlatform {
101100
pluginVerification {
102101
ides {
103102
// target supporting the following platforms
104-
ide(IntelliJPlatformType.PyCharmCommunity, platformVersion)
105-
ide(IntelliJPlatformType.PyCharmProfessional, platformVersion)
106-
ide(IntelliJPlatformType.IntellijIdeaCommunity, platformVersion)
107-
ide(IntelliJPlatformType.IntellijIdeaUltimate, platformVersion)
108-
ide(IntelliJPlatformType.GoLand, platformVersion)
109-
ide(IntelliJPlatformType.CLion, platformVersion)
110-
ide(IntelliJPlatformType.RustRover, platformVersion)
103+
create(IntelliJPlatformType.PyCharmCommunity, platformVersion)
104+
create(IntelliJPlatformType.PyCharmProfessional, platformVersion)
105+
create(IntelliJPlatformType.IntellijIdeaCommunity, platformVersion)
106+
create(IntelliJPlatformType.IntellijIdeaUltimate, platformVersion)
107+
create(IntelliJPlatformType.GoLand, platformVersion)
108+
create(IntelliJPlatformType.CLion, platformVersion)
109+
create(IntelliJPlatformType.RustRover, platformVersion)
111110
}
112111
}
113112
}
@@ -164,6 +163,6 @@ val runIdeForUiTests by intellijPlatformTesting.runIde.registering {
164163

165164
versionCatalogUpdate {
166165
keep {
167-
keepUnusedPlugins.set(true) // taskinfo is unused but that is fine
166+
keepUnusedVersions = true
168167
}
169168
}

gradle/libs.versions.toml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,23 @@
11
[versions]
2-
changelog = "2.2.1"
3-
intelliJPlatform = "2.0.1"
4-
jupiter = "5.10.3"
5-
kotlin = "2.0.10"
2+
changelog = "2.4.0"
3+
intelliJPlatform = "2.10.0"
4+
junitPlatformLauncher= "1.14.0"
5+
jupiter = "5.14.0"
6+
kotlin = "2.2.20"
67
kover = "0.9.2"
7-
ktlint = "12.1.1"
8+
ktlint = "13.1.0"
89
remoteRobot = "0.11.23"
910
taskinfo = "2.2.0"
1011
testLogger = "4.0.0"
11-
versionPlugin = "0.51.0"
12-
versionUpdate = "0.8.4"
12+
versionPlugin = "0.53.0"
13+
versionUpdate = "1.0.1"
1314

1415
[libraries]
1516
jupiter = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "jupiter" }
1617
jupiterEngine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "jupiter" }
1718
remoteRobot = { module = "com.intellij.remoterobot:remote-robot", version.ref = "remoteRobot" }
1819
remoteRobotFixtures = { module = "com.intellij.remoterobot:remote-fixtures", version.ref = "remoteRobot" }
20+
junitPlatformLauncher = { module = "org.junit.platform:junit-platform-launcher", version.ref = "junitPlatformLauncher" }
1921

2022
[plugins]
2123
changelog = { id = "org.jetbrains.changelog", version.ref = "changelog" }

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.9-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

src/main/kotlin/com/github/pyvenvmanage/actions/ConfigurePythonActionAbstract.kt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,23 @@ abstract class ConfigurePythonActionAbstract : AnAction() {
2727
// - any files within the binary folder.
2828
e.presentation.isEnabledAndVisible =
2929
when (val selectedPath = e.getData(CommonDataKeys.VIRTUAL_FILE)) {
30-
null -> false
31-
else ->
30+
null -> {
31+
false
32+
}
33+
34+
else -> {
3235
when (selectedPath.isDirectory) {
3336
true -> {
3437
// check if there is a python executable available under this folder -> name match for binary
3538
PythonSdkUtil.getPythonExecutable(selectedPath.path) != null
3639
}
40+
3741
false -> {
3842
// check for presence of the activate_this.py + activate alongside or pyvenv.cfg above
3943
PythonSdkUtil.isVirtualEnv(selectedPath.path)
4044
}
4145
}
46+
}
4247
}
4348
}
4449

0 commit comments

Comments
 (0)