diff --git a/.github/workflows/pr-quality-gate.yaml b/.github/workflows/pr-quality-gate.yaml index 33f8e293..1795d3bb 100644 --- a/.github/workflows/pr-quality-gate.yaml +++ b/.github/workflows/pr-quality-gate.yaml @@ -24,6 +24,12 @@ jobs: name: "Style Check" runs-on: ubuntu-latest steps: + - name: Maximize Build Space + uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # 1.3.1 + with: + tool-cache: false + large-packages: false + - name: Checkout uses: actions/checkout@v4 @@ -76,7 +82,6 @@ jobs: - name: Setup Gradle uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326 # v.4.4.0 - - name: Qodana - Code Inspection uses: JetBrains/qodana-action@b60a4b9259f448dd00f2ca4763db5677d69ba868 # v2024.3.4 @@ -91,11 +96,18 @@ jobs: if: success() || failure() with: sarif_file: ${{ runner.temp }}/qodana/results/qodana.sarif.json + unit-and-integration-test: name: "Unit and Integration Tests" runs-on: ubuntu-latest timeout-minutes: 20 steps: + - name: Maximize Build Space + uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # 1.3.1 + with: + tool-cache: false + large-packages: false + - name: Checkout uses: actions/checkout@v4 diff --git a/buildSrc/src/main/kotlin/com.mongodb.intellij.plugin-component.gradle.kts b/buildSrc/src/main/kotlin/com.mongodb.intellij.plugin-component.gradle.kts index 64324306..2af49739 100644 --- a/buildSrc/src/main/kotlin/com.mongodb.intellij.plugin-component.gradle.kts +++ b/buildSrc/src/main/kotlin/com.mongodb.intellij.plugin-component.gradle.kts @@ -119,6 +119,16 @@ dependencies { bundledPlugin("com.intellij.database") bundledPlugin("com.intellij.spring.data") + bundledModules( + "intellij.platform.compose", + "intellij.libraries.skiko", + "intellij.libraries.compose.foundation.desktop", + "intellij.platform.jewel.foundation", + "intellij.platform.jewel.ui", + "intellij.platform.jewel.ideLafBridge", + ) + + testFramework(TestFrameworkType.Platform) testFramework(TestFrameworkType.Plugin.Java) } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index aa70abca..b60277ae 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,8 +1,8 @@ [versions] # IntelliJ platform dependencies -intellij-min = "2024.3.1.1" -intellij-minBuild = "243.22562.218" -intellij-minRelease = "243" +intellij-min = "2025.1.1" +intellij-minBuild = "251.25410.109" +intellij-minRelease = "251" intellij-type = "IU" java-target="21" # Other plugin dependencies diff --git a/packages/jetbrains-plugin/build.gradle.kts b/packages/jetbrains-plugin/build.gradle.kts index 4d328510..3e26d22f 100644 --- a/packages/jetbrains-plugin/build.gradle.kts +++ b/packages/jetbrains-plugin/build.gradle.kts @@ -63,21 +63,6 @@ dependencies { implementation(project(":packages:mongodb-dialects:mongosh")) implementation(project(":packages:mongodb-mql-model")) - compileOnly(compose.ui) - compileOnly(compose.runtime) - compileOnly(compose.foundation) - compileOnly(compose.desktop.common) - compileOnly(compose.desktop.currentOs) - - implementation(libs.compose.jewel.laf.bridge) - implementation(libs.compose.jewel.laf.standalone) { - exclude(group = "org.jetbrains.kotlinx") - } - - implementation(libs.mongodb.driver) - implementation(libs.segment) - implementation(libs.semver.parser) - testImplementation(compose.runtime) testImplementation(compose.foundation) testImplementation(compose.desktop.common) @@ -88,6 +73,11 @@ dependencies { testImplementation(compose.uiTest) { exclude(group = "org.jetbrains.kotlinx") } + + implementation(libs.mongodb.driver) + implementation(libs.segment) + implementation(libs.semver.parser) + testImplementation(libs.kotlin.coroutines.core) testImplementation(libs.testing.kotlin.coroutines.test) } diff --git a/packages/jetbrains-plugin/src/main/resources/META-INF/plugin.xml b/packages/jetbrains-plugin/src/main/resources/META-INF/plugin.xml index e7c951c9..ed60ad98 100644 --- a/packages/jetbrains-plugin/src/main/resources/META-INF/plugin.xml +++ b/packages/jetbrains-plugin/src/main/resources/META-INF/plugin.xml @@ -28,11 +28,21 @@