diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c914ff12..62a06c3d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -51,10 +51,6 @@ jobs:
- name: Fetch Sources
uses: actions/checkout@v4
- # Validate wrapper
- - name: Gradle Wrapper Validation
- uses: gradle/actions/wrapper-validation@v4
-
# Set up Java environment for the next steps
- name: Setup Java
uses: actions/setup-java@v4
@@ -197,7 +193,7 @@ jobs:
# Run Qodana inspections
- name: Qodana - Code Inspection
- uses: JetBrains/qodana-action@v2024.2
+ uses: JetBrains/qodana-action@v2024.3
with:
args: --config,qodana-frontend.yml
artifact-name: qodana-frontend
@@ -245,7 +241,7 @@ jobs:
# Run Qodana inspections
- name: Qodana - Code Inspection
- uses: JetBrains/qodana-action@v2024.2
+ uses: JetBrains/qodana-action@v2024.3
with:
args: --config,qodana-backend.yml
artifact-name: qodana-backend
diff --git a/.github/workflows/run-ui-tests.yml b/.github/workflows/run-ui-tests.yml
deleted file mode 100644
index 7dea4948..00000000
--- a/.github/workflows/run-ui-tests.yml
+++ /dev/null
@@ -1,69 +0,0 @@
-# GitHub Actions Workflow for launching UI tests on Linux, Windows, and Mac in the following steps:
-# - Prepare and launch IDE with your plugin and robot-server plugin, which is needed to interact with the UI.
-# - Wait for IDE to start.
-# - Run UI tests with a separate Gradle task.
-#
-# Please check https://github.com/JetBrains/intellij-ui-test-robot for information about UI tests with IntelliJ Platform.
-#
-# Workflow is triggered manually.
-
-name: Run UI Tests
-on:
- workflow_dispatch
-
-jobs:
-
- testUI:
- runs-on: ${{ matrix.os }}
- strategy:
- fail-fast: false
- matrix:
- include:
- - os: ubuntu-latest
- runIde: |
- export DISPLAY=:99.0
- Xvfb -ac :99 -screen 0 1920x1080x16 &
- gradle runIdeForUiTests &
- - os: windows-latest
- runIde: start gradlew.bat runIdeForUiTests
- - os: macos-latest
- runIde: ./gradlew runIdeForUiTests &
-
- steps:
-
- # Check out current repository
- - name: Fetch Sources
- uses: actions/checkout@v4
-
- # Set up Java environment for the next steps
- - name: Setup Java
- uses: actions/setup-java@v4
- with:
- distribution: zulu
- java-version: 17
-
- # Setup Gradle
- - name: Setup Gradle
- uses: gradle/actions/setup-gradle@v4
-
- # Setup .NET 8 environment for the next steps
- - name: Setup .NET
- uses: actions/setup-dotnet@v4
- with:
- dotnet-version: '8.x'
-
- # Run IDEA prepared for UI testing
- - name: Run IDE
- run: ${{ matrix.runIde }}
-
- # Wait for IDEA to be started
- - name: Health Check
- uses: jtalk/url-health-check-action@v4
- with:
- url: http://127.0.0.1:8082
- max-attempts: 15
- retry-delay: 30s
-
- # Run tests
- - name: Tests
- run: ./gradlew test
diff --git a/build.gradle.kts b/build.gradle.kts
index 92f11d75..2c8bb81a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -7,11 +7,11 @@ import org.jetbrains.intellij.platform.gradle.tasks.PrepareSandboxTask
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins {
- alias(libs.plugins.kotlin) // Kotlin support
+ alias(libs.plugins.kotlin)
alias(libs.plugins.serialization)
- alias(libs.plugins.intelliJPlatform) // IntelliJ Platform Gradle Plugin
- alias(libs.plugins.changelog) // Gradle Changelog Plugin
- alias(libs.plugins.qodana) // Gradle Qodana Plugin
+ alias(libs.plugins.intelliJPlatform)
+ alias(libs.plugins.changelog)
+ alias(libs.plugins.qodana)
}
group = providers.gradleProperty("pluginGroup").get()
@@ -44,17 +44,8 @@ dependencies {
jetbrainsRuntime()
- bundledModule("intellij.rider")
+ bundledPlugins(listOf("Docker", "com.intellij.database", "rider.intellij.plugin.appender"))
- // Plugin Dependencies. Uses `platformBundledPlugins` property from the gradle.properties file for bundled IntelliJ Platform plugins.
- bundledPlugins(providers.gradleProperty("platformBundledPlugins").map { it.split(',') })
-
- // Plugin Dependencies. Uses `platformPlugins` property from the gradle.properties file for plugin from JetBrains Marketplace.
- plugins(providers.gradleProperty("platformPlugins").map { it.split(',') })
-
- instrumentationTools()
- pluginVerifier()
- zipSigner()
testFramework(TestFrameworkType.Bundled)
}
}
diff --git a/gradle.properties b/gradle.properties
index 4ce86a0d..216bce4b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,12 +19,6 @@ platformVersion = 2025.1-SNAPSHOT
dotnetBuildConfiguration = Release
-# Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
-# Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
-platformPlugins =
-# Example: platformBundledPlugins = com.intellij.java
-platformBundledPlugins = com.intellij.diagram, Docker, com.intellij.database, rider.intellij.plugin.appender
-
# Gradle Releases -> https://github.com/gradle/gradle/releases
gradleVersion = 8.11.1
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index bd436c83..de5de511 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -6,10 +6,10 @@ opentest4j = "1.3.0"
serialization = "1.7.3"
# plugins
-kotlin = "2.0.21"
+kotlin = "2.1.0"
changelog = "2.2.1"
-intelliJPlatform = "2.1.0"
-qodana = "2024.2.6"
+intelliJPlatform = "2.2.1"
+qodana = "2024.3.2"
[libraries]
rdGen = { group = "com.jetbrains.rd", name = "rd-gen", version.ref = "rdGen" }
diff --git a/src/dotnet/Directory.Build.props b/src/dotnet/Directory.Build.props
index 5b02cb5c..61d8ebd7 100644
--- a/src/dotnet/Directory.Build.props
+++ b/src/dotnet/Directory.Build.props
@@ -8,7 +8,7 @@
false
None
- 2024.3.0
+ 2024.3.2
diff --git a/src/dotnet/aspire-session-host/aspire-session-host.csproj b/src/dotnet/aspire-session-host/aspire-session-host.csproj
index 4e0bc119..2cdb77d7 100644
--- a/src/dotnet/aspire-session-host/aspire-session-host.csproj
+++ b/src/dotnet/aspire-session-host/aspire-session-host.csproj
@@ -12,7 +12,7 @@
-
+