Skip to content

Commit 55a36d5

Browse files
Merge remote-tracking branch 'origin/endgame-202503.eap' into develop
# Conflicts: # PluginsAndFeatures/azure-toolkit-for-intellij/gradle.properties # gradle.properties
2 parents ba5ca39 + 4c544fc commit 55a36d5

File tree

6 files changed

+19
-19
lines changed

6 files changed

+19
-19
lines changed

.azure-pipelines/sign-for-stable-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,4 +142,4 @@ extends:
142142
- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
143143
displayName: "Manifest Generator "
144144
inputs:
145-
BuildDropPath: $(build.artifactstagingdirectory)/drop
145+
BuildDropPath: $(build.artifactstagingdirectory)/drop

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-hdinsight-lib/src/main/kotlin/com/microsoft/azure/hdinsight/spark/ui/SparkSubmissionJobUploadStorageAzureBlobCard.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,12 @@ class SparkSubmissionJobUploadStorageAzureBlobCard
6868
var selectedContainer: String?
6969
}
7070

71+
private val textChangeTriggerResetStorageContainerListener = object : DocumentAdapter() {
72+
override fun textChanged(e: DocumentEvent) {
73+
storageContainerUI.comboBox.model = DefaultComboBoxModel()
74+
}
75+
}
76+
7177
private val secureStore: ISecureStore? = AzureStoreManager.getInstance().secureStore
7278
private val storageAccountTip = "The default storage account of the HDInsight cluster, which can be found from HDInsight cluster properties of Azure portal."
7379
private val storageKeyTip = "The storage key of the default storage account, which can be found from HDInsight cluster storage accounts of Azure portal."
@@ -133,12 +139,6 @@ class SparkSubmissionJobUploadStorageAzureBlobCard
133139
button.addActionListener { doRefresh() }
134140
}
135141

136-
private val textChangeTriggerResetStorageContainerListener = object : DocumentAdapter() {
137-
override fun textChanged(e: DocumentEvent) {
138-
storageContainerUI.comboBox.model = DefaultComboBoxModel()
139-
}
140-
}
141-
142142
@Synchronized
143143
private fun doRefresh() {
144144
if (storageContainerUI.button.isEnabled) {

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-vm/src/main/java/com/microsoft/azure/toolkit/intellij/vm/runtarget/AzureVmTargetType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public final void actionPerformed(ActionEvent it) {
117117
if (configuration instanceof SshTargetEnvironmentConfiguration) {
118118
final SshConfig sshConfig = ((SshTargetEnvironmentConfiguration) configuration).findSshConfig(project);
119119
final SshUiData uiData = sshConfig != null ? new SshUiData(sshConfig, true) : null;
120-
SshTargetType.Companion.handleBrowsing$intellij_remoteRun(uiData, project, title, component, textComponentAccessor);
120+
// SshTargetType.Companion.handleBrowsing$intellij_remoteRun(uiData, project, title, component, textComponentAccessor);
121121
} else {
122122
Messages.showWarningDialog(component, RemoteSdkBundle.message("dialog.message.got.unexpected.settings.for.browsing", new Object[0]), title);
123123
}

PluginsAndFeatures/azure-toolkit-for-intellij/gradle.properties

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
pluginVersion=3.95.0
2-
intellijDisplayVersion=2024.3
3-
intellij_version=IU-2024.3
4-
platformVersion=2024.3
2+
intellijDisplayVersion=2025.1
3+
intellij_version=IU-2025.1
4+
platformVersion=2025.1
55
# Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
6-
pluginSinceBuild=243
7-
pluginUntilBuild=243.*
6+
pluginSinceBuild=251
7+
pluginUntilBuild=251.*
88
# Example: platformPlugins = com.jetbrains.php:203.4449.22, org.intellij.scala:2023.3.27@EAP
9-
platformPlugins=org.intellij.scala:2024.3.8
9+
platformPlugins=org.intellij.scala:2025.1.7
1010
# IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
1111
platformType=IU
1212
needPatchVersion=true

PluginsAndFeatures/azure-toolkit-for-intellij/gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# libraries
33

44
# plugins
5-
kotlin = "1.9.24"
5+
kotlin = "2.1.0"
66
changelog = "2.2.0"
7-
intellijPlatform = "2.1.0"
7+
intellijPlatform = "2.3.0"
88
detekt = "1.23.6"
99
ktlint = "12.1.1"
1010
#gradleIntelliJPlugin = "1.17.3"

gradle.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
ARTIFACTS_DIR=artifacts
22
INJECT_INTELLIJ_VERSION=true
3-
IJ_VERSION_MAJOR_BUILD=243.21565.193
4-
IJ_VERSION_MAJOR=2024.3
3+
IJ_VERSION_MAJOR_BUILD=251.23774.16
4+
IJ_VERSION_MAJOR=2025.1
55
IJ_VERSION_MINOR=
6-
IJ_SCALA_VERSION_LATEST=2024.3.8
6+
IJ_SCALA_VERSION_LATEST=2025.1.7
77
skipCheckstyle=true
88
skipTest=false
99
forceClean=false

0 commit comments

Comments
 (0)