From 386950db6c406a74e6293b0d3a29cf27451c0635 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Tue, 24 Dec 2024 15:27:38 +0100 Subject: [PATCH] extract compose-foundation-desktop as project lib (cherry picked from commit 4e576f9e6c0a9d8eda125b7d803b3dcf552126dd) (cherry picked from commit 4e2607f78aff6acbf5fc1d981569b21a73c10b4c) IJ-MR-155570 GitOrigin-RevId: b96cfed0383369e91643e3a6ee192032df30f58b --- .idea/modules.xml | 1 + .../intellij.libraries.compose.desktop.iml | 1 - ...j.libraries.compose.foundation.desktop.iml | 136 ++++++++++++++++++ ...j.libraries.compose.foundation.desktop.xml | 2 + .../build/CommunityLibraryLicenses.kt | 2 +- .../compose/intellij.platform.compose.iml | 1 + ...ntellij.platform.jewel.decoratedWindow.iml | 3 +- .../intellij.platform.jewel.foundation.iml | 128 +---------------- .../intellij.platform.jewel.ideLafBridge.iml | 3 +- ...j.platform.jewel.intUi.decoratedWindow.iml | 3 +- ...tellij.platform.jewel.intUi.standalone.iml | 3 +- .../intellij.platform.jewel.markdown.core.iml | 3 +- ...form.jewel.markdown.extension.autolink.iml | 3 +- ...orm.jewel.markdown.extension.gfmAlerts.iml | 3 +- ...orm.jewel.markdown.ideLafBridgeStyling.iml | 3 +- ....jewel.markdown.intUiStandaloneStyling.iml | 3 +- ...ellij.platform.jewel.samples.idePlugin.iml | 3 +- ...llij.platform.jewel.samples.standalone.iml | 3 +- .../intellij.platform.jewel.uiTests.iml | 3 +- .../jewel/ui/intellij.platform.jewel.ui.iml | 3 +- .../resources/intellij.platform.jewel.ui.xml | 1 + .../src/META-INF/common-ide-modules.xml | 1 + .../intellij.markdown.compose.preview.iml | 5 + 23 files changed, 176 insertions(+), 141 deletions(-) create mode 100644 libraries/compose-foundation-desktop/intellij.libraries.compose.foundation.desktop.iml create mode 100644 libraries/compose-foundation-desktop/resources/intellij.libraries.compose.foundation.desktop.xml diff --git a/.idea/modules.xml b/.idea/modules.xml index 05c146d3856e..c436e1b06b56 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -543,6 +543,7 @@ + diff --git a/libraries/compose-desktop/intellij.libraries.compose.desktop.iml b/libraries/compose-desktop/intellij.libraries.compose.desktop.iml index aa889ed56d4c..f3222849a5b4 100644 --- a/libraries/compose-desktop/intellij.libraries.compose.desktop.iml +++ b/libraries/compose-desktop/intellij.libraries.compose.desktop.iml @@ -165,6 +165,5 @@ - \ No newline at end of file diff --git a/libraries/compose-foundation-desktop/intellij.libraries.compose.foundation.desktop.iml b/libraries/compose-foundation-desktop/intellij.libraries.compose.foundation.desktop.iml new file mode 100644 index 000000000000..7b454ca696f5 --- /dev/null +++ b/libraries/compose-foundation-desktop/intellij.libraries.compose.foundation.desktop.iml @@ -0,0 +1,136 @@ + + + + + + + + + + + + + + + 50df385b328a0ad7a479e690cfe593fbce08ad39ed57916747932956dee07f0b + + + 9aab326d9492800991854360ac248f493ce7f7c3183519309b78ace9e240f6f6 + + + d5cf7b72647c7995071588fe870450ff9c8f127f253d2d4851e161b800f67ae0 + + + 474e6bd2a6ac2362e5dabd780f93b852768640aa16403b0fc505da88177f97b3 + + + 2b347abf6c48626153a02b70eef6bbe1d3c9527515d6f9f7eceaea3c398533bb + + + 4b86c961c0b4bce7995329fd57d4339ede11cb75d7ec90bc1b9913396addb30f + + + d2c867c13ff6632f9880e67dabab2e930007b008b9b22950fc2cc075008eceb6 + + + 76e3250547b9ca3cb1a49c272933b25cb3bccbc9ba12775dd6161a63d9aa7cf1 + + + 40729b9637eac91fd9ba9d10c4cd2eb328bb3116f8097a5b9d3f071971cea022 + + + 61c873a7327c946ec033c310bb98f3f92eeabcede0e1a5200ab8a1896483c7bf + + + 10bfe53bb2752f967751a5102cdb785eeea54e1d4df6bde88fb0f50b0a49156c + + + 65308a06b1c00ee186cb9e19321383f043b993813f1522c47f4a3e3303bdba41 + + + 21ec0e77dc02ed0d6bfe6f3cba7f43e25400446d89ded8568ee165437e0c1922 + + + c1e51a246e69e237e87d289be08bebd8d406ffe9ff60a125e8f2072db6119966 + + + fe70ace6f942a5fc29045bb2fe25b4e77bdc742dc69f76ed65b39c3ae185888e + + + 4306363be90eaabe74b900db4c32ed1f15c7548e5b30a7093c4ee40c436b9b8c + + + 9109d77cc262f90408169b1ca0ba2d15135b6034e377a80bbf3ec0234954e852 + + + 598b52e257ed674145694b9790a7383a90fed2ec7154ba09ace4aa983c65b1a2 + + + 80e07e4ca739f7b6122f63e9a17e6853b947220ecb1180f8dcaf419d0e468996 + + + 161dcc73b929da61cee50045e96fb02f1633c36f18a2ef38b5c2c44c38606b52 + + + 101ff43ff563fca167af5ade98c3b69bf569010eab745013b84d8955034d3b3c + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/libraries/compose-foundation-desktop/resources/intellij.libraries.compose.foundation.desktop.xml b/libraries/compose-foundation-desktop/resources/intellij.libraries.compose.foundation.desktop.xml new file mode 100644 index 000000000000..6fb76a66265d --- /dev/null +++ b/libraries/compose-foundation-desktop/resources/intellij.libraries.compose.foundation.desktop.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityLibraryLicenses.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityLibraryLicenses.kt index bed1283e4ecf..21134111c697 100644 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityLibraryLicenses.kt +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityLibraryLicenses.kt @@ -250,7 +250,7 @@ object CommunityLibraryLicenses { .apache("https://cs.android.com/androidx/platform/frameworks/support/+/androidx-main:LICENSE.txt") .suppliedByOrganizations(Suppliers.GOOGLE), - LibraryLicense("Compose Multiplatform", libraryName = "org.jetbrains.compose.foundation.foundation.desktop", url = "https://github.com/JetBrains/compose-multiplatform") + LibraryLicense("Compose Multiplatform", libraryName = "compose-foundation-desktop", url = "https://github.com/JetBrains/compose-multiplatform") .apache("https://github.com/JetBrains/compose-multiplatform/blob/master/LICENSE.txt") .additionalLibraryNames( "org.jetbrains.compose.components.components.resources.desktop", diff --git a/platform/compose/intellij.platform.compose.iml b/platform/compose/intellij.platform.compose.iml index 1061ae83d400..8b1256869f83 100644 --- a/platform/compose/intellij.platform.compose.iml +++ b/platform/compose/intellij.platform.compose.iml @@ -37,6 +37,7 @@ + \ No newline at end of file diff --git a/platform/jewel/decorated-window/intellij.platform.jewel.decoratedWindow.iml b/platform/jewel/decorated-window/intellij.platform.jewel.decoratedWindow.iml index 36514c55af67..8193c8f5cf34 100644 --- a/platform/jewel/decorated-window/intellij.platform.jewel.decoratedWindow.iml +++ b/platform/jewel/decorated-window/intellij.platform.jewel.decoratedWindow.iml @@ -37,7 +37,8 @@ + - \ No newline at end of file + diff --git a/platform/jewel/foundation/intellij.platform.jewel.foundation.iml b/platform/jewel/foundation/intellij.platform.jewel.foundation.iml index 8a98264188a4..d170b15c77f0 100644 --- a/platform/jewel/foundation/intellij.platform.jewel.foundation.iml +++ b/platform/jewel/foundation/intellij.platform.jewel.foundation.iml @@ -35,131 +35,7 @@ - - - - - - 50df385b328a0ad7a479e690cfe593fbce08ad39ed57916747932956dee07f0b - - - 9aab326d9492800991854360ac248f493ce7f7c3183519309b78ace9e240f6f6 - - - d5cf7b72647c7995071588fe870450ff9c8f127f253d2d4851e161b800f67ae0 - - - 474e6bd2a6ac2362e5dabd780f93b852768640aa16403b0fc505da88177f97b3 - - - 2b347abf6c48626153a02b70eef6bbe1d3c9527515d6f9f7eceaea3c398533bb - - - 4b86c961c0b4bce7995329fd57d4339ede11cb75d7ec90bc1b9913396addb30f - - - d2c867c13ff6632f9880e67dabab2e930007b008b9b22950fc2cc075008eceb6 - - - 76e3250547b9ca3cb1a49c272933b25cb3bccbc9ba12775dd6161a63d9aa7cf1 - - - 40729b9637eac91fd9ba9d10c4cd2eb328bb3116f8097a5b9d3f071971cea022 - - - 61c873a7327c946ec033c310bb98f3f92eeabcede0e1a5200ab8a1896483c7bf - - - 10bfe53bb2752f967751a5102cdb785eeea54e1d4df6bde88fb0f50b0a49156c - - - 65308a06b1c00ee186cb9e19321383f043b993813f1522c47f4a3e3303bdba41 - - - 21ec0e77dc02ed0d6bfe6f3cba7f43e25400446d89ded8568ee165437e0c1922 - - - c1e51a246e69e237e87d289be08bebd8d406ffe9ff60a125e8f2072db6119966 - - - fe70ace6f942a5fc29045bb2fe25b4e77bdc742dc69f76ed65b39c3ae185888e - - - 4306363be90eaabe74b900db4c32ed1f15c7548e5b30a7093c4ee40c436b9b8c - - - 9109d77cc262f90408169b1ca0ba2d15135b6034e377a80bbf3ec0234954e852 - - - 598b52e257ed674145694b9790a7383a90fed2ec7154ba09ace4aa983c65b1a2 - - - 80e07e4ca739f7b6122f63e9a17e6853b947220ecb1180f8dcaf419d0e468996 - - - 161dcc73b929da61cee50045e96fb02f1633c36f18a2ef38b5c2c44c38606b52 - - - 101ff43ff563fca167af5ade98c3b69bf569010eab745013b84d8955034d3b3c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -471,4 +347,4 @@ - \ No newline at end of file + diff --git a/platform/jewel/ide-laf-bridge/intellij.platform.jewel.ideLafBridge.iml b/platform/jewel/ide-laf-bridge/intellij.platform.jewel.ideLafBridge.iml index fd3c2aaf6826..1f3ec82a1acf 100644 --- a/platform/jewel/ide-laf-bridge/intellij.platform.jewel.ideLafBridge.iml +++ b/platform/jewel/ide-laf-bridge/intellij.platform.jewel.ideLafBridge.iml @@ -352,6 +352,7 @@ + - \ No newline at end of file + diff --git a/platform/jewel/int-ui/int-ui-decorated-window/intellij.platform.jewel.intUi.decoratedWindow.iml b/platform/jewel/int-ui/int-ui-decorated-window/intellij.platform.jewel.intUi.decoratedWindow.iml index 433cbf70789c..5c62db380c3a 100644 --- a/platform/jewel/int-ui/int-ui-decorated-window/intellij.platform.jewel.intUi.decoratedWindow.iml +++ b/platform/jewel/int-ui/int-ui-decorated-window/intellij.platform.jewel.intUi.decoratedWindow.iml @@ -37,7 +37,8 @@ + - \ No newline at end of file + diff --git a/platform/jewel/int-ui/int-ui-standalone/intellij.platform.jewel.intUi.standalone.iml b/platform/jewel/int-ui/int-ui-standalone/intellij.platform.jewel.intUi.standalone.iml index 525849abf9ff..773e31cab9c3 100644 --- a/platform/jewel/int-ui/int-ui-standalone/intellij.platform.jewel.intUi.standalone.iml +++ b/platform/jewel/int-ui/int-ui-standalone/intellij.platform.jewel.intUi.standalone.iml @@ -38,6 +38,7 @@ + - \ No newline at end of file + diff --git a/platform/jewel/markdown/core/intellij.platform.jewel.markdown.core.iml b/platform/jewel/markdown/core/intellij.platform.jewel.markdown.core.iml index ef93a331922e..c8679de67e86 100644 --- a/platform/jewel/markdown/core/intellij.platform.jewel.markdown.core.iml +++ b/platform/jewel/markdown/core/intellij.platform.jewel.markdown.core.iml @@ -362,7 +362,8 @@ + - \ No newline at end of file + diff --git a/platform/jewel/markdown/extension/autolink/intellij.platform.jewel.markdown.extension.autolink.iml b/platform/jewel/markdown/extension/autolink/intellij.platform.jewel.markdown.extension.autolink.iml index f91fccb20659..050de21804a3 100644 --- a/platform/jewel/markdown/extension/autolink/intellij.platform.jewel.markdown.extension.autolink.iml +++ b/platform/jewel/markdown/extension/autolink/intellij.platform.jewel.markdown.extension.autolink.iml @@ -374,6 +374,7 @@ + - \ No newline at end of file + diff --git a/platform/jewel/markdown/extension/gfm-alerts/intellij.platform.jewel.markdown.extension.gfmAlerts.iml b/platform/jewel/markdown/extension/gfm-alerts/intellij.platform.jewel.markdown.extension.gfmAlerts.iml index 70cd46a67afc..20f01e372bee 100644 --- a/platform/jewel/markdown/extension/gfm-alerts/intellij.platform.jewel.markdown.extension.gfmAlerts.iml +++ b/platform/jewel/markdown/extension/gfm-alerts/intellij.platform.jewel.markdown.extension.gfmAlerts.iml @@ -346,6 +346,7 @@ + - \ No newline at end of file + diff --git a/platform/jewel/markdown/ide-laf-bridge-styling/intellij.platform.jewel.markdown.ideLafBridgeStyling.iml b/platform/jewel/markdown/ide-laf-bridge-styling/intellij.platform.jewel.markdown.ideLafBridgeStyling.iml index a5cd4656631a..edc5ae27424a 100644 --- a/platform/jewel/markdown/ide-laf-bridge-styling/intellij.platform.jewel.markdown.ideLafBridgeStyling.iml +++ b/platform/jewel/markdown/ide-laf-bridge-styling/intellij.platform.jewel.markdown.ideLafBridgeStyling.iml @@ -350,7 +350,8 @@ + - \ No newline at end of file + diff --git a/platform/jewel/markdown/int-ui-standalone-styling/intellij.platform.jewel.markdown.intUiStandaloneStyling.iml b/platform/jewel/markdown/int-ui-standalone-styling/intellij.platform.jewel.markdown.intUiStandaloneStyling.iml index f5be600f2ad9..60238c4a147f 100644 --- a/platform/jewel/markdown/int-ui-standalone-styling/intellij.platform.jewel.markdown.intUiStandaloneStyling.iml +++ b/platform/jewel/markdown/int-ui-standalone-styling/intellij.platform.jewel.markdown.intUiStandaloneStyling.iml @@ -346,7 +346,8 @@ + - \ No newline at end of file + diff --git a/platform/jewel/samples/ide-plugin/intellij.platform.jewel.samples.idePlugin.iml b/platform/jewel/samples/ide-plugin/intellij.platform.jewel.samples.idePlugin.iml index 9ee16dc6c7a1..bddabba4fae6 100644 --- a/platform/jewel/samples/ide-plugin/intellij.platform.jewel.samples.idePlugin.iml +++ b/platform/jewel/samples/ide-plugin/intellij.platform.jewel.samples.idePlugin.iml @@ -44,8 +44,9 @@ + - \ No newline at end of file + diff --git a/platform/jewel/samples/standalone/intellij.platform.jewel.samples.standalone.iml b/platform/jewel/samples/standalone/intellij.platform.jewel.samples.standalone.iml index 1bff7fe53b8b..9724f28617ff 100644 --- a/platform/jewel/samples/standalone/intellij.platform.jewel.samples.standalone.iml +++ b/platform/jewel/samples/standalone/intellij.platform.jewel.samples.standalone.iml @@ -136,5 +136,6 @@ + - \ No newline at end of file + diff --git a/platform/jewel/ui-tests/intellij.platform.jewel.uiTests.iml b/platform/jewel/ui-tests/intellij.platform.jewel.uiTests.iml index a985dacfdad1..2b64534ab640 100644 --- a/platform/jewel/ui-tests/intellij.platform.jewel.uiTests.iml +++ b/platform/jewel/ui-tests/intellij.platform.jewel.uiTests.iml @@ -345,6 +345,7 @@ + - \ No newline at end of file + diff --git a/platform/jewel/ui/intellij.platform.jewel.ui.iml b/platform/jewel/ui/intellij.platform.jewel.ui.iml index 01679682ec0f..5a3ef85014c3 100644 --- a/platform/jewel/ui/intellij.platform.jewel.ui.iml +++ b/platform/jewel/ui/intellij.platform.jewel.ui.iml @@ -384,5 +384,6 @@ + - \ No newline at end of file + diff --git a/platform/jewel/ui/src/main/resources/intellij.platform.jewel.ui.xml b/platform/jewel/ui/src/main/resources/intellij.platform.jewel.ui.xml index e8d4bc2abfd6..bd1e0a581c6f 100644 --- a/platform/jewel/ui/src/main/resources/intellij.platform.jewel.ui.xml +++ b/platform/jewel/ui/src/main/resources/intellij.platform.jewel.ui.xml @@ -1,5 +1,6 @@ + diff --git a/platform/platform-resources/src/META-INF/common-ide-modules.xml b/platform/platform-resources/src/META-INF/common-ide-modules.xml index b144be1260b6..88f6dc84b75d 100644 --- a/platform/platform-resources/src/META-INF/common-ide-modules.xml +++ b/platform/platform-resources/src/META-INF/common-ide-modules.xml @@ -11,6 +11,7 @@ + diff --git a/plugins/markdown/compose/intellij.markdown.compose.preview.iml b/plugins/markdown/compose/intellij.markdown.compose.preview.iml index 64601f24a3cf..ea5c2ffc7cfe 100644 --- a/plugins/markdown/compose/intellij.markdown.compose.preview.iml +++ b/plugins/markdown/compose/intellij.markdown.compose.preview.iml @@ -30,8 +30,13 @@ + + + + + \ No newline at end of file