Skip to content

Commit 26ad19b

Browse files
committed
fix: include missing dependencies directly in fat JAR
Signed-off-by: Akash Yadav <akashyadav@appdevforall.org>
1 parent 89f39da commit 26ad19b

4 files changed

Lines changed: 54 additions & 9 deletions

patches/0004-feat-add-analysis-api-standalone-embeddable-for-ide-.patch

Lines changed: 51 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 33829cfc919803fa5f8f094a0170b33d2bd0a0dd Mon Sep 17 00:00:00 2001
1+
From 50e859595652aeb4227fec4abf81920016b1d573 Mon Sep 17 00:00:00 2001
22
From: Akash Yadav <contact@itsaky.com>
33
Date: Fri, 13 Mar 2026 19:14:18 +0530
44
Subject: [PATCH 4/7] feat: add analysis-api-standalone-embeddable-for-ide
@@ -7,9 +7,11 @@ Subject: [PATCH 4/7] feat: add analysis-api-standalone-embeddable-for-ide
77
Signed-off-by: Akash Yadav <contact@itsaky.com>
88
---
99
build.gradle.kts | 1 +
10-
.../build.gradle.kts | 78 +++++++++++++++++++
10+
gradle/verification-metadata.xml | 12 +++
11+
gradle/versions.properties | 4 +
12+
.../build.gradle.kts | 86 +++++++++++++++++++
1113
settings.gradle | 1 +
12-
3 files changed, 80 insertions(+)
14+
5 files changed, 104 insertions(+)
1315
create mode 100644 prepare/ide-plugin-dependencies/analysis-api-standalone-embeddable-for-ide/build.gradle.kts
1416

1517
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -24,12 +26,47 @@ index fb9735adfd4f..74e37d391fc4 100644
2426
":prepare:ide-plugin-dependencies:kotlin-compiler-ir-for-ide",
2527
":prepare:ide-plugin-dependencies:kotlin-compiler-common-for-ide",
2628
":prepare:ide-plugin-dependencies:kotlin-compiler-fe10-for-ide",
29+
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
30+
index afc02a72c3e7..c859b3b8ca14 100644
31+
--- a/gradle/verification-metadata.xml
32+
+++ b/gradle/verification-metadata.xml
33+
@@ -5881,5 +5881,17 @@
34+
<sha256 value="0341395a481bb887803957145a6a37879853dd625e9244c2ea2509d9bb7531b9" origin="Generated by Gradle"/>
35+
</artifact>
36+
</component>
37+
+ <component group="javax.management" name="jmx" version="1.2.1">
38+
+ <artifact name="jmx-1.2.1.jar">
39+
+ <md5 value="2e49416d22fe250b726cc483aaad28ba" origin="Generated by Gradle"/>
40+
+ <sha256 value="d9a5982722e0e09b498a987f77caa59e11787c3504572e18ab4101c268487a17" origin="Generated by Gradle"/>
41+
+ </artifact>
42+
+ </component>
43+
+ <component group="one.util" name="streamex" version="0.8.4">
44+
+ <artifact name="streamex-0.8.4.jar">
45+
+ <md5 value="9d7007b8f3260a573518fb005c1ae790" origin="Generated by Gradle"/>
46+
+ <sha256 value="c8bcde95bb6c659bd611a5bc464380f38118a10a0443f3fc15304d91e5c9dd81" origin="Generated by Gradle"/>
47+
+ </artifact>
48+
+ </component>
49+
</components>
50+
</verification-metadata>
51+
diff --git a/gradle/versions.properties b/gradle/versions.properties
52+
index 903ff4bcfd46..4ea88f7b8eae 100644
53+
--- a/gradle/versions.properties
54+
+++ b/gradle/versions.properties
55+
@@ -52,3 +52,7 @@ versions.vertx-codegen=4.5.22
56+
57+
# Used by Compose runtime tests
58+
versions.kotlinx-coroutines-test-jvm=1.8.0
59+
+
60+
+# Additional
61+
+versions.jmx=1.2.1
62+
+version.streamex=0.8.4
63+
\ No newline at end of file
2764
diff --git a/prepare/ide-plugin-dependencies/analysis-api-standalone-embeddable-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/analysis-api-standalone-embeddable-for-ide/build.gradle.kts
2865
new file mode 100644
29-
index 000000000000..cb6cc097db17
66+
index 000000000000..207527cc53bd
3067
--- /dev/null
3168
+++ b/prepare/ide-plugin-dependencies/analysis-api-standalone-embeddable-for-ide/build.gradle.kts
32-
@@ -0,0 +1,78 @@
69+
@@ -0,0 +1,86 @@
3370
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
3471
+
3572
+plugins {
@@ -50,13 +87,21 @@ index 000000000000..cb6cc097db17
5087
+ exclude(group = "org.jetbrains.kotlinx", module = "kotlinx-coroutines-core")
5188
+}
5289
+
90+
+repositories {
91+
+ maven {
92+
+ url = uri("https://www.datanucleus.org/downloads/maven2/")
93+
+ }
94+
+}
95+
+
5396
+dependencies {
5497
+ embeddableJar(intellijCore())
5598
+ embeddableJar(libs.intellij.fastutil)
5699
+ embeddableJar(commonDependency("com.fasterxml:aalto-xml"))
57100
+ embeddableJar(project(":analysis:analysis-api-standalone:analysis-api-standalone-base",))
58101
+ embeddableJar(project(":analysis:analysis-api-standalone:analysis-api-fir-standalone-base",))
59-
+ embeddableJar(project(":analysis:analysis-api-standalone",))
102+
+ embeddableJar(project(":analysis:analysis-api-standalone"))
103+
+ embeddableJar(commonDependency("javax.management:jmx"))
104+
+ embeddableJar(commonDependency("one.util:streamex"))
60105
+}
61106
+
62107
+val packagesToRelocate =

patches/0005-fix-avoid-usage-of-javax.swing.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From c1ae646efecedd59371695593f29db19170b8d37 Mon Sep 17 00:00:00 2001
1+
From 1c3af36c14cae2d94b9ca0a2e4f6ad0fd38f6241 Mon Sep 17 00:00:00 2001
22
From: Akash Yadav <contact@itsaky.com>
33
Date: Fri, 13 Mar 2026 19:15:23 +0530
44
Subject: [PATCH 5/7] fix: avoid usage of javax.swing

patches/0006-fix-add-ability-to-provide-custom-CompilerConfigurat.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 3207a6788ddf111a09aa02e34af6a1c5bc8e161b Mon Sep 17 00:00:00 2001
1+
From 70cc3234eb33da15703904e5516fe7041c89dd3d Mon Sep 17 00:00:00 2001
22
From: Akash Yadav <contact@itsaky.com>
33
Date: Fri, 13 Mar 2026 19:16:19 +0530
44
Subject: [PATCH 6/7] fix: add ability to provide custom CompilerConfiguration

patches/0007-fix-make-LLFlightRecorder-no-op.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 2dfdb3c109001b6a7408193a3010f2223b8ab130 Mon Sep 17 00:00:00 2001
1+
From cc26ff6febbb002b646e04fbd4ea84afa7d0ca1b Mon Sep 17 00:00:00 2001
22
From: Akash Yadav <akashyadav@appdevforall.org>
33
Date: Wed, 18 Mar 2026 21:44:04 +0530
44
Subject: [PATCH 7/7] fix: make LLFlightRecorder no-op

0 commit comments

Comments
 (0)