mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
[compose] IJPL-210422 Remove vestigial Compose runtime lib
This Compose runtime-desktop lib contains no classes. It appears to be a vestige of the transition from org.jetbrains.compose.runtime to androidx.compose.runtime. This lib contains META-INF/runtime.kotlin_module which conflicts with the correct metadata inside androidx.compose.runtime:runtime-desktop. This conflict breaks compilation in third party plugins using Compose. closes https://github.com/JetBrains/intellij-community/pull/3256 GitOrigin-RevId: a114da727ccefe41b978b720186cc2a1dbfa8842
This commit is contained in:
Matthew Gharrity
committed by
intellij-monorepo-bot
intellij-monorepo-bot
parent
2f2a86bc38
commit
cb4205cd73
+1
-8
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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
|
||||
@@ -8,12 +8,9 @@
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="module-library" exported="">
|
||||
<library name="jetbrains.compose.runtime.desktop" type="repository">
|
||||
<properties maven-id="org.jetbrains.compose.runtime:runtime-desktop:1.9.0-beta03">
|
||||
<library name="compose.runtime.desktop" type="repository">
|
||||
<properties maven-id="androidx.compose.runtime:runtime-desktop:1.9.0-rc01">
|
||||
<verification>
|
||||
<artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/compose/runtime/runtime-desktop/1.9.0-beta03/runtime-desktop-1.9.0-beta03.jar">
|
||||
<sha256sum>05f5570c0a7ea8addd6fe9507a70f293efa7f1450d8b9b16dc3c8fee21cc6127</sha256sum>
|
||||
</artifact>
|
||||
<artifact url="file://$MAVEN_REPOSITORY$/androidx/compose/runtime/runtime-desktop/1.9.0-rc01/runtime-desktop-1.9.0-rc01.jar">
|
||||
<sha256sum>ae657e4332fb72fa1b437ce5caa486c6b4a5e17588aaef0267aa92918bba7458</sha256sum>
|
||||
</artifact>
|
||||
@@ -28,25 +25,20 @@
|
||||
</artifact>
|
||||
</verification>
|
||||
<exclude>
|
||||
<dependency maven-id="org.jetbrains.kotlin:kotlin-stdlib-common" />
|
||||
<dependency maven-id="org.jetbrains.kotlin:kotlin-stdlib" />
|
||||
<dependency maven-id="org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm" />
|
||||
<dependency maven-id="org.jetbrains.kotlin:kotlin-stdlib-common" />
|
||||
<dependency maven-id="org.jetbrains.kotlinx:kotlinx-coroutines-core" />
|
||||
<dependency maven-id="org.jetbrains:annotations" />
|
||||
</exclude>
|
||||
</properties>
|
||||
<CLASSES>
|
||||
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/runtime/runtime-desktop/1.9.0-beta03/runtime-desktop-1.9.0-beta03.jar!/" />
|
||||
<root url="jar://$MAVEN_REPOSITORY$/androidx/compose/runtime/runtime-desktop/1.9.0-rc01/runtime-desktop-1.9.0-rc01.jar!/" />
|
||||
<root url="jar://$MAVEN_REPOSITORY$/androidx/collection/collection-jvm/1.5.0/collection-jvm-1.5.0.jar!/" />
|
||||
<root url="jar://$MAVEN_REPOSITORY$/androidx/annotation/annotation-jvm/1.9.1/annotation-jvm-1.9.1.jar!/" />
|
||||
<root url="jar://$MAVEN_REPOSITORY$/androidx/compose/runtime/runtime-annotation-jvm/1.9.0-rc01/runtime-annotation-jvm-1.9.0-rc01.jar!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC>
|
||||
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/runtime/runtime-desktop/1.9.0-beta03/runtime-desktop-1.9.0-beta03-javadoc.jar!/" />
|
||||
</JAVADOC>
|
||||
<JAVADOC />
|
||||
<SOURCES>
|
||||
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/compose/runtime/runtime-desktop/1.9.0-beta03/runtime-desktop-1.9.0-beta03-sources.jar!/" />
|
||||
<root url="jar://$MAVEN_REPOSITORY$/androidx/compose/runtime/runtime-desktop/1.9.0-rc01/runtime-desktop-1.9.0-rc01-sources.jar!/" />
|
||||
<root url="jar://$MAVEN_REPOSITORY$/androidx/collection/collection-jvm/1.5.0/collection-jvm-1.5.0-sources.jar!/" />
|
||||
<root url="jar://$MAVEN_REPOSITORY$/androidx/annotation/annotation-jvm/1.9.1/annotation-jvm-1.9.1-sources.jar!/" />
|
||||
|
||||
@@ -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")
|
||||
|
||||
Reference in New Issue
Block a user