diff --git a/buildSrc/src/main/kotlin/intellijUtils.kt b/buildSrc/src/main/kotlin/intellijUtils.kt index 13fd77402..ba9b37640 100644 --- a/buildSrc/src/main/kotlin/intellijUtils.kt +++ b/buildSrc/src/main/kotlin/intellijUtils.kt @@ -3,6 +3,7 @@ import org.gradle.process.JavaForkOptions import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType import org.jetbrains.intellij.platform.gradle.TestFrameworkType import org.jetbrains.intellij.platform.gradle.extensions.IntelliJPlatformDependenciesExtension +import org.jetbrains.intellij.platform.gradle.extensions.IntelliJPlatformExtension import kotlin.reflect.KProperty const val VERIFY_CLASSES_TASK_NAME = "verifyClasses" @@ -157,6 +158,14 @@ fun IntelliJPlatformDependenciesExtension.intellijIde(versionWithCode: String) { jetbrainsRuntime() } +fun IntelliJPlatformExtension.PluginVerification.Ides.intellijIde(versionWithCode: String) { + val (type, version) = versionWithCode.toTypeWithVersion() + create(type, version) { + useInstaller.set(false) + useCache.set(true) + } +} + fun IntelliJPlatformDependenciesExtension.intellijPlugins(vararg notations: String) { for (notation in notations) { when { diff --git a/gradle-261.properties b/gradle-261.properties index 9e9b685fe..3074b83cb 100644 --- a/gradle-261.properties +++ b/gradle-261.properties @@ -4,8 +4,7 @@ customUntilBuild=261.* # Existent IDE versions can be found in the following repos: # https://www.jetbrains.com/intellij-repository/releases/ # https://www.jetbrains.com/intellij-repository/snapshots/ -#261.22158.234 -ideaVersion=IU-261.23567.71-EAP-CANDIDATE -clionVersion=CL-261.23567-EAP-CANDIDATE-SNAPSHOT -pycharmVersion=PC-261.23567.80-EAP-SNAPSHOT -riderVersion=RD-2026.1-RC1-SNAPSHOT +ideaVersion=IU-2026.1.1 +clionVersion=CL-2026.1.1 +pycharmVersion=PC-2026.1 +riderVersion=RD-2026.1.0.1 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c46a1627f..d2b39c48f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,9 +1,9 @@ [versions] educational-ml-library = "1.0.65" -jackson = "2.17.2" -kotlin = "2.3.0" -okhttp = "4.12.0" -retrofit = "2.9.0" +jackson = "2.21.2" +kotlin = "2.3.21" +okhttp = "5.3.2" +retrofit = "3.0.0" [libraries] annotations = { group = "org.jetbrains", name = "annotations", version = "23.0.0" } @@ -15,7 +15,7 @@ jackson-dataformat-yaml = { group = "com.fasterxml.jackson.dataformat", name = " jackson-datatype-jsr310 = { group = "com.fasterxml.jackson.datatype", name = "jackson-datatype-jsr310", version.ref = "jackson" } jackson-module-kotlin = { group = "com.fasterxml.jackson.module", name = "jackson-module-kotlin", version.ref = "jackson" } jsoup = { group = "org.jsoup", name = "jsoup", version = "1.17.2" } -kotlin-css-jvm = { group = "org.jetbrains.kotlin-wrappers", name = "kotlin-css-jvm", version = "2025.5.11" } +kotlin-css-jvm = { group = "org.jetbrains.kotlin-wrappers", name = "kotlin-css-jvm", version = "2026.4.12" } kotlin-stdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", version.ref = "kotlin" } kotlinx-serialization = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version = "1.8.0" } logging-interceptor = { group = "com.squareup.okhttp3", name = "logging-interceptor", version.ref = "okhttp" } @@ -32,8 +32,8 @@ openTest4J = { group = "org.opentest4j", name = "opentest4j", version = "1.3.0" hamcrest = { group = "org.hamcrest", name = "hamcrest", version="2.2" } [plugins] -intelliJPlatformPlugin = { id = "org.jetbrains.intellij.platform", version = "2.10.5" } +intelliJPlatformPlugin = { id = "org.jetbrains.intellij.platform", version = "2.15.0" } kotlinPlugin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } kotlinSerializationPlugin = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } -propertiesPlugin = { id = "net.saliman.properties", version = "1.5.2" } -testRetryPlugin = { id = "org.gradle.test-retry", version = "1.6.2" } +propertiesPlugin = { id = "net.saliman.properties", version = "1.6.0" } +testRetryPlugin = { id = "org.gradle.test-retry", version = "1.6.4" } diff --git a/intellij-plugin/build.gradle.kts b/intellij-plugin/build.gradle.kts index 0d196f161..21200b939 100644 --- a/intellij-plugin/build.gradle.kts +++ b/intellij-plugin/build.gradle.kts @@ -43,7 +43,7 @@ intellijPlatform { pluginVerification { ides { - ide(IntellijIdeaUltimate, ideaVersion.toTypeWithVersion().version) + intellijIde(ideaVersion) } } diff --git a/intellij-plugin/hs-core/branches/261/src/org/hyperskill/academy/platform/OpenProjectTaskCompat.kt b/intellij-plugin/hs-core/branches/261/src/org/hyperskill/academy/platform/OpenProjectTaskCompat.kt index cd432b7c4..28cc744d0 100644 --- a/intellij-plugin/hs-core/branches/261/src/org/hyperskill/academy/platform/OpenProjectTaskCompat.kt +++ b/intellij-plugin/hs-core/branches/261/src/org/hyperskill/academy/platform/OpenProjectTaskCompat.kt @@ -3,7 +3,6 @@ package org.hyperskill.academy.platform import com.intellij.ide.impl.OpenProjectTask import com.intellij.openapi.module.Module import com.intellij.openapi.project.Project -import java.nio.file.Path /** * Compatibility helper to construct OpenProjectTask for 253+.