From 483dbf520e7427ef6ed9ae84db2b1ff8e267601d Mon Sep 17 00:00:00 2001 From: Nebojsa Vuksic Date: Tue, 27 Aug 2024 17:08:13 +0200 Subject: [PATCH] [android] (Ladybug) Merge AS 2024.2.1 Canary 7: update versions of compose foundation-desktop and jewel-ide-laf-bridge libraries Compose foundation-desktop and jewel-ide-laf-bridge-242 are also used in Android plugin intellij.android.adt.ui.compose module. Versions of libraries are updated so that `intellij.libraries.compose.desktop` module can be reused in the Android plugin. GitOrigin-RevId: 601145725a8ddaeace3a0113377e089aefb5a544 --- .../intellij.libraries.compose.desktop.iml | 126 +++++++++--------- .../build/CommunityLibraryLicenses.kt | 2 +- 2 files changed, 64 insertions(+), 64 deletions(-) diff --git a/libraries/compose-desktop/intellij.libraries.compose.desktop.iml b/libraries/compose-desktop/intellij.libraries.compose.desktop.iml index 16d0624286ee..1ec8c0e87c7a 100644 --- a/libraries/compose-desktop/intellij.libraries.compose.desktop.iml +++ b/libraries/compose-desktop/intellij.libraries.compose.desktop.iml @@ -9,10 +9,10 @@ - + - - 6e0393b0d6b9308a0fbc359a1732593322b8b4108e6d033469f1dedbbbdf5031 + + b53763dbce2f2e29827f8fb6e29a290c38860c0a108e8b61c04541d706539832 9aab326d9492800991854360ac248f493ce7f7c3183519309b78ace9e240f6f6 @@ -20,23 +20,23 @@ d5cf7b72647c7995071588fe870450ff9c8f127f253d2d4851e161b800f67ae0 - - 98e329d2e50ec465c7e3150f572487b5b6afb0ed4ab978630cb233aecc26fd63 + + 3cd2a181afcbdf189310710d95530cd7c16c4111fd83c362de5e9caafe547be6 - - 444f9d9c0fccbf8ec5b9efc79c4039de3921975612e13d71b21df836956aee0a + + 19b9d7ba4659a676d94f6a3fd010f75ddb04cf64d0be97ced4dae91b4dea8a79 - + 4b86c961c0b4bce7995329fd57d4339ede11cb75d7ec90bc1b9913396addb30f - - f229a89e4be8c7289b100e3f1cab616f97e9a361964aafb5e2290958935fbb21 + + d2c867c13ff6632f9880e67dabab2e930007b008b9b22950fc2cc075008eceb6 - - afb8d12e503081d5b83a65bfe7184ff6248c8c6e03119249638cbbe9dd3c8e8a + + e55e98e7da0a42c8c5a05c7b78a6401e86f68e7ec970ed16a8584712f3853a67 - - 86113f6063e4e8647dcbd07c3cbebb19c98b3c9525faa1e807d5da226ca41b94 + + a5051996d7a52e9aa8aea29abfc673e32ee78d11833e06f5596415798ebff6e3 61c873a7327c946ec033c310bb98f3f92eeabcede0e1a5200ab8a1896483c7bf @@ -53,22 +53,22 @@ 5c28f3ba9732f2180685038dbe674059fd9b7843c721cd0f6c73f3dbfcb2683c - - a86a4faee71844ab986c6e1af67aae412b802f99b4a611113305e9f9d04fc271 + + 0586442d33274e3a7cc41ddcb9c706304d6300eaa6d57f43857f1a62dd2c1628 - - bc30d93dce0bdf9c8ea707227ebb85b82694e4a0ddab618aa5bb5613c3b87cc0 + + 4306363be90eaabe74b900db4c32ed1f15c7548e5b30a7093c4ee40c436b9b8c - + 5acc2058c905ceca092cfe8cd91bb082df7fce6126c971d826ca64b538dc7b92 - + 598b52e257ed674145694b9790a7383a90fed2ec7154ba09ace4aa983c65b1a2 - - faccd4d5e86a3ab2741cdf5dc82e8e765cf0ada911ec929436940eae0a6807ef + + c690d309b6558a05370e3b239956458c7244dfae2e567115d107b454c8da3461 - + 161dcc73b929da61cee50045e96fb02f1633c36f18a2ef38b5c2c44c38606b52 @@ -82,64 +82,64 @@ - + - - - - - - + + + + + + - - - - - - + + + + + + - + - - - - - - + + + + + + - - - - - - + + + + + + - - + + - - 4d036de01b2503385a0954a4b9227bc1aa05f74241ba1388bd49dae1ca8c9f4a + + 640d563e1eec402c43df6c19771b9af27b1ae61d04932e0b69c68cd2e03736ce - - 82ca281594b47d75db6951c12e872e03859ee129c3c898986427b141efaf641a + + 86b4a2026893831af5351aa0ca696488d1da0b252c08920843ed926c4f690b09 - - 9ae37fc841c4bf540120583e4c469fe1f5359228ef304c8a2f7f83a5407c1150 + + 53ae086fa6249c1ac8d52f43d19263491b034f4a4c7c81919aa7cfa3dc8d9598 @@ -147,15 +147,15 @@ - - - + + + - - - + + + 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 64f67adbe46c..9135233da712 100644 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityLibraryLicenses.kt +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityLibraryLicenses.kt @@ -774,7 +774,7 @@ object CommunityLibraryLicenses { LibraryLicense( name = "JetBrains Jewel IDE LaF Bridge", url = "https://github.com/JetBrains/jewel", - libraryName = "jetbrains.jewel.ide.laf.bridge.241" + libraryName = "jetbrains.jewel.ide.laf.bridge.242" ) .apache("https://github.com/JetBrains/jewel/blob/master/LICENSE") .suppliedByOrganizations(Suppliers.JETBRAINS),