diff --git a/lib/BUILD.bazel b/lib/BUILD.bazel index 6efb0eccb1db..238533576acf 100644 --- a/lib/BUILD.bazel +++ b/lib/BUILD.bazel @@ -4866,9 +4866,8 @@ jvm_import( ) java_library( - name = "libraries-compose-runtime-desktop-jetbrains-compose-runtime-desktop", + name = "libraries-compose-runtime-desktop-compose-runtime-desktop", exports = [ - ":org_jetbrains_compose_runtime-runtime-desktop-1_9_0-beta03_http_import", ":androidx_compose_runtime-runtime-desktop-1_9_0-rc01_http_import", ":androidx_collection-collection-jvm-1_5_0_http_import", ":androidx_annotation-annotation-jvm-1_9_1_http_import", @@ -4877,12 +4876,6 @@ java_library( visibility = ["//visibility:public"] ) -jvm_import( - name = "org_jetbrains_compose_runtime-runtime-desktop-1_9_0-beta03_http_import", - jar = "@org_jetbrains_compose_runtime-runtime-desktop-1_9_0-beta03_http//file", - source_jar = "@org_jetbrains_compose_runtime-runtime-desktop-1_9_0-beta03_http//file" -) - jvm_import( name = "androidx_compose_runtime-runtime-desktop-1_9_0-rc01_http_import", jar = "@androidx_compose_runtime-runtime-desktop-1_9_0-rc01_http//file", diff --git a/lib/MODULE.bazel b/lib/MODULE.bazel index f0177774c15e..946dc881d1f5 100644 --- a/lib/MODULE.bazel +++ b/lib/MODULE.bazel @@ -6985,13 +6985,6 @@ http_file( downloaded_file_path = "kotlinx-coroutines-test-jvm-1.8.1-sources.jar" ) -http_file( - name = "org_jetbrains_compose_runtime-runtime-desktop-1_9_0-beta03_http", - url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/org/jetbrains/compose/runtime/runtime-desktop/1.9.0-beta03/runtime-desktop-1.9.0-beta03.jar", - sha256 = "05f5570c0a7ea8addd6fe9507a70f293efa7f1450d8b9b16dc3c8fee21cc6127", - downloaded_file_path = "runtime-desktop-1.9.0-beta03.jar" -) - http_file( name = "androidx_compose_runtime-runtime-desktop-1_9_0-rc01_http", url = "https://cache-redirector.jetbrains.com/dl.google.com/dl/android/maven2/androidx/compose/runtime/runtime-desktop/1.9.0-rc01/runtime-desktop-1.9.0-rc01.jar", @@ -7006,13 +6999,6 @@ http_file( downloaded_file_path = "runtime-annotation-jvm-1.9.0-rc01.jar" ) -http_file( - name = "org_jetbrains_compose_runtime-runtime-desktop-1_9_0-beta03-sources_http", - url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/org/jetbrains/compose/runtime/runtime-desktop/1.9.0-beta03/runtime-desktop-1.9.0-beta03-sources.jar", - sha256 = "6f27472e1e5fe26259f156b498f6745feb57b651b673d65fe9938a7fec2d9065", - downloaded_file_path = "runtime-desktop-1.9.0-beta03-sources.jar" -) - http_file( name = "androidx_compose_runtime-runtime-desktop-1_9_0-rc01-sources_http", url = "https://cache-redirector.jetbrains.com/dl.google.com/dl/android/maven2/androidx/compose/runtime/runtime-desktop/1.9.0-rc01/runtime-desktop-1.9.0-rc01-sources.jar", diff --git a/libraries/compose-runtime-desktop/BUILD.bazel b/libraries/compose-runtime-desktop/BUILD.bazel index 2f35cdbd6bfe..8a1d8f49ba91 100644 --- a/libraries/compose-runtime-desktop/BUILD.bazel +++ b/libraries/compose-runtime-desktop/BUILD.bazel @@ -12,7 +12,7 @@ jvm_library( visibility = ["//visibility:public"], srcs = glob([], allow_empty = True), resources = [":compose-runtime-desktop_resources"], - exports = ["@lib//:libraries-compose-runtime-desktop-jetbrains-compose-runtime-desktop"], - runtime_deps = ["@lib//:libraries-compose-runtime-desktop-jetbrains-compose-runtime-desktop"] + exports = ["@lib//:libraries-compose-runtime-desktop-compose-runtime-desktop"], + runtime_deps = ["@lib//:libraries-compose-runtime-desktop-compose-runtime-desktop"] ) ### auto-generated section `build intellij.libraries.compose.runtime.desktop` end \ No newline at end of file diff --git a/libraries/compose-runtime-desktop/intellij.libraries.compose.runtime.desktop.iml b/libraries/compose-runtime-desktop/intellij.libraries.compose.runtime.desktop.iml index 43877e40094c..2f7ccdb4e04a 100644 --- a/libraries/compose-runtime-desktop/intellij.libraries.compose.runtime.desktop.iml +++ b/libraries/compose-runtime-desktop/intellij.libraries.compose.runtime.desktop.iml @@ -8,12 +8,9 @@ - - + + - - 05f5570c0a7ea8addd6fe9507a70f293efa7f1450d8b9b16dc3c8fee21cc6127 - ae657e4332fb72fa1b437ce5caa486c6b4a5e17588aaef0267aa92918bba7458 @@ -28,25 +25,20 @@ - - + - - - - + - 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 6d6709f331ac..be15ec777624 100644 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityLibraryLicenses.kt +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityLibraryLicenses.kt @@ -267,6 +267,10 @@ object CommunityLibraryLicenses { .apache("https://github.com/JetBrains/compose-multiplatform/blob/master/LICENSE.txt") .suppliedByOrganizations(Suppliers.JETBRAINS), + LibraryLicense("Compose Runtime", libraryName = "compose.runtime.desktop", url = "https://source.android.com/") + .apache("https://cs.android.com/androidx/platform/frameworks/support/+/androidx-main:LICENSE.txt") + .suppliedByOrganizations(Suppliers.GOOGLE), + // For ADB wireless QR Code generation LibraryLicense("Core barcode encoding/decoding library", url = "https://github.com/zxing/zxing/tree/master/core", libraryName = "zxing-core") .apache("https://github.com/zxing/zxing/blob/master/LICENSE")