Skip to content

Commit 2f4a97d

Browse files
fisakovfisakov
committed
[MPS 2025.3] Fix javac compilation error: re-export dependency
A dependency on de.q60.mps.collections.libs solution is re-exported by de.q60.mps.polymorphicfunctions.runtime. Also, explicitly list library jars in build layout.
1 parent d00e8af commit 2f4a97d

File tree

2 files changed

+71
-7
lines changed

2 files changed

+71
-7
lines changed

‎code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps‎

Lines changed: 70 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10546,6 +10546,7 @@
1054610546
</node>
1054710547
<node concept="1SiIV0" id="1kvClgLzQmh" role="3bR37C">
1054810548
<node concept="3bR9La" id="1kvClgLzQmi" role="1SiIV1">
10549+
<property role="3bR36h" value="true" />
1054910550
<ref role="3bR37D" node="6fQhGuklQWU" resolve="de.q60.mps.collections.libs" />
1055010551
</node>
1055110552
</node>
@@ -18146,17 +18147,80 @@
1814618147
<property role="3MwjfP" value="lib" />
1814718148
</node>
1814818149
</node>
18149-
<node concept="2HvfSZ" id="4_SQzDOofhp" role="39821P">
18150-
<node concept="398BVA" id="4_SQzDOofnN" role="2HvfZ0">
18150+
<node concept="28jJK3" id="6sGAGM5GK5i" role="39821P">
18151+
<node concept="398BVA" id="6sGAGM5GKme" role="28jJRO">
18152+
<ref role="398BVh" node="2fo8bJE$D4t" resolve="extensions.code" />
18153+
<node concept="2Ry0Ak" id="6sGAGM5GKJB" role="iGT6I">
18154+
<property role="2Ry0Am" value="shadowmodels" />
18155+
<node concept="2Ry0Ak" id="6sGAGM5GKS6" role="2Ry0An">
18156+
<property role="2Ry0Am" value="solutions" />
18157+
<node concept="2Ry0Ak" id="6sGAGM5GKS9" role="2Ry0An">
18158+
<property role="2Ry0Am" value="de.q60.mps.collections.libs" />
18159+
<node concept="2Ry0Ak" id="6sGAGM5GL0B" role="2Ry0An">
18160+
<property role="2Ry0Am" value="lib" />
18161+
<node concept="2Ry0Ak" id="6sGAGM5GL0E" role="2Ry0An">
18162+
<property role="2Ry0Am" value="commons-collections4.jar" />
18163+
</node>
18164+
</node>
18165+
</node>
18166+
</node>
18167+
</node>
18168+
</node>
18169+
</node>
18170+
<node concept="28jJK3" id="6sGAGM5GL0F" role="39821P">
18171+
<node concept="398BVA" id="6sGAGM5GL0G" role="28jJRO">
18172+
<ref role="398BVh" node="2fo8bJE$D4t" resolve="extensions.code" />
18173+
<node concept="2Ry0Ak" id="6sGAGM5GL0H" role="iGT6I">
18174+
<property role="2Ry0Am" value="shadowmodels" />
18175+
<node concept="2Ry0Ak" id="6sGAGM5GL0I" role="2Ry0An">
18176+
<property role="2Ry0Am" value="solutions" />
18177+
<node concept="2Ry0Ak" id="6sGAGM5GL0J" role="2Ry0An">
18178+
<property role="2Ry0Am" value="de.q60.mps.collections.libs" />
18179+
<node concept="2Ry0Ak" id="6sGAGM5GL0K" role="2Ry0An">
18180+
<property role="2Ry0Am" value="lib" />
18181+
<node concept="2Ry0Ak" id="6sGAGM5GL9e" role="2Ry0An">
18182+
<property role="2Ry0Am" value="guava.jar" />
18183+
</node>
18184+
</node>
18185+
</node>
18186+
</node>
18187+
</node>
18188+
</node>
18189+
</node>
18190+
<node concept="28jJK3" id="6sGAGM5GLhF" role="39821P">
18191+
<node concept="398BVA" id="6sGAGM5GLhG" role="28jJRO">
1815118192
<ref role="398BVh" node="2fo8bJE$D4t" resolve="extensions.code" />
18152-
<node concept="2Ry0Ak" id="4_SQzDOofuf" role="iGT6I">
18193+
<node concept="2Ry0Ak" id="6sGAGM5GLhH" role="iGT6I">
1815318194
<property role="2Ry0Am" value="shadowmodels" />
18154-
<node concept="2Ry0Ak" id="4_SQzDOofuk" role="2Ry0An">
18195+
<node concept="2Ry0Ak" id="6sGAGM5GLhI" role="2Ry0An">
1815518196
<property role="2Ry0Am" value="solutions" />
18156-
<node concept="2Ry0Ak" id="4_SQzDOofup" role="2Ry0An">
18197+
<node concept="2Ry0Ak" id="6sGAGM5GLhJ" role="2Ry0An">
1815718198
<property role="2Ry0Am" value="de.q60.mps.collections.libs" />
18158-
<node concept="2Ry0Ak" id="4_SQzDOofuu" role="2Ry0An">
18199+
<node concept="2Ry0Ak" id="6sGAGM5GLhK" role="2Ry0An">
1815918200
<property role="2Ry0Am" value="lib" />
18201+
<node concept="2Ry0Ak" id="6sGAGM5GLqe" role="2Ry0An">
18202+
<property role="2Ry0Am" value="trove4j.jar" />
18203+
</node>
18204+
</node>
18205+
</node>
18206+
</node>
18207+
</node>
18208+
</node>
18209+
</node>
18210+
<node concept="28jJK3" id="6sGAGM5GLyF" role="39821P">
18211+
<node concept="398BVA" id="6sGAGM5GLyG" role="28jJRO">
18212+
<ref role="398BVh" node="2fo8bJE$D4t" resolve="extensions.code" />
18213+
<node concept="2Ry0Ak" id="6sGAGM5GLyH" role="iGT6I">
18214+
<property role="2Ry0Am" value="shadowmodels" />
18215+
<node concept="2Ry0Ak" id="6sGAGM5GLyI" role="2Ry0An">
18216+
<property role="2Ry0Am" value="solutions" />
18217+
<node concept="2Ry0Ak" id="6sGAGM5GLyJ" role="2Ry0An">
18218+
<property role="2Ry0Am" value="de.q60.mps.collections.libs" />
18219+
<node concept="2Ry0Ak" id="6sGAGM5GLyK" role="2Ry0An">
18220+
<property role="2Ry0Am" value="lib" />
18221+
<node concept="2Ry0Ak" id="6sGAGM5GLFe" role="2Ry0An">
18222+
<property role="2Ry0Am" value="vavr.jar" />
18223+
</node>
1816018224
</node>
1816118225
</node>
1816218226
</node>

‎code/shadowmodels/solutions/de.q60.mps.polymorphicfunctions.runtime/de.q60.mps.polymorphicfunctions.runtime.msd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<dependency reexport="false">742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)</dependency>
1919
<dependency reexport="false">498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA)</dependency>
2020
<dependency reexport="false">e4fb5bb5-0ad9-4e08-9867-6c5a4b9d9246(de.q60.mps.util)</dependency>
21-
<dependency reexport="false">ecfb9949-7433-4db5-85de-0f84d172e4ce(de.q60.mps.collections.libs)</dependency>
21+
<dependency reexport="true">ecfb9949-7433-4db5-85de-0f84d172e4ce(de.q60.mps.collections.libs)</dependency>
2222
</dependencies>
2323
<languageVersions>
2424
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />

0 commit comments

Comments
 (0)