Skip to content

fix(jewel): upgrade min intellij version so we use the fix for jewel provided by jetbrains #256

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion .github/workflows/pr-quality-gate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand All @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
6 changes: 3 additions & 3 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
20 changes: 5 additions & 15 deletions packages/jetbrains-plugin/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,21 @@
<li>Generate a model class from a collection</li>
</ul>
]]></description>

<depends>com.intellij.modules.platform</depends>
<depends>com.intellij.java</depends>
<depends>com.intellij.database</depends>
<depends optional="true" config-file="./additional-when-spring-is-available.xml">com.intellij.spring.data</depends>

<dependencies>
<module name="intellij.platform.compose"></module>
<module name="intellij.libraries.skiko"></module>
<module name="intellij.libraries.compose.foundation.desktop"></module>
<module name="intellij.platform.jewel.foundation"></module>
<module name="intellij.platform.jewel.ui"></module>
<module name="intellij.platform.jewel.ideLafBridge"></module>
</dependencies>

<extensions defaultExtensionNs="com.intellij">
<postStartupActivity implementation="com.mongodb.jbplugin.ActivatePluginPostStartupActivity"/>
<toolWindow factoryClass="com.mongodb.jbplugin.ui.components.SidePanel" id="MongoDB"
Expand Down
Loading