Version updates

Author: Mr3zee

build.gradle.kts

@@ -45,7 +45,9 @@ dependencies {
     // IntelliJ Platform Gradle Plugin Dependencies Extension - read more: https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-dependencies-extension.html
     intellijPlatform {
         val platformVersion = providers.gradleProperty("platformVersion")
-        intellijIdeaCommunity(platformVersion, useInstaller = false)
+        intellijIdea(platformVersion) {
+            useInstaller = false
+        }
         jetbrainsRuntime()
 //        fleetBackend(platformVersion)
 
@@ -116,7 +118,7 @@ intellijPlatform {
     pluginVerification {
         ides {
             select {
-                types = listOf(IntelliJPlatformType.IntellijIdeaCommunity)
+                types = listOf(IntelliJPlatformType.IntellijIdea)
                 channels = listOf(
                     ProductRelease.Channel.RELEASE,
                     ProductRelease.Channel.EAP,

gradle.properties

@@ -4,13 +4,13 @@ pluginGroup = com.github.mr3zee.kotlinPlugins
 pluginName = Kotlin Plugins
 pluginRepositoryUrl = https://github.com/Mr3zee/kotlin-plugins
 # SemVer format -> https://semver.org
-pluginVersion = 0.1.2
+pluginVersion = 0.2.0
 
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 pluginSinceBuild = 251.21418.62
 
 # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
-platformVersion = 251.23774.435
+platformVersion = 253-EAP-SNAPSHOT
 
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
 # Example: platformPlugins = com.jetbrains.php:203.4449.22, org.intellij.scala:2023.3.27@EAP
@@ -19,7 +19,7 @@ platformPlugins =
 platformBundledPlugins = org.jetbrains.kotlin
 
 # Gradle Releases -> https://github.com/gradle/gradle/releases
-gradleVersion = 8.12.1
+gradleVersion = 9.1.0
 
 # Opt-out flag for bundling Kotlin standard library -> https://jb.gg/intellij-platform-kotlin-stdlib
 kotlin.stdlib.default.dependency = false

gradle/libs.versions.toml

@@ -4,8 +4,8 @@ junit = "4.13.2"
 
 # plugins
 changelog = "2.2.1"
-intelliJPlatform = "2.6.0"
-kotlin = "2.1.10"
+intelliJPlatform = "2.9.0"
+kotlin = "2.2.20"
 kover = "0.9.1"
 qodana = "2025.1.1"
 jsoup = "1.20.1"

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

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

@@ -12,6 +12,8 @@ import io.ktor.client.request.*
 import io.ktor.client.statement.*
 import io.ktor.http.*
 import io.ktor.utils.io.*
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 import kotlinx.io.readByteArray
 import org.jetbrains.kotlin.config.MavenComparableVersion
 import org.jsoup.Jsoup
@@ -197,6 +199,7 @@ internal object KotlinPluginsJarDownloader {
             return JarResult(finalFilename, version, requestedLibVersion, downloaded = false)
         }
 
+        @Suppress("BlockingMethodInNonBlockingContext")
         Files.createFile(file)
 
         return downloadJarIfNotExistsUnderLock(
@@ -273,6 +276,7 @@ internal object KotlinPluginsJarDownloader {
         }
 
         if (response?.status?.isSuccess() != true) {
+            @Suppress("BlockingMethodInNonBlockingContext")
             Files.delete(file)
             if (response != null) {
                 logger.debug("$logTag Failed to download file $artifactName: ${response.status} - ${response.bodyAsText()}")

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

@@ -229,7 +229,7 @@ class KotlinPluginsStorageService(
 
                 if (cacheMisses.flatMap { it.value.values }.any { !it }) {
                     logger.debug("Actualize plugins job self-launch: ${cacheMisses.entries.joinToString { (k, v) -> "{$k: [${v.entries.joinToString { (k1, v1) -> "[$k1 -> $v1]" }}]" }}")
-                    actualizePlugins()
+                    actualizeRequestQueue.trySend(Unit)
                 } else if (changed.get()) {
                     invalidateKotlinPluginsCache()
                 }
@@ -247,7 +247,7 @@ class KotlinPluginsStorageService(
         val map = pluginsCache.getOrPut(kotlinVersion) { ConcurrentHashMap() }
         val pluginMap = map.getOrPut(versioned.descriptor) { ConcurrentHashMap() }
 
-        val (locatedVersion, path) = if (versioned.version == null) {
+        val (locatedVersion, path) = (if (versioned.version == null) {
             findJarPath(versioned, kotlinVersion)?.also { (version, path) ->
                 pluginMap.compute(version) { _, old ->
                     when {
@@ -279,7 +279,7 @@ class KotlinPluginsStorageService(
                 versioned.version
             } to path
 
-        } ?: (null to null)
+        }) ?: (null to null)
 
         logger.debug("Requested version is ${versioned.version} for ${versioned.descriptor}, located version: $locatedVersion, path: $path")