diff --git a/.azure-pipelines/build-pull-request.yml b/.azure-pipelines/build-pull-request.yml index fa2257d0d45..885dddbc684 100644 --- a/.azure-pipelines/build-pull-request.yml +++ b/.azure-pipelines/build-pull-request.yml @@ -109,6 +109,12 @@ extends: inputs: type: InlineScript script: ./gradlew buildUtils -x buildToolkitsLib || exit -1 + - task: JavaToolInstaller@0 + displayName: Use Java 25 for IntelliJ + inputs: + versionSpec: "25" + jdkArchitectureOption: x64 + jdkSourceOption: PreInstalled - task: ms-devlabs.utilitytasks.task-Shellpp.Shellpp@0 displayName: Build IntelliJ inputs: diff --git a/.azure-pipelines/sign-for-stable-release.yml b/.azure-pipelines/sign-for-stable-release.yml index 7ea9e095ad7..ab1b673b241 100644 --- a/.azure-pipelines/sign-for-stable-release.yml +++ b/.azure-pipelines/sign-for-stable-release.yml @@ -90,23 +90,22 @@ extends: clean: true fetchTags: false - task: PowerShell@2 - displayName: Install JDK 21 + displayName: Install JDK 25 inputs: targetType: inline script: | - # Download Adoptium/Temurin JDK 21.0.8 - Write-Host "Downloading Java 21.0.8..." - $source = "https://download.oracle.com/java/21/archive/jdk-21.0.2_windows-x64_bin.zip" - $destination = "$(build.sourcesdirectory)\jdk21_x64_windows.zip" + Write-Host "Downloading Java 25.0.2..." + $source = "https://download.oracle.com/java/25/archive/jdk-25.0.2_windows-x64_bin.zip" + $destination = "$(build.sourcesdirectory)\jdk25_x64_windows.zip" Invoke-WebRequest -Uri $source -OutFile $destination - task: JavaToolInstaller@0 - displayName: 'Use Java 21' + displayName: 'Use Java 25' inputs: - versionSpec: 21 + versionSpec: 25 jdkArchitectureOption: x64 jdkSourceOption: LocalDirectory - jdkFile: '$(build.sourcesdirectory)\jdk21_x64_windows.zip' - jdkDestinationDirectory: '$(agent.toolsDirectory)/jdk21' + jdkFile: '$(build.sourcesdirectory)\jdk25_x64_windows.zip' + jdkDestinationDirectory: '$(agent.toolsDirectory)/jdk25' - task: UseNode@1 inputs: version: "22.x" @@ -131,7 +130,7 @@ extends: mvn -v # ./gradlew buildUtils || exit -1 mvn clean install -f ./Utils/pom.xml -T 1C "-Dcheckstyle.skip=true" "-Dmaven.test.skip=true" "-Dmaven.javadoc.skip=true" - mvn clean -f ./Utils/pom.xml + if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE } cd PluginsAndFeatures/azure-toolkit-for-intellij ./gradlew clean buildPlugin -s "-Papplicationinsights.key=$(INTELLIJ_KEY)" "-PneedPatchVersion=false" "-Psources=false" "-Porg.gradle.configureondemand=false" "-Porg.gradle.daemon=false" "-Porg.gradle.unsafe.configuration-cache=false" "-Porg.gradle.caching=false" env: diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e25e763267..f3bbc602b93 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ All notable changes to "Azure Toolkit for IntelliJ IDEA" will be documented in this file. - [Change Log](#change-log) + - [Unreleased](#unreleased) - [3.97.6](#3976) - [3.97.5](#3975) - [3.97.4](#3974) @@ -126,7 +127,12 @@ All notable changes to "Azure Toolkit for IntelliJ IDEA" will be documented in t - [3.0.7](#307) - [3.0.6](#306) +## [Unreleased] + ## 3.97.6 +### Added +- Added support for IntelliJ IDEA 2026.2. + ### Fixed - Fixed several UI freeze issues caused by non-cancellable read actions in Azure task manager, Azure artifact resolution, Maven report generation, and background JDK version checks. diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/appservice/AppServiceStreamingLogManager.java b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/appservice/AppServiceStreamingLogManager.java index 699f0bc757f..8f99c648bb2 100644 --- a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/appservice/AppServiceStreamingLogManager.java +++ b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-appservice/src/main/java/com/microsoft/azure/toolkit/intellij/legacy/appservice/AppServiceStreamingLogManager.java @@ -118,7 +118,7 @@ private void showAppServiceStreamingLog(Project project, String resourceId, ILog private StreamingLogsConsoleView getOrCreateConsoleView(Project project, String resourceId) { return consoleViewMap.compute(resourceId, - (id, view) -> (view == null || view.isDisposed()) ? new StreamingLogsConsoleView(project) : view); + (id, view) -> (view == null || view.isConsoleDisposed()) ? new StreamingLogsConsoleView(project) : view); } interface ILogStreaming { diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-azuremcp/build.gradle.kts b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-azuremcp/build.gradle.kts index 7bae8a25618..c2ed363bc9b 100644 --- a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-azuremcp/build.gradle.kts +++ b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-azuremcp/build.gradle.kts @@ -3,8 +3,9 @@ dependencies { implementation(project(":azure-intellij-plugin-lib-java")) implementation("com.microsoft.azure:azure-toolkit-common-lib") implementation("com.microsoft.azure:azure-toolkit-ide-common-lib") - testImplementation("org.junit.jupiter:junit-jupiter:5.8.1") - testImplementation("org.mockito:mockito-core:3.9.0") + testImplementation("org.junit.jupiter:junit-jupiter:5.12.2") + testRuntimeOnly("org.junit.platform:junit-platform-launcher") + testImplementation("org.mockito:mockito-core:5.23.0") intellijPlatform { // Plugin Dependencies. Uses `platformBundledPlugins` property from the gradle.properties file for bundled IntelliJ Platform plugins. diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-base/src/main/resources/META-INF/plugin.xml b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-base/src/main/resources/META-INF/plugin.xml index 50f6735f817..3a2d8044d6f 100644 --- a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-base/src/main/resources/META-INF/plugin.xml +++ b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-base/src/main/resources/META-INF/plugin.xml @@ -27,6 +27,7 @@ com.microsoft.intellij.ui.messages.messages com.intellij.modules.java + com.intellij.modules.jcef org.jetbrains.idea.maven com.intellij.gradle diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-containerservice/src/main/java/com/microsoft/azure/toolkit/intellij/containerservice/actions/OpenKubernetesPluginAction.java b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-containerservice/src/main/java/com/microsoft/azure/toolkit/intellij/containerservice/actions/OpenKubernetesPluginAction.java index 2f965ec511d..4b5a7f5e546 100644 --- a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-containerservice/src/main/java/com/microsoft/azure/toolkit/intellij/containerservice/actions/OpenKubernetesPluginAction.java +++ b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-containerservice/src/main/java/com/microsoft/azure/toolkit/intellij/containerservice/actions/OpenKubernetesPluginAction.java @@ -10,7 +10,6 @@ import com.intellij.execution.services.ServiceViewContributor; import com.intellij.execution.services.ServiceViewManager; import com.intellij.ide.projectView.PresentationData; -import com.intellij.kubernetes.api.Context; import com.intellij.kubernetes.api.KubernetesApiProvider; import com.intellij.navigation.ItemPresentation; import com.intellij.openapi.project.Project; diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-hdinsight-base/build.gradle.kts b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-hdinsight-base/build.gradle.kts index 56a4f4a0f5a..3e2c62dc3d5 100644 --- a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-hdinsight-base/build.gradle.kts +++ b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-hdinsight-base/build.gradle.kts @@ -57,7 +57,7 @@ dependencies { // Plugin Dependencies. Uses `platformBundledPlugins` property from the gradle.properties file for bundled IntelliJ Platform plugins. bundledPlugin("com.intellij.java") bundledPlugin("org.jetbrains.idea.maven") - plugin("org.intellij.scala:2024.2.5") + plugin("org.intellij.scala:2026.2.5") } } diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-hdinsight-lib/build.gradle.kts b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-hdinsight-lib/build.gradle.kts index edd3bcda579..251c271b75a 100644 --- a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-hdinsight-lib/build.gradle.kts +++ b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-hdinsight-lib/build.gradle.kts @@ -12,7 +12,7 @@ dependencies { // intellijIdeaUltimate(properties("platformVersion").get()) // Plugin Dependencies. Uses `platformBundledPlugins` property from the gradle.properties file for bundled IntelliJ Platform plugins. bundledPlugin("com.intellij.java") - plugin("org.intellij.scala:2024.2.5") + plugin("org.intellij.scala:2026.2.5") } } \ No newline at end of file diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-hdinsight/build.gradle.kts b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-hdinsight/build.gradle.kts index 490e0d79ea7..89221971ee2 100644 --- a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-hdinsight/build.gradle.kts +++ b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-hdinsight/build.gradle.kts @@ -18,6 +18,6 @@ dependencies { // Plugin Dependencies. Uses `platformBundledPlugins` property from the gradle.properties file for bundled IntelliJ Platform plugins. bundledPlugin("com.intellij.java") bundledPlugin("org.jetbrains.idea.maven") - plugin("org.intellij.scala:2024.2.5") + plugin("org.intellij.scala:2026.2.5") } } \ No newline at end of file diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-java-sdk/build.gradle.kts b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-java-sdk/build.gradle.kts index 7bae8a25618..c2ed363bc9b 100644 --- a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-java-sdk/build.gradle.kts +++ b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-java-sdk/build.gradle.kts @@ -3,8 +3,9 @@ dependencies { implementation(project(":azure-intellij-plugin-lib-java")) implementation("com.microsoft.azure:azure-toolkit-common-lib") implementation("com.microsoft.azure:azure-toolkit-ide-common-lib") - testImplementation("org.junit.jupiter:junit-jupiter:5.8.1") - testImplementation("org.mockito:mockito-core:3.9.0") + testImplementation("org.junit.jupiter:junit-jupiter:5.12.2") + testRuntimeOnly("org.junit.platform:junit-platform-launcher") + testImplementation("org.mockito:mockito-core:5.23.0") intellijPlatform { // Plugin Dependencies. Uses `platformBundledPlugins` property from the gradle.properties file for bundled IntelliJ Platform plugins. diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib-java/src/main/resources/whatsnew.md b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib-java/src/main/resources/whatsnew.md index 40924364739..e7c051b86b4 100644 --- a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib-java/src/main/resources/whatsnew.md +++ b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib-java/src/main/resources/whatsnew.md @@ -2,6 +2,9 @@ # What's new in Azure Toolkit for IntelliJ ## 3.97.6 +### Added +- Added support for IntelliJ IDEA 2026.2. + ### Fixed - Fixed several UI freeze issues caused by non-cancellable read actions in Azure task manager, Azure artifact resolution, Maven report generation, and background JDK version checks. diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib/build.gradle.kts b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib/build.gradle.kts index 8229d1b47d3..43b0e280aab 100644 --- a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib/build.gradle.kts +++ b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib/build.gradle.kts @@ -28,4 +28,3 @@ dependencies { bundledPlugin("org.jetbrains.plugins.terminal") } } - diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib/src/main/java/com/microsoft/azure/toolkit/intellij/common/streaminglog/StreamingLogsConsoleView.java b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib/src/main/java/com/microsoft/azure/toolkit/intellij/common/streaminglog/StreamingLogsConsoleView.java index 673f62e0b65..9a7192bf171 100644 --- a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib/src/main/java/com/microsoft/azure/toolkit/intellij/common/streaminglog/StreamingLogsConsoleView.java +++ b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib/src/main/java/com/microsoft/azure/toolkit/intellij/common/streaminglog/StreamingLogsConsoleView.java @@ -14,12 +14,11 @@ public class StreamingLogsConsoleView extends ConsoleViewImpl { private static final String SEPARATOR = System.getProperty("line.separator"); - private boolean isDisposed; + private boolean disposed; private Disposable subscription; public StreamingLogsConsoleView(@NotNull Project project) { super(project, true); - this.isDisposed = false; this.setUpdateFoldingsEnabled(false); } @@ -43,13 +42,8 @@ public boolean isActive() { return subscription != null && !subscription.isDisposed(); } - /** - * Returns whether this console view has been disposed. - * Note: In IntelliJ 261+, ConsoleViewImpl.isDisposed() is private final, - * so this is NOT an override but a new public method for callers. - */ - public boolean isDisposed() { - return this.isDisposed; + public boolean isConsoleDisposed() { + return this.disposed; } private void printlnToConsole(String message, ConsoleViewContentType consoleViewContentType) { @@ -59,7 +53,7 @@ private void printlnToConsole(String message, ConsoleViewContentType consoleView @Override public void dispose() { super.dispose(); - this.isDisposed = true; + this.disposed = true; closeStreamingLog(); } } diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-samples/build.gradle.kts b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-samples/build.gradle.kts index 626b956b018..7990e194d0c 100644 --- a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-samples/build.gradle.kts +++ b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-samples/build.gradle.kts @@ -9,5 +9,6 @@ dependencies { intellijPlatform { // Plugin Dependencies. Uses `platformBundledPlugins` property from the gradle.properties file for bundled IntelliJ Platform plugins. bundledPlugin("Git4Idea") + bundledModule("intellij.platform.vcs.impl") } } diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-synapse/build.gradle.kts b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-synapse/build.gradle.kts index 290303d3c0a..6b2359d9f57 100644 --- a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-synapse/build.gradle.kts +++ b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-synapse/build.gradle.kts @@ -18,7 +18,7 @@ dependencies { // Plugin Dependencies. Uses `platformBundledPlugins` property from the gradle.properties file for bundled IntelliJ Platform plugins. bundledPlugin("com.intellij.java") bundledPlugin("org.jetbrains.idea.maven") - plugins("org.intellij.scala:2024.2.5") + plugins("org.intellij.scala:2026.2.5") } } diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/build.gradle.kts b/PluginsAndFeatures/azure-toolkit-for-intellij/build.gradle.kts index 437d80e9239..d90a740bb5a 100644 --- a/PluginsAndFeatures/azure-toolkit-for-intellij/build.gradle.kts +++ b/PluginsAndFeatures/azure-toolkit-for-intellij/build.gradle.kts @@ -1,6 +1,9 @@ import io.freefair.gradle.plugins.aspectj.AjcAction import org.apache.tools.ant.filters.ReplaceTokens +import org.jetbrains.changelog.Changelog import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType +import org.jetbrains.kotlin.gradle.dsl.JvmTarget +import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile import java.net.URI import java.time.LocalDateTime import java.time.format.DateTimeFormatter @@ -23,6 +26,10 @@ plugins { group = properties("pluginGroup").get() +changelog { + path.set(rootProject.file("../../CHANGELOG.md").canonicalPath) +} + allprojects { apply { plugin("java") @@ -33,12 +40,12 @@ allprojects { java { toolchain { - languageVersion = JavaLanguageVersion.of(21) + languageVersion = JavaLanguageVersion.of(properties("javaToolchainVersion").get().toInt()) } } kotlin { - jvmToolchain(21) + jvmToolchain(properties("javaToolchainVersion").get().toInt()) } repositories { @@ -63,8 +70,9 @@ allprojects { intellijIdeaUltimate(properties("platformVersion").get()) { useInstaller = false } - // JBR 25 required to run IntelliJ 2026.1 (PathClassLoader is JBR-only) + // JBR 25 required to run IntelliJ 2026.2 (PathClassLoader is JBR-only) jetbrainsRuntime() + bundledPlugin("com.intellij.modules.jcef") // MavenId/MavenCoordinate classes moved from maven plugin to repository-search plugin in 261 bundledPlugin("org.jetbrains.idea.reposearch") // Test framework classes moved to separate modules in 261 @@ -75,12 +83,16 @@ allprojects { implementation(platform("com.microsoft.azure:azure-toolkit-libs:0.52.2")) implementation(platform("com.microsoft.azure:azure-toolkit-ide-libs:0.52.2")) implementation(platform("com.microsoft.hdinsight:azure-toolkit-ide-hdinsight-libs:0.1.1")) + implementation("commons-collections:commons-collections:3.2.2") - compileOnly("org.projectlombok:lombok:1.18.32") + compileOnly("org.projectlombok:lombok:1.18.46") compileOnly("org.jetbrains:annotations:24.0.0") - annotationProcessor("org.projectlombok:lombok:1.18.32") + annotationProcessor("org.projectlombok:lombok:1.18.46") implementation("com.microsoft.azure:azure-toolkit-common-lib:0.52.2") + implementation("org.aspectj:aspectjrt:1.9.25") + implementation("org.aspectj:aspectjweaver:1.9.25") aspect("com.microsoft.azure:azure-toolkit-common-lib:0.52.2") + aspect("org.aspectj:aspectjweaver:1.9.25") // junit was removed from IntelliJ platform bundled libs in 261 testImplementation("junit:junit:4.13.2") } @@ -90,7 +102,6 @@ allprojects { implementation { exclude(module = "log4j") } implementation { exclude(module = "stax-api") } implementation { exclude(module = "groovy-xml") } - implementation { exclude(module = "groovy-templates") } implementation { exclude(module = "jna") } implementation { exclude(module = "xpp3") } implementation { exclude(module = "pull-parser") } @@ -104,10 +115,16 @@ allprojects { } tasks { + withType().configureEach { + compilerOptions { + jvmTarget.set(JvmTarget.fromTarget(properties("javaVersion").get())) + } + } compileJava { - sourceCompatibility = "21" - targetCompatibility = "21" + sourceCompatibility = properties("javaVersion").get() + targetCompatibility = properties("javaVersion").get() + options.release.set(properties("javaVersion").map(String::toInt)) } compileKotlin { @@ -194,52 +211,53 @@ dependencies { bundledPlugin("com.intellij.properties") bundledPlugin("org.jetbrains.plugins.terminal") bundledPlugin("org.intellij.plugins.markdown") + bundledPlugin("com.intellij.modules.jcef") // Plugin Dependencies. Uses `platformPlugins` property from the gradle.properties file for plugin from JetBrains Marketplace. plugins(properties("platformPlugins").map { it.split(',') }) + pluginComposedModule(implementation(project(":azure-intellij-plugin-lib"))) + pluginComposedModule(implementation(project(":azure-intellij-plugin-lib-java"))) + pluginComposedModule(implementation(project(":azure-intellij-resource-connector-lib"))) + pluginComposedModule(implementation(project(":azure-intellij-resource-connector-lib-java"))) + pluginComposedModule(implementation(project(":azure-intellij-plugin-service-explorer"))) + pluginComposedModule(implementation(project(":azure-intellij-plugin-guidance"))) + pluginComposedModule(implementation(project(":azure-intellij-plugin-guidance-java"))) + pluginComposedModule(implementation(project(":azure-sdk-reference-book"))) + pluginComposedModule(implementation(project(":azure-intellij-plugin-springcloud"))) + pluginComposedModule(implementation(project(":azure-intellij-plugin-storage"))) + pluginComposedModule(implementation(project(":azure-intellij-plugin-storage-java"))) + pluginComposedModule(implementation(project(":azure-intellij-plugin-appservice"))) + pluginComposedModule(implementation(project(":azure-intellij-plugin-appservice-java"))) + pluginComposedModule(implementation(project(":azure-intellij-plugin-arm"))) + pluginComposedModule(implementation(project(":azure-intellij-plugin-applicationinsights"))) + pluginComposedModule(implementation(project(":azure-intellij-plugin-cosmos"))) + pluginComposedModule(implementation(project(":azure-intellij-plugin-cognitiveservices"))) + pluginComposedModule(implementation(project(":azure-intellij-plugin-monitor"))) + pluginComposedModule(implementation(project(":azure-intellij-plugin-containerregistry"))) + pluginComposedModule(implementation(project(":azure-intellij-plugin-containerservice"))) + pluginComposedModule(implementation(project(":azure-intellij-plugin-containerapps"))) + pluginComposedModule(implementation(project(":azure-intellij-plugin-database"))) + pluginComposedModule(implementation(project(":azure-intellij-plugin-database-java"))) + pluginComposedModule(implementation(project(":azure-intellij-plugin-vm"))) + pluginComposedModule(implementation(project(":azure-intellij-plugin-redis"))) + pluginComposedModule(implementation(project(":azure-intellij-plugin-redis-java"))) + pluginComposedModule(implementation(project(":azure-intellij-plugin-samples"))) + pluginComposedModule(implementation(project(":azure-intellij-plugin-bicep"))) + pluginComposedModule(implementation(project(":azure-intellij-plugin-eventhubs"))) + pluginComposedModule(implementation(project(":azure-intellij-plugin-servicebus"))) + pluginComposedModule(implementation(project(":azure-intellij-plugin-keyvault"))) + pluginComposedModule(implementation(project(":azure-intellij-plugin-keyvault-java"))) + pluginComposedModule(implementation(project(":azure-intellij-resource-connector-aad"))) + pluginComposedModule(implementation(project(":azure-intellij-plugin-hdinsight-lib"))) + pluginComposedModule(implementation(project(":azure-intellij-plugin-sqlserverbigdata"))) + pluginComposedModule(implementation(project(":azure-intellij-plugin-hdinsight"))) + pluginComposedModule(implementation(project(":azure-intellij-plugin-synapse"))) + pluginComposedModule(implementation(project(":azure-intellij-plugin-sparkoncosmos"))) + pluginComposedModule(implementation(project(":azure-intellij-plugin-hdinsight-base"))) + pluginComposedModule(implementation(project(":azure-intellij-plugin-integration-services"))) + pluginComposedModule(implementation(project(":azure-intellij-plugin-cloud-shell"))) + pluginComposedModule(implementation(project(":azure-intellij-plugin-java-sdk"))) + pluginComposedModule(implementation(project(":azure-intellij-plugin-azuremcp"))) } - implementation(project(":azure-intellij-plugin-lib")) - implementation(project(":azure-intellij-plugin-lib-java")) - implementation(project(":azure-intellij-resource-connector-lib")) - implementation(project(":azure-intellij-resource-connector-lib-java")) - implementation(project(":azure-intellij-plugin-service-explorer")) - implementation(project(":azure-intellij-plugin-guidance")) - implementation(project(":azure-intellij-plugin-guidance-java")) - implementation(project(":azure-sdk-reference-book")) - implementation(project(":azure-intellij-plugin-springcloud")) - implementation(project(":azure-intellij-plugin-storage")) - implementation(project(":azure-intellij-plugin-storage-java")) - implementation(project(":azure-intellij-plugin-appservice")) - implementation(project(":azure-intellij-plugin-appservice-java")) - implementation(project(":azure-intellij-plugin-arm")) - implementation(project(":azure-intellij-plugin-applicationinsights")) - implementation(project(":azure-intellij-plugin-cosmos")) - implementation(project(":azure-intellij-plugin-cognitiveservices")) - implementation(project(":azure-intellij-plugin-monitor")) - implementation(project(":azure-intellij-plugin-containerregistry")) - implementation(project(":azure-intellij-plugin-containerservice")) - implementation(project(":azure-intellij-plugin-containerapps")) - implementation(project(":azure-intellij-plugin-database")) - implementation(project(":azure-intellij-plugin-database-java")) - implementation(project(":azure-intellij-plugin-vm")) - implementation(project(":azure-intellij-plugin-redis")) - implementation(project(":azure-intellij-plugin-redis-java")) - implementation(project(":azure-intellij-plugin-samples")) - implementation(project(":azure-intellij-plugin-bicep")) - implementation(project(":azure-intellij-plugin-eventhubs")) - implementation(project(":azure-intellij-plugin-servicebus")) - implementation(project(":azure-intellij-plugin-keyvault")) - implementation(project(":azure-intellij-plugin-keyvault-java")) - implementation(project(":azure-intellij-resource-connector-aad")) - implementation(project(":azure-intellij-plugin-hdinsight-lib")) - implementation(project(":azure-intellij-plugin-sqlserverbigdata")) - implementation(project(":azure-intellij-plugin-hdinsight")) - implementation(project(":azure-intellij-plugin-synapse")) - implementation(project(":azure-intellij-plugin-sparkoncosmos")) - implementation(project(":azure-intellij-plugin-hdinsight-base")) - implementation(project(":azure-intellij-plugin-integration-services")) - implementation(project(":azure-intellij-plugin-cloud-shell")) - implementation(project(":azure-intellij-plugin-java-sdk")) - implementation(project(":azure-intellij-plugin-azuremcp")) implementation("commons-io:commons-io") implementation("org.apache.commons:commons-lang3") implementation("com.microsoft.azure:azure-toolkit-common-lib") @@ -286,6 +304,9 @@ tasks { patchPluginXml { version = getPatchedVersion + changeNotes.set(provider { + changelog.renderItem(changelog.get(pluginVersion), Changelog.OutputType.HTML) + }) } register("downloadBicepLanguageServer") { @@ -322,7 +343,7 @@ tasks { // refers https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-testing-extension.html#intellijPlatformTesting val testIde by intellijPlatformTesting.runIde.registering { - type = IntelliJPlatformType.IntellijIdeaCommunity + type = IntelliJPlatformType.IntellijIdeaUltimate version = properties("platformVersion").get() } diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/gradle.properties b/PluginsAndFeatures/azure-toolkit-for-intellij/gradle.properties index eb1a694780f..69a265de786 100644 --- a/PluginsAndFeatures/azure-toolkit-for-intellij/gradle.properties +++ b/PluginsAndFeatures/azure-toolkit-for-intellij/gradle.properties @@ -1,16 +1,17 @@ pluginVersion=3.97.6 -intellijDisplayVersion=2026.1 -intellij_version=261-EAP-SNAPSHOT -platformVersion=261-EAP-SNAPSHOT +intellijDisplayVersion=2026.2 +intellij_version=262.8665.176-EAP +platformVersion=262.8665.176-EAP # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html -pluginSinceBuild=261 -pluginUntilBuild=261.* +pluginSinceBuild=262 +pluginUntilBuild=262.* # Example: platformPlugins = com.jetbrains.php:203.4449.22, org.intellij.scala:2023.3.27@EAP -platformPlugins=org.intellij.scala:2026.1.8 +platformPlugins=org.intellij.scala:2026.2.5 # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension platformType=IU needPatchVersion=true javaVersion=21 +javaToolchainVersion=25 applicationinsights.key=57cc111a-36a8-44b3-b044-25d293b8b77c # IntelliJ Platform Artifacts Repositories -> https://plugins.jetbrains.com/docs/intellij/intellij-artifacts.html pluginGroup=com.microsoft.azuretools @@ -22,7 +23,7 @@ platformDownloadSources=true # Opt-out flag for bundling Kotlin standard library -> https://jb.gg/intellij-platform-kotlin-stdlib kotlin.stdlib.default.dependency=false # Gradle Releases -> https://github.com/gradle/gradle/releases -gradleVersion=9.0 +gradleVersion=9.1.0 # Enable Gradle Configuration Cache -> https://docs.gradle.org/current/userguide/configuration_cache.html org.gradle.configuration-cache=true org.gradle.configuration-cache.problems=warn @@ -34,5 +35,3 @@ org.gradle.configureondemand=true org.gradle.daemon=true org.gradle.jvmargs='-Duser.language=en' org.jetbrains.intellij.platform.buildFeature.useBinaryReleases=false - - diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/gradle/libs.versions.toml b/PluginsAndFeatures/azure-toolkit-for-intellij/gradle/libs.versions.toml index 6527cbeaabe..4aa2f54c2ea 100644 --- a/PluginsAndFeatures/azure-toolkit-for-intellij/gradle/libs.versions.toml +++ b/PluginsAndFeatures/azure-toolkit-for-intellij/gradle/libs.versions.toml @@ -2,17 +2,17 @@ # libraries # plugins -kotlin = "2.2.20" +kotlin = "2.4.0" changelog = "2.4.0" #intellijPlatform = "2.10.1" -intellijPlatform = "2.12.0" +intellijPlatform = "2.18.1" detekt = "1.23.6" ktlint = "12.1.1" #gradleIntelliJPlugin = "1.17.3" #qodana = "2024.1.5" aspectj = "9.2.0" springDependencyManagement = "1.1.6" -serialization = "1.9.24" +serialization = "2.4.0" [plugins] changelog = { id = "org.jetbrains.changelog", version.ref = "changelog" } diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/gradle/wrapper/gradle-wrapper.properties b/PluginsAndFeatures/azure-toolkit-for-intellij/gradle/wrapper/gradle-wrapper.properties index 2dcec856bd0..2e1113280ef 100644 --- a/PluginsAndFeatures/azure-toolkit-for-intellij/gradle/wrapper/gradle-wrapper.properties +++ b/PluginsAndFeatures/azure-toolkit-for-intellij/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/main/resources/META-INF/plugin.xml b/PluginsAndFeatures/azure-toolkit-for-intellij/src/main/resources/META-INF/plugin.xml index 96099e8825f..fb776997a77 100644 --- a/PluginsAndFeatures/azure-toolkit-for-intellij/src/main/resources/META-INF/plugin.xml +++ b/PluginsAndFeatures/azure-toolkit-for-intellij/src/main/resources/META-INF/plugin.xml @@ -29,6 +29,10 @@

3.97.6

+

Added

+
    +
  • Added support for IntelliJ IDEA 2026.2.
    • +

Fixed

  • Fixed several UI freeze issues caused by non-cancellable read actions in Azure task manager, Azure artifact resolution, Maven report generation, and background JDK version checks.
    • @@ -39,6 +43,7 @@ com.intellij.modules.platform + com.intellij.modules.jcef diff --git a/Utils/azure-toolkit-ide-hdinsight-libs/azure-explorer-common/pom.xml b/Utils/azure-toolkit-ide-hdinsight-libs/azure-explorer-common/pom.xml index 2cb77906b66..e7989fa41f9 100644 --- a/Utils/azure-toolkit-ide-hdinsight-libs/azure-explorer-common/pom.xml +++ b/Utils/azure-toolkit-ide-hdinsight-libs/azure-explorer-common/pom.xml @@ -42,7 +42,7 @@ maven-compiler-plugin - 3.3 + 3.13.0 17 17 diff --git a/Utils/azure-toolkit-ide-hdinsight-libs/pom.xml b/Utils/azure-toolkit-ide-hdinsight-libs/pom.xml index f1b821e2f53..fed918899a2 100644 --- a/Utils/azure-toolkit-ide-hdinsight-libs/pom.xml +++ b/Utils/azure-toolkit-ide-hdinsight-libs/pom.xml @@ -24,7 +24,7 @@ 6.4.0 3.4.0 1.1.10.4 - 1.18.36 + 1.18.46 3.6.0 @@ -318,6 +318,20 @@ + + org.apache.maven.plugins + maven-compiler-plugin + 3.13.0 + + + + org.projectlombok + lombok + ${lombok.version} + + + + diff --git a/Utils/azure-toolkit-ide-libs/pom.xml b/Utils/azure-toolkit-ide-libs/pom.xml index 76949ce97c2..3e0831ac5e1 100644 --- a/Utils/azure-toolkit-ide-libs/pom.xml +++ b/Utils/azure-toolkit-ide-libs/pom.xml @@ -57,7 +57,7 @@ 17 17 - 1.18.36 + 1.18.46 0.52.2 @@ -214,6 +214,20 @@ + + org.apache.maven.plugins + maven-compiler-plugin + 3.13.0 + + + + org.projectlombok + lombok + ${lombok.version} + + + +