Skip to content

Commit 086733a

Browse files
committed
Version updates
1 parent 3735792 commit 086733a

File tree

7 files changed

+24
-11
lines changed

7 files changed

+24
-11
lines changed

build.gradle.kts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@ dependencies {
4545
// IntelliJ Platform Gradle Plugin Dependencies Extension - read more: https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-dependencies-extension.html
4646
intellijPlatform {
4747
val platformVersion = providers.gradleProperty("platformVersion")
48-
intellijIdeaCommunity(platformVersion, useInstaller = false)
48+
intellijIdeaCommunity(platformVersion) {
49+
useInstaller = false
50+
}
4951
jetbrainsRuntime()
5052
// fleetBackend(platformVersion)
5153

gradle.properties

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ pluginGroup = com.github.mr3zee.kotlinPlugins
44
pluginName = Kotlin Plugins
55
pluginRepositoryUrl = https://github.com/Mr3zee/kotlin-plugins
66
# SemVer format -> https://semver.org
7-
pluginVersion = 0.1.2
7+
pluginVersion = 0.2.0
88

99
# Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
1010
pluginSinceBuild = 251.21418.62
@@ -19,7 +19,7 @@ platformPlugins =
1919
platformBundledPlugins = org.jetbrains.kotlin
2020

2121
# Gradle Releases -> https://github.com/gradle/gradle/releases
22-
gradleVersion = 8.12.1
22+
gradleVersion = 9.1.0
2323

2424
# Opt-out flag for bundling Kotlin standard library -> https://jb.gg/intellij-platform-kotlin-stdlib
2525
kotlin.stdlib.default.dependency = false
@@ -32,3 +32,11 @@ org.gradle.caching = true
3232

3333
org.jetbrains.intellij.platform.buildFeature.useBinaryReleases=false
3434
org.jetbrains.intellij.platform.downloadSources=true
35+
36+
kotlin.daemon.jvmargs=-Xmx8g -XX:+HeapDumpOnOutOfMemoryError
37+
kotlin.daemon.useFallbackStrategy=false
38+
39+
org.gradle.jvmargs=-Xmx8g -XX:+HeapDumpOnOutOfMemoryError -XX:+UseParallelGC -XX:MaxMetaspaceSize=768m
40+
org.gradle.daemon=true
41+
org.gradle.parallel=true
42+
org.gradle.workers.max=8

gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ junit = "4.13.2"
44

55
# plugins
66
changelog = "2.2.1"
7-
intelliJPlatform = "2.6.0"
8-
kotlin = "2.1.10"
7+
intelliJPlatform = "2.9.0"
8+
kotlin = "2.2.20"
99
kover = "0.9.1"
1010
qodana = "2025.1.1"
1111
jsoup = "1.20.1"

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.12.1-bin.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

gradlew

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,7 @@ done
8686
# shellcheck disable=SC2034
8787
APP_BASE_NAME=${0##*/}
8888
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
89-
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90-
' "$PWD" ) || exit
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
9190

9291
# Use the maximum available, or set MAX_FD != -1 to use that value.
9392
MAX_FD=maximum

src/main/kotlin/com/github/mr3zee/kotlinPlugins/KotlinPluginsJarDownloader.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ internal object KotlinPluginsJarDownloader {
197197
return JarResult(finalFilename, version, requestedLibVersion, downloaded = false)
198198
}
199199

200+
@Suppress("BlockingMethodInNonBlockingContext")
200201
Files.createFile(file)
201202

202203
return downloadJarIfNotExistsUnderLock(
@@ -273,6 +274,7 @@ internal object KotlinPluginsJarDownloader {
273274
}
274275

275276
if (response?.status?.isSuccess() != true) {
277+
@Suppress("BlockingMethodInNonBlockingContext")
276278
Files.delete(file)
277279
if (response != null) {
278280
logger.debug("$logTag Failed to download file $artifactName: ${response.status} - ${response.bodyAsText()}")

src/main/kotlin/com/github/mr3zee/kotlinPlugins/KotlinPluginsStorage.kt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@file:Suppress("RemoveUnnecessaryParentheses")
2+
13
package com.github.mr3zee.kotlinPlugins
24

35
import com.intellij.openapi.Disposable
@@ -229,7 +231,7 @@ class KotlinPluginsStorageService(
229231

230232
if (cacheMisses.flatMap { it.value.values }.any { !it }) {
231233
logger.debug("Actualize plugins job self-launch: ${cacheMisses.entries.joinToString { (k, v) -> "{$k: [${v.entries.joinToString { (k1, v1) -> "[$k1 -> $v1]" }}]" }}")
232-
actualizePlugins()
234+
actualizeRequestQueue.trySend(Unit)
233235
} else if (changed.get()) {
234236
invalidateKotlinPluginsCache()
235237
}
@@ -247,7 +249,7 @@ class KotlinPluginsStorageService(
247249
val map = pluginsCache.getOrPut(kotlinVersion) { ConcurrentHashMap() }
248250
val pluginMap = map.getOrPut(versioned.descriptor) { ConcurrentHashMap() }
249251

250-
val (locatedVersion, path) = if (versioned.version == null) {
252+
val (locatedVersion, path) = (if (versioned.version == null) {
251253
findJarPath(versioned, kotlinVersion)?.also { (version, path) ->
252254
pluginMap.compute(version) { _, old ->
253255
when {
@@ -279,7 +281,7 @@ class KotlinPluginsStorageService(
279281
versioned.version
280282
} to path
281283

282-
} ?: (null to null)
284+
}) ?: (null to null)
283285

284286
logger.debug("Requested version is ${versioned.version} for ${versioned.descriptor}, located version: $locatedVersion, path: $path")
285287

0 commit comments

Comments
 (0)