IJ-CR-148098 IJPL-162433 Update platform Jewel and use custom Jewel for Android

(cherry picked from commit eb088f1c512010e552a6733991c6b26ca0a99959) GitOrigin-RevId: 4e66a1e4fbc22900ab0e0dc37fd1102ff56dae55
2026-02-04 23:39:07 +07:00 · 2024-10-17 17:15:17 +02:00
parent 2e0c63290f
commit 24fe792f8d
8 changed files with 146 additions and 133 deletions
--- a/libraries/compose-desktop/intellij.libraries.compose.desktop.iml
+++ b/libraries/compose-desktop/intellij.libraries.compose.desktop.iml
@@ -8,20 +8,20 @@
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module-library" exported="">
-      <library name="jetbrains.jewel.ide.laf.bridge.242" type="repository">
-        <properties maven-id="org.jetbrains.jewel:jewel-ide-laf-bridge-242:0.22.1">
+      <library name="jetbrains.jewel.ide.laf.bridge.243" type="repository">
+        <properties maven-id="org.jetbrains.jewel:jewel-ide-laf-bridge-243:0.26.2">
          <verification>
-            <artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/jewel/jewel-ide-laf-bridge-242/0.22.1/jewel-ide-laf-bridge-242-0.22.1.jar">
-              <sha256sum>640d563e1eec402c43df6c19771b9af27b1ae61d04932e0b69c68cd2e03736ce</sha256sum>
+            <artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/jewel/jewel-ide-laf-bridge-243/0.26.2/jewel-ide-laf-bridge-243-0.26.2.jar">
+              <sha256sum>b92f618a53f44c0a78ec81adf08d9a0a4d80d2500f60858451160444b6eccabb</sha256sum>
            </artifact>
-            <artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/jewel/jewel-ui-242/0.22.1/jewel-ui-242-0.22.1.jar">
-              <sha256sum>86b4a2026893831af5351aa0ca696488d1da0b252c08920843ed926c4f690b09</sha256sum>
+            <artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/jewel/jewel-ui-243/0.26.2/jewel-ui-243-0.26.2.jar">
+              <sha256sum>7706ba526aa859fff92db67cf12e25383f776f8825b1ba3b5482e3d140fb75e9</sha256sum>
            </artifact>
-            <artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/jewel/jewel-foundation-242/0.22.1/jewel-foundation-242-0.22.1.jar">
-              <sha256sum>53ae086fa6249c1ac8d52f43d19263491b034f4a4c7c81919aa7cfa3dc8d9598</sha256sum>
+            <artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/jewel/jewel-foundation-243/0.26.2/jewel-foundation-243-0.26.2.jar">
+              <sha256sum>f3101a0b541d6bb6543e5f09c30ee4217f4065ee36860f6e74ca681675ed5b91</sha256sum>
            </artifact>
-            <artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/compose/foundation/foundation-desktop/1.7.0-dev1743/foundation-desktop-1.7.0-dev1743.jar">
-              <sha256sum>b53763dbce2f2e29827f8fb6e29a290c38860c0a108e8b61c04541d706539832</sha256sum>
+            <artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/compose/foundation/foundation-desktop/1.7.0/foundation-desktop-1.7.0.jar">
+              <sha256sum>9c7523130d795eecde9cbf3baea04d30e567cd11b79e73d3da8ce031d8b256e8</sha256sum>
            </artifact>
            <artifact url="file://$MAVEN_REPOSITORY$/androidx/annotation/annotation-jvm/1.8.0/annotation-jvm-1.8.0.jar">
              <sha256sum>9aab326d9492800991854360ac248f493ce7f7c3183519309b78ace9e240f6f6</sha256sum>
@@ -29,57 +29,60 @@
            <artifact url="file://$MAVEN_REPOSITORY$/androidx/collection/collection-jvm/1.4.0/collection-jvm-1.4.0.jar">
              <sha256sum>d5cf7b72647c7995071588fe870450ff9c8f127f253d2d4851e161b800f67ae0</sha256sum>
            </artifact>
-            <artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/compose/animation/animation-desktop/1.7.0-dev1743/animation-desktop-1.7.0-dev1743.jar">
-              <sha256sum>3cd2a181afcbdf189310710d95530cd7c16c4111fd83c362de5e9caafe547be6</sha256sum>
+            <artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/compose/animation/animation-desktop/1.7.0/animation-desktop-1.7.0.jar">
+              <sha256sum>5e40f2fc7bc8cb42243cfa7d73c631a17b3d9874af68841ad3ef778f70663be3</sha256sum>
            </artifact>
-            <artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/compose/animation/animation-core-desktop/1.7.0-dev1743/animation-core-desktop-1.7.0-dev1743.jar">
-              <sha256sum>19b9d7ba4659a676d94f6a3fd010f75ddb04cf64d0be97ced4dae91b4dea8a79</sha256sum>
+            <artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/compose/animation/animation-core-desktop/1.7.0/animation-core-desktop-1.7.0.jar">
+              <sha256sum>49b5a4e8f3a5e84702450325c0175688d55c4a12973cfc1a1a36e64f18fdf8d5</sha256sum>
            </artifact>
-            <artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/compose/ui/ui-geometry-desktop/1.7.0-dev1743/ui-geometry-desktop-1.7.0-dev1743.jar">
+            <artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/compose/ui/ui-geometry-desktop/1.7.0/ui-geometry-desktop-1.7.0.jar">
              <sha256sum>4b86c961c0b4bce7995329fd57d4339ede11cb75d7ec90bc1b9913396addb30f</sha256sum>
            </artifact>
-            <artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/compose/foundation/foundation-layout-desktop/1.7.0-dev1743/foundation-layout-desktop-1.7.0-dev1743.jar">
+            <artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/compose/foundation/foundation-layout-desktop/1.7.0/foundation-layout-desktop-1.7.0.jar">
              <sha256sum>d2c867c13ff6632f9880e67dabab2e930007b008b9b22950fc2cc075008eceb6</sha256sum>
            </artifact>
-            <artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/compose/runtime/runtime-desktop/1.7.0-dev1743/runtime-desktop-1.7.0-dev1743.jar">
-              <sha256sum>e55e98e7da0a42c8c5a05c7b78a6401e86f68e7ec970ed16a8584712f3853a67</sha256sum>
+            <artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/compose/ui/ui-desktop/1.7.0/ui-desktop-1.7.0.jar">
+              <sha256sum>b2ecafea6072044624c4b66de01d4891fd9c80b26885b03ced036ccceacc0e27</sha256sum>
            </artifact>
-            <artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/compose/ui/ui-desktop/1.7.0-dev1743/ui-desktop-1.7.0-dev1743.jar">
-              <sha256sum>a5051996d7a52e9aa8aea29abfc673e32ee78d11833e06f5596415798ebff6e3</sha256sum>
-            </artifact>
-            <artifact url="file://$MAVEN_REPOSITORY$/androidx/lifecycle/lifecycle-common-jvm/2.8.0/lifecycle-common-jvm-2.8.0.jar">
+            <artifact url="file://$MAVEN_REPOSITORY$/androidx/lifecycle/lifecycle-common-jvm/2.8.5/lifecycle-common-jvm-2.8.5.jar">
              <sha256sum>61c873a7327c946ec033c310bb98f3f92eeabcede0e1a5200ab8a1896483c7bf</sha256sum>
            </artifact>
-            <artifact url="file://$MAVEN_REPOSITORY$/androidx/lifecycle/lifecycle-runtime-desktop/2.8.0/lifecycle-runtime-desktop-2.8.0.jar">
+            <artifact url="file://$MAVEN_REPOSITORY$/androidx/lifecycle/lifecycle-runtime-desktop/2.8.5/lifecycle-runtime-desktop-2.8.5.jar">
              <sha256sum>10bfe53bb2752f967751a5102cdb785eeea54e1d4df6bde88fb0f50b0a49156c</sha256sum>
            </artifact>
            <artifact url="file://$MAVEN_REPOSITORY$/androidx/arch/core/core-common/2.2.0/core-common-2.2.0.jar">
              <sha256sum>65308a06b1c00ee186cb9e19321383f043b993813f1522c47f4a3e3303bdba41</sha256sum>
            </artifact>
-            <artifact url="file://$MAVEN_REPOSITORY$/androidx/annotation/annotation/1.1.0/annotation-1.1.0.jar">
-              <sha256sum>d38d63edb30f1467818d50aaf05f8a692dea8b31392a049bfa991b159ad5b692</sha256sum>
+            <artifact url="file://$MAVEN_REPOSITORY$/androidx/lifecycle/lifecycle-viewmodel-desktop/2.8.5/lifecycle-viewmodel-desktop-2.8.5.jar">
+              <sha256sum>21ec0e77dc02ed0d6bfe6f3cba7f43e25400446d89ded8568ee165437e0c1922</sha256sum>
            </artifact>
-            <artifact url="file://$MAVEN_REPOSITORY$/androidx/lifecycle/lifecycle-viewmodel-desktop/2.8.0/lifecycle-viewmodel-desktop-2.8.0.jar">
-              <sha256sum>5c28f3ba9732f2180685038dbe674059fd9b7843c721cd0f6c73f3dbfcb2683c</sha256sum>
+            <artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/androidx/lifecycle/lifecycle-runtime-compose-desktop/2.8.3/lifecycle-runtime-compose-desktop-2.8.3.jar">
+              <sha256sum>c1e51a246e69e237e87d289be08bebd8d406ffe9ff60a125e8f2072db6119966</sha256sum>
            </artifact>
-            <artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/androidx/lifecycle/lifecycle-runtime-compose-desktop/2.8.0-dev1743/lifecycle-runtime-compose-desktop-2.8.0-dev1743.jar">
-              <sha256sum>0586442d33274e3a7cc41ddcb9c706304d6300eaa6d57f43857f1a62dd2c1628</sha256sum>
+            <artifact url="file://$MAVEN_REPOSITORY$/androidx/annotation/annotation/1.8.0/annotation-1.8.0.jar">
+              <sha256sum>fe70ace6f942a5fc29045bb2fe25b4e77bdc742dc69f76ed65b39c3ae185888e</sha256sum>
            </artifact>
-            <artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/compose/runtime/runtime-saveable-desktop/1.7.0-dev1743/runtime-saveable-desktop-1.7.0-dev1743.jar">
+            <artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/compose/runtime/runtime-saveable-desktop/1.7.0/runtime-saveable-desktop-1.7.0.jar">
              <sha256sum>4306363be90eaabe74b900db4c32ed1f15c7548e5b30a7093c4ee40c436b9b8c</sha256sum>
            </artifact>
-            <artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/compose/ui/ui-graphics-desktop/1.7.0-dev1743/ui-graphics-desktop-1.7.0-dev1743.jar">
-              <sha256sum>5acc2058c905ceca092cfe8cd91bb082df7fce6126c971d826ca64b538dc7b92</sha256sum>
+            <artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/compose/ui/ui-graphics-desktop/1.7.0/ui-graphics-desktop-1.7.0.jar">
+              <sha256sum>4fb70e8727af0c6e0d44d8f4bff65db9342a95c7996a180898fed71716787db8</sha256sum>
            </artifact>
-            <artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/compose/ui/ui-unit-desktop/1.7.0-dev1743/ui-unit-desktop-1.7.0-dev1743.jar">
+            <artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/compose/ui/ui-unit-desktop/1.7.0/ui-unit-desktop-1.7.0.jar">
              <sha256sum>598b52e257ed674145694b9790a7383a90fed2ec7154ba09ace4aa983c65b1a2</sha256sum>
            </artifact>
-            <artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/compose/ui/ui-text-desktop/1.7.0-dev1743/ui-text-desktop-1.7.0-dev1743.jar">
-              <sha256sum>c690d309b6558a05370e3b239956458c7244dfae2e567115d107b454c8da3461</sha256sum>
+            <artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/compose/ui/ui-text-desktop/1.7.0/ui-text-desktop-1.7.0.jar">
+              <sha256sum>80e07e4ca739f7b6122f63e9a17e6853b947220ecb1180f8dcaf419d0e468996</sha256sum>
            </artifact>
-            <artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/compose/ui/ui-util-desktop/1.7.0-dev1743/ui-util-desktop-1.7.0-dev1743.jar">
+            <artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/compose/ui/ui-util-desktop/1.7.0/ui-util-desktop-1.7.0.jar">
              <sha256sum>161dcc73b929da61cee50045e96fb02f1633c36f18a2ef38b5c2c44c38606b52</sha256sum>
            </artifact>
+            <artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/compose/components/components-resources-desktop/1.7.0/components-resources-desktop-1.7.0.jar">
+              <sha256sum>1584b739e8f1869e4f340519dc984d4a44582a80ef323e655999ddb18dd954c2</sha256sum>
+            </artifact>
+            <artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/compose/runtime/runtime-desktop/1.7.0/runtime-desktop-1.7.0.jar">
+              <sha256sum>76e3250547b9ca3cb1a49c272933b25cb3bccbc9ba12775dd6161a63d9aa7cf1</sha256sum>
+            </artifact>
          </verification>
          <exclude>
            <dependency maven-id="org.jetbrains.kotlin:kotlin-stdlib" />
@@ -89,60 +92,75 @@
          </exclude>
        </properties>
        <CLASSES>
-          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/jewel/jewel-ide-laf-bridge-242/0.22.1/jewel-ide-laf-bridge-242-0.22.1.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/jewel/jewel-ui-242/0.22.1/jewel-ui-242-0.22.1.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/jewel/jewel-foundation-242/0.22.1/jewel-foundation-242-0.22.1.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/foundation/foundation-desktop/1.7.0-dev1743/foundation-desktop-1.7.0-dev1743.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/jewel/jewel-ide-laf-bridge-243/0.26.2/jewel-ide-laf-bridge-243-0.26.2.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/jewel/jewel-ui-243/0.26.2/jewel-ui-243-0.26.2.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/jewel/jewel-foundation-243/0.26.2/jewel-foundation-243-0.26.2.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/foundation/foundation-desktop/1.7.0/foundation-desktop-1.7.0.jar!/" />
          <root url="jar://$MAVEN_REPOSITORY$/androidx/annotation/annotation-jvm/1.8.0/annotation-jvm-1.8.0.jar!/" />
          <root url="jar://$MAVEN_REPOSITORY$/androidx/collection/collection-jvm/1.4.0/collection-jvm-1.4.0.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/animation/animation-desktop/1.7.0-dev1743/animation-desktop-1.7.0-dev1743.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/animation/animation-core-desktop/1.7.0-dev1743/animation-core-desktop-1.7.0-dev1743.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/ui/ui-geometry-desktop/1.7.0-dev1743/ui-geometry-desktop-1.7.0-dev1743.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/foundation/foundation-layout-desktop/1.7.0-dev1743/foundation-layout-desktop-1.7.0-dev1743.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/runtime/runtime-desktop/1.7.0-dev1743/runtime-desktop-1.7.0-dev1743.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/ui/ui-desktop/1.7.0-dev1743/ui-desktop-1.7.0-dev1743.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/androidx/lifecycle/lifecycle-common-jvm/2.8.0/lifecycle-common-jvm-2.8.0.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/androidx/lifecycle/lifecycle-runtime-desktop/2.8.0/lifecycle-runtime-desktop-2.8.0.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/animation/animation-desktop/1.7.0/animation-desktop-1.7.0.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/animation/animation-core-desktop/1.7.0/animation-core-desktop-1.7.0.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/ui/ui-geometry-desktop/1.7.0/ui-geometry-desktop-1.7.0.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/foundation/foundation-layout-desktop/1.7.0/foundation-layout-desktop-1.7.0.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/ui/ui-desktop/1.7.0/ui-desktop-1.7.0.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/androidx/lifecycle/lifecycle-common-jvm/2.8.5/lifecycle-common-jvm-2.8.5.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/androidx/lifecycle/lifecycle-runtime-desktop/2.8.5/lifecycle-runtime-desktop-2.8.5.jar!/" />
          <root url="jar://$MAVEN_REPOSITORY$/androidx/arch/core/core-common/2.2.0/core-common-2.2.0.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/androidx/annotation/annotation/1.1.0/annotation-1.1.0.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/androidx/lifecycle/lifecycle-viewmodel-desktop/2.8.0/lifecycle-viewmodel-desktop-2.8.0.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/androidx/lifecycle/lifecycle-runtime-compose-desktop/2.8.0-dev1743/lifecycle-runtime-compose-desktop-2.8.0-dev1743.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/runtime/runtime-saveable-desktop/1.7.0-dev1743/runtime-saveable-desktop-1.7.0-dev1743.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/ui/ui-graphics-desktop/1.7.0-dev1743/ui-graphics-desktop-1.7.0-dev1743.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/ui/ui-unit-desktop/1.7.0-dev1743/ui-unit-desktop-1.7.0-dev1743.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/ui/ui-text-desktop/1.7.0-dev1743/ui-text-desktop-1.7.0-dev1743.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/ui/ui-util-desktop/1.7.0-dev1743/ui-util-desktop-1.7.0-dev1743.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/androidx/lifecycle/lifecycle-viewmodel-desktop/2.8.5/lifecycle-viewmodel-desktop-2.8.5.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/androidx/lifecycle/lifecycle-runtime-compose-desktop/2.8.3/lifecycle-runtime-compose-desktop-2.8.3.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/androidx/annotation/annotation/1.8.0/annotation-1.8.0.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/runtime/runtime-saveable-desktop/1.7.0/runtime-saveable-desktop-1.7.0.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/ui/ui-graphics-desktop/1.7.0/ui-graphics-desktop-1.7.0.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/ui/ui-unit-desktop/1.7.0/ui-unit-desktop-1.7.0.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/ui/ui-text-desktop/1.7.0/ui-text-desktop-1.7.0.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/ui/ui-util-desktop/1.7.0/ui-util-desktop-1.7.0.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/components/components-resources-desktop/1.7.0/components-resources-desktop-1.7.0.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/runtime/runtime-desktop/1.7.0/runtime-desktop-1.7.0.jar!/" />
        </CLASSES>
        <JAVADOC>
-          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/jewel/jewel-ide-laf-bridge-242/0.22.1/jewel-ide-laf-bridge-242-0.22.1-javadoc.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/jewel/jewel-ui-242/0.22.1/jewel-ui-242-0.22.1-javadoc.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/jewel/jewel-foundation-242/0.22.1/jewel-foundation-242-0.22.1-javadoc.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/androidx/annotation/annotation/1.1.0/annotation-1.1.0-javadoc.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/jewel/jewel-ide-laf-bridge-243/0.26.2/jewel-ide-laf-bridge-243-0.26.2-javadoc.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/jewel/jewel-ui-243/0.26.2/jewel-ui-243-0.26.2-javadoc.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/jewel/jewel-foundation-243/0.26.2/jewel-foundation-243-0.26.2-javadoc.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/foundation/foundation-desktop/1.7.0/foundation-desktop-1.7.0-javadoc.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/animation/animation-desktop/1.7.0/animation-desktop-1.7.0-javadoc.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/animation/animation-core-desktop/1.7.0/animation-core-desktop-1.7.0-javadoc.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/ui/ui-geometry-desktop/1.7.0/ui-geometry-desktop-1.7.0-javadoc.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/foundation/foundation-layout-desktop/1.7.0/foundation-layout-desktop-1.7.0-javadoc.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/ui/ui-desktop/1.7.0/ui-desktop-1.7.0-javadoc.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/androidx/lifecycle/lifecycle-runtime-compose-desktop/2.8.3/lifecycle-runtime-compose-desktop-2.8.3-javadoc.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/runtime/runtime-saveable-desktop/1.7.0/runtime-saveable-desktop-1.7.0-javadoc.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/ui/ui-graphics-desktop/1.7.0/ui-graphics-desktop-1.7.0-javadoc.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/ui/ui-unit-desktop/1.7.0/ui-unit-desktop-1.7.0-javadoc.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/ui/ui-text-desktop/1.7.0/ui-text-desktop-1.7.0-javadoc.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/ui/ui-util-desktop/1.7.0/ui-util-desktop-1.7.0-javadoc.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/components/components-resources-desktop/1.7.0/components-resources-desktop-1.7.0-javadoc.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/runtime/runtime-desktop/1.7.0/runtime-desktop-1.7.0-javadoc.jar!/" />
        </JAVADOC>
        <SOURCES>
-          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/jewel/jewel-ide-laf-bridge-242/0.22.1/jewel-ide-laf-bridge-242-0.22.1-sources.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/jewel/jewel-ui-242/0.22.1/jewel-ui-242-0.22.1-sources.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/jewel/jewel-foundation-242/0.22.1/jewel-foundation-242-0.22.1-sources.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/foundation/foundation-desktop/1.7.0-dev1743/foundation-desktop-1.7.0-dev1743-sources.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/jewel/jewel-ide-laf-bridge-243/0.26.2/jewel-ide-laf-bridge-243-0.26.2-sources.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/jewel/jewel-ui-243/0.26.2/jewel-ui-243-0.26.2-sources.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/jewel/jewel-foundation-243/0.26.2/jewel-foundation-243-0.26.2-sources.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/foundation/foundation-desktop/1.7.0/foundation-desktop-1.7.0-sources.jar!/" />
          <root url="jar://$MAVEN_REPOSITORY$/androidx/annotation/annotation-jvm/1.8.0/annotation-jvm-1.8.0-sources.jar!/" />
          <root url="jar://$MAVEN_REPOSITORY$/androidx/collection/collection-jvm/1.4.0/collection-jvm-1.4.0-sources.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/animation/animation-desktop/1.7.0-dev1743/animation-desktop-1.7.0-dev1743-sources.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/animation/animation-core-desktop/1.7.0-dev1743/animation-core-desktop-1.7.0-dev1743-sources.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/ui/ui-geometry-desktop/1.7.0-dev1743/ui-geometry-desktop-1.7.0-dev1743-sources.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/foundation/foundation-layout-desktop/1.7.0-dev1743/foundation-layout-desktop-1.7.0-dev1743-sources.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/runtime/runtime-desktop/1.7.0-dev1743/runtime-desktop-1.7.0-dev1743-sources.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/ui/ui-desktop/1.7.0-dev1743/ui-desktop-1.7.0-dev1743-sources.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/androidx/lifecycle/lifecycle-common-jvm/2.8.0/lifecycle-common-jvm-2.8.0-sources.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/androidx/lifecycle/lifecycle-runtime-desktop/2.8.0/lifecycle-runtime-desktop-2.8.0-sources.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/animation/animation-desktop/1.7.0/animation-desktop-1.7.0-sources.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/animation/animation-core-desktop/1.7.0/animation-core-desktop-1.7.0-sources.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/ui/ui-geometry-desktop/1.7.0/ui-geometry-desktop-1.7.0-sources.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/foundation/foundation-layout-desktop/1.7.0/foundation-layout-desktop-1.7.0-sources.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/ui/ui-desktop/1.7.0/ui-desktop-1.7.0-sources.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/androidx/lifecycle/lifecycle-common-jvm/2.8.5/lifecycle-common-jvm-2.8.5-sources.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/androidx/lifecycle/lifecycle-runtime-desktop/2.8.5/lifecycle-runtime-desktop-2.8.5-sources.jar!/" />
          <root url="jar://$MAVEN_REPOSITORY$/androidx/arch/core/core-common/2.2.0/core-common-2.2.0-sources.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/androidx/annotation/annotation/1.1.0/annotation-1.1.0-sources.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/androidx/lifecycle/lifecycle-viewmodel-desktop/2.8.0/lifecycle-viewmodel-desktop-2.8.0-sources.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/androidx/lifecycle/lifecycle-runtime-compose-desktop/2.8.0-dev1743/lifecycle-runtime-compose-desktop-2.8.0-dev1743-sources.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/runtime/runtime-saveable-desktop/1.7.0-dev1743/runtime-saveable-desktop-1.7.0-dev1743-sources.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/ui/ui-graphics-desktop/1.7.0-dev1743/ui-graphics-desktop-1.7.0-dev1743-sources.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/ui/ui-unit-desktop/1.7.0-dev1743/ui-unit-desktop-1.7.0-dev1743-sources.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/ui/ui-text-desktop/1.7.0-dev1743/ui-text-desktop-1.7.0-dev1743-sources.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/ui/ui-util-desktop/1.7.0-dev1743/ui-util-desktop-1.7.0-dev1743-sources.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/androidx/lifecycle/lifecycle-viewmodel-desktop/2.8.5/lifecycle-viewmodel-desktop-2.8.5-sources.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/androidx/lifecycle/lifecycle-runtime-compose-desktop/2.8.3/lifecycle-runtime-compose-desktop-2.8.3-sources.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/androidx/annotation/annotation/1.8.0/annotation-1.8.0-sources.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/runtime/runtime-saveable-desktop/1.7.0/runtime-saveable-desktop-1.7.0-sources.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/ui/ui-graphics-desktop/1.7.0/ui-graphics-desktop-1.7.0-sources.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/ui/ui-unit-desktop/1.7.0/ui-unit-desktop-1.7.0-sources.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/ui/ui-text-desktop/1.7.0/ui-text-desktop-1.7.0-sources.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/ui/ui-util-desktop/1.7.0/ui-util-desktop-1.7.0-sources.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/components/components-resources-desktop/1.7.0/components-resources-desktop-1.7.0-sources.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/runtime/runtime-desktop/1.7.0/runtime-desktop-1.7.0-sources.jar!/" />
        </SOURCES>
      </library>
    </orderEntry>
--- a/libraries/skiko/intellij.libraries.skiko.iml
+++ b/libraries/skiko/intellij.libraries.skiko.iml
@@ -9,37 +9,37 @@
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module-library" exported="">
      <library name="jetbrains.skiko.awt.runtime.all" type="repository">
-        <properties include-transitive-deps="false" maven-id="org.jetbrains.skiko:skiko-awt-runtime-all:0.8.9">
+        <properties include-transitive-deps="false" maven-id="org.jetbrains.skiko:skiko-awt-runtime-all:0.8.15">
          <verification>
-            <artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/skiko/skiko-awt-runtime-all/0.8.9/skiko-awt-runtime-all-0.8.9.jar">
-              <sha256sum>8d1825a1ab736c5eb8fe7b9d4966f82525f1f55dbb8c8a9750da96a7caceb430</sha256sum>
+            <artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/skiko/skiko-awt-runtime-all/0.8.15/skiko-awt-runtime-all-0.8.15.jar">
+              <sha256sum>805ca62e64ec4945a17fde87841c5b0bb32767d2cc7e25968dcef8fa44f990cf</sha256sum>
            </artifact>
          </verification>
        </properties>
        <CLASSES>
-          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/skiko/skiko-awt-runtime-all/0.8.9/skiko-awt-runtime-all-0.8.9.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/skiko/skiko-awt-runtime-all/0.8.15/skiko-awt-runtime-all-0.8.15.jar!/" />
        </CLASSES>
        <JAVADOC />
        <SOURCES>
-          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/skiko/skiko-awt-runtime-all/0.8.9/skiko-awt-runtime-all-0.8.9-sources.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/skiko/skiko-awt-runtime-all/0.8.15/skiko-awt-runtime-all-0.8.15-sources.jar!/" />
        </SOURCES>
      </library>
    </orderEntry>
    <orderEntry type="module-library" exported="">
      <library name="jetbrains.skiko.awt.compose" type="repository">
-        <properties include-transitive-deps="false" maven-id="org.jetbrains.skiko:skiko-awt:0.8.9">
+        <properties include-transitive-deps="false" maven-id="org.jetbrains.skiko:skiko-awt:0.8.15">
          <verification>
-            <artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/skiko/skiko-awt/0.8.9/skiko-awt-0.8.9.jar">
-              <sha256sum>c7f5c1253a1f7ea5876aa122309b517cce1b4d1522eb65eedd8579ec83e5a083</sha256sum>
+            <artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/skiko/skiko-awt/0.8.15/skiko-awt-0.8.15.jar">
+              <sha256sum>2d6efe988f8d3a57e63fcf923f3439cdabb88947e351f97d06ec9b2a6a87fff0</sha256sum>
            </artifact>
          </verification>
        </properties>
        <CLASSES>
-          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/skiko/skiko-awt/0.8.9/skiko-awt-0.8.9.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/skiko/skiko-awt/0.8.15/skiko-awt-0.8.15.jar!/" />
        </CLASSES>
        <JAVADOC />
        <SOURCES>
-          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/skiko/skiko-awt/0.8.9/skiko-awt-0.8.9-sources.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/skiko/skiko-awt/0.8.15/skiko-awt-0.8.15-sources.jar!/" />
        </SOURCES>
      </library>
    </orderEntry>
--- a/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityLibraryLicenses.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityLibraryLicenses.kt
@@ -607,6 +607,10 @@ object CommunityLibraryLicenses {
      .apache("https://github.com/JetBrains/jewel/blob/master/LICENSE")
      .suppliedByOrganizations(Suppliers.JETBRAINS),

+    LibraryLicense("JetBrains Jewel IDE LaF Bridge", url = "https://github.com/JetBrains/jewel", libraryName = "jetbrains.jewel.ide.laf.bridge.243")
+      .apache("https://github.com/JetBrains/jewel/blob/master/LICENSE")
+      .suppliedByOrganizations(Suppliers.JETBRAINS),
+
    LibraryLicense("JetBrains Jewel Markdown IDE LaF Bridge Styling", libraryName = "jetbrains-jewel-markdown-laf-bridge-styling", url = "https://github.com/JetBrains/jewel")
      .apache("https://github.com/JetBrains/jewel/blob/master/LICENSE")
      .suppliedByOrganizations(Suppliers.JETBRAINS),
@@ -1070,8 +1074,12 @@ object CommunityLibraryLicenses {
    LibraryLicense("Skiko", libraryName = "jetbrains.skiko.awt.compose", url = "https://github.com/JetBrains/skiko/")
      .apache("https://github.com/JetBrains/skiko/blob/master/LICENSE"),

-    LibraryLicense("Skiko Runtime", libraryName = "jetbrains.skiko.awt.runtime.all", url = "https://github.com/JetBrains/skiko/")
-      .apache("https://github.com/JetBrains/skiko/blob/master/LICENSE"),
+    LibraryLicense(
+      name = "Skiko Runtime",
+      libraryName = "jetbrains.skiko.awt.runtime.all",
+      additionalLibraryNames = listOf("jetbrains.skiko.awt.runtime.all.0.8.9"),
+      url = "https://github.com/JetBrains/skiko/"
+    ).apache("https://github.com/JetBrains/skiko/blob/master/LICENSE"),

    LibraryLicense(libraryName = "slf4j-api", url = "https://slf4j.org/")
      .mit("https://www.slf4j.org/license.html")
--- a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/JarPackager.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/JarPackager.kt
@@ -878,6 +878,11 @@ private class NativeFileHandlerImpl(private val context: BuildContext, private v
           name.endsWith("icudtl.dat")
  }

+  override fun isCompatibleWithTargetPlatform(name: String): Boolean {
+    if (!isNative(name)) return true
+    return NativeFilesMatcher.isCompatibleWithTargetPlatform(name, context.options.targetOs, context.options.targetArch)
+  }
+
  @Suppress("SpellCheckingInspection")
  override suspend fun sign(name: String, dataSupplier: () -> ByteBuffer): Path? {
    if (!context.isMacCodeSignEnabled || context.proprietaryBuildTools.signTool.signNativeFileMode != SignNativeFileMode.ENABLED) {
--- a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/nativeLib.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/nativeLib.kt
@@ -5,6 +5,7 @@ package org.jetbrains.intellij.build.impl

 import com.intellij.util.PathUtilRt
 import com.intellij.util.lang.ZipFile
+import kotlinx.collections.immutable.PersistentList
 import kotlinx.collections.immutable.persistentMapOf
 import kotlinx.collections.immutable.plus
 import kotlinx.coroutines.CoroutineScope
@@ -103,6 +104,14 @@ class NativeFilesMatcher(paths: List<String>, private val targetOs: Iterable<OsF
  ) {
    override fun toString(): String = "$pathWithPrefix, path=$path, os=$osFamily, arch=$arch"
  }
+
+  companion object {
+    fun isCompatibleWithTargetPlatform(name: String, os: PersistentList<OsFamily>, arch: JvmArchitecture?): Boolean {
+      val fileOs = OsFamilyDetector.detectOsFamily(name)?.first ?: error("Cannot determine native file OS Family")
+      val fileArch = determineArch(fileOs, name) ?: error("Cannot determine native file architecture")
+      return os.contains(fileOs) && (arch == null || fileArch.compatibleWithTarget(arch))
+    }
+  }
 }

 private val posixExecutableFileAttribute = PosixFilePermissions.asFileAttribute(
--- a/platform/build-scripts/src/org/jetbrains/intellij/build/mergeJars.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/mergeJars.kt
@@ -28,6 +28,8 @@ internal interface NativeFileHandler {

  fun isNative(name: String): Boolean

+  fun isCompatibleWithTargetPlatform(name: String): Boolean
+
  suspend fun sign(name: String, dataSupplier: () -> ByteBuffer): Path?
 }

@@ -242,11 +244,17 @@ private suspend fun handleZipSource(
      return@suspendAwareReadZipFile
    }

+    val sourceFileName = sourceFile.fileName.toString()
+    val isSkiko = sourceFileName.startsWith("skiko-awt-runtime-all-") && sourceFileName.endsWith(".jar")
+    val shouldStayInJar = if (isSkiko && nativeFileHandler != null) {
+      !nativeFileHandler.isNative(name) || nativeFileHandler.isCompatibleWithTargetPlatform(name)
+    } else true
+
    if (nativeFileHandler?.isNative(name) == true) {
      if (source.isPreSignedAndExtractedCandidate) {
        nativeFiles!!.value.add(name)
      }
-      else {
+      else if (shouldStayInJar) {
        packageIndexBuilder?.addFile(name)

        // sign it
@@ -261,7 +269,7 @@ private suspend fun handleZipSource(
        }
      }
    }
-    else {
+    else if (shouldStayInJar) {
      packageIndexBuilder?.addFile(name)

      val data = dataSupplier()
--- a/platform/compose/src/com/intellij/platform/compose/JBComposePanel.kt
+++ b/platform/compose/src/com/intellij/platform/compose/JBComposePanel.kt
@@ -3,24 +3,13 @@
 package com.intellij.platform.compose

 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.CompositionLocalProvider
-import androidx.compose.ui.ExperimentalComposeUiApi
-import androidx.compose.ui.awt.ComposePanel
 import com.intellij.openapi.application.ApplicationManager
-import com.intellij.openapi.diagnostic.logger
 import com.intellij.openapi.util.registry.Registry
 import org.jetbrains.annotations.ApiStatus.Experimental
-import org.jetbrains.jewel.bridge.actionSystem.ComponentDataProviderBridge
-import org.jetbrains.jewel.bridge.theme.SwingBridgeTheme
-import org.jetbrains.jewel.foundation.ExperimentalJewelApi
-import org.jetbrains.skiko.ExperimentalSkikoApi
-import org.jetbrains.skiko.GraphicsApi
-import org.jetbrains.skiko.OS
-import org.jetbrains.skiko.SkiaLayerAnalytics
+import org.jetbrains.jewel.bridge.JewelComposePanel
 import javax.swing.JComponent

@Suppress("FunctionName")
-@OptIn(ExperimentalComposeUiApi::class, ExperimentalJewelApi::class)
@Experimental
 fun JBComposePanel(
  content: @Composable () -> Unit
@@ -28,30 +17,5 @@ fun JBComposePanel(
  if (ApplicationManager.getApplication().isInternal) {
    System.setProperty("compose.swing.render.on.graphics", Registry.stringValue("compose.swing.render.on.graphics"))
  }
-  return ComposePanel(ComposeAnalytics()).apply {
-    setContent {
-      SwingBridgeTheme {
-        CompositionLocalProvider(LocalComponent provides this@apply) {
-          ComponentDataProviderBridge(this@apply) {
-            content()
-          }
-        }
-      }
-    }
-  }
-}
-
-@OptIn(ExperimentalSkikoApi::class)
-private class ComposeAnalytics : SkiaLayerAnalytics {
-  override fun renderer(skikoVersion: String, os: OS, api: GraphicsApi): SkiaLayerAnalytics.RendererAnalytics {
-    return object : SkiaLayerAnalytics.RendererAnalytics {
-      override fun init() {
-        LOG.info("Compose panel is initialized with graphicsApi: $api")
-      }
-    }
-  }
-
-  companion object {
-    private val LOG = logger<ComposeAnalytics>()
-  }
+  return JewelComposePanel(content)
 }
--- a/platform/compose/src/com/intellij/platform/compose/showcase/ComposeShowcase.kt
+++ b/platform/compose/src/com/intellij/platform/compose/showcase/ComposeShowcase.kt
@@ -33,6 +33,7 @@ import org.jetbrains.jewel.foundation.theme.OverrideDarkMode
 import org.jetbrains.jewel.ui.Orientation
 import org.jetbrains.jewel.ui.Outline
 import org.jetbrains.jewel.ui.component.*
+import org.jetbrains.jewel.ui.theme.defaultTabStyle
 import org.jetbrains.jewel.ui.theme.tooltipStyle
 import org.jetbrains.jewel.ui.util.isDark
 import java.awt.event.InputEvent
@@ -200,7 +201,7 @@ private fun Tabs() {
    }
  }

-  TabStrip(tabs)
+  TabStrip(tabs, JewelTheme.defaultTabStyle)
 }

@Composable