diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 0f414ab3e0eb..df28c1dd7aaa 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -43,6 +43,8 @@ + + diff --git a/.idea/libraries/aia_proto.xml b/.idea/libraries/aia_proto.xml deleted file mode 100644 index 39865c9bce59..000000000000 --- a/.idea/libraries/aia_proto.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - fc56d0846f53f85b3cb443f3bbf13405b3361ff48cb74ec03d226a7b55e1f90c - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/android_test_plugin_host_device_info_proto.xml b/.idea/libraries/android_test_plugin_host_device_info_proto.xml index bf0889499e86..afcdaf29d925 100644 --- a/.idea/libraries/android_test_plugin_host_device_info_proto.xml +++ b/.idea/libraries/android_test_plugin_host_device_info_proto.xml @@ -1,14 +1,14 @@ - + - + b6e1c5f2f773dad73e0b9f3f774db4100d275e818b1a53c1358ec94f881ca605 - + diff --git a/.idea/libraries/android_tools_build_apkzlib.xml b/.idea/libraries/android_tools_build_apkzlib.xml new file mode 100644 index 000000000000..3f8aa3e0133b --- /dev/null +++ b/.idea/libraries/android_tools_build_apkzlib.xml @@ -0,0 +1,56 @@ + + + + + + 415c5d5adff68b0ebd700e27c04c150683e65d5731d47fdb018eae391f70768c + + + 6d6a13a51ac3806c11af5f0967092055e35a67df6a74bff1544d9f5518c5ad55 + + + 766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7 + + + e6dd072f9d3fe02a4600688380bd422bdac184caf6fe2418cfdd0934f09432aa + + + a171ee4c734dd2da837e4b16be9df4661afab72a41adaf31eb84dfdaf936ca26 + + + b372a037d4230aa57fbeffdef30fd6123f9c0c2db85d0aced00c91b974f33f99 + + + 729990b3f18a95606fc2573836b6958bcdb44cb52bfbd1b7aa9c339cff35a5a4 + + + baf7d6ea97ce606c53e11b6854ba5f2ce7ef5c24dddf0afa18d1260bd25b002c + + + 21af30c92267bd6122c0e0b4d20cccb6641a37eaf956c6540ec471d584e64a7b + + + efbca754880ce3922ca47a43c1f0b72c45731450a0ef193b9db33bf4bb38ce5f + + + fa0041a36f9f20af3c6b8dbf6eb49a969e2c9cc029049d61acc526ba3247b3ef + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/emulator_proto.xml b/.idea/libraries/emulator_proto.xml index 121e3a337e3b..a7fac8e53955 100644 --- a/.idea/libraries/emulator_proto.xml +++ b/.idea/libraries/emulator_proto.xml @@ -1,14 +1,14 @@ - + - - 3638a1709a24d0a09956257ea10487b12c90dbaba478b2a06b02f1eafab5d467 + + 83a0b486182eb35c4ac5494f511ab6b6ed62a2aeba81b23ca7909e61a9c3ccbd - + diff --git a/.idea/libraries/ffmpeg_platform.xml b/.idea/libraries/ffmpeg_platform.xml deleted file mode 100644 index 8de29ec8f716..000000000000 --- a/.idea/libraries/ffmpeg_platform.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - 83b925c8dade91b7ae1e6a44f142266bdcc31b30a727cac2d75744cca784efcf - - - 37d53454b3c704bea04d7b8388b6e4c6789a57152f63cee0c414b3dd730d3464 - - - 5761863f13760b5609ff85ce7780dcdb71c8b8256c1c6b817ece4e5c86ea7f5b - - - 64b7c4ccebe0475d0121717fa76218392a77b3c39da77f681d58c48689edddf4 - - - 85f1cb19db3c9c642aed219fed2954390fc368c489f0701b6966207fb3e5dd7c - - - ce354e994754311bb590ed38da0289cad55c68948b44d6b313cf32690246c40e - - - 27d5eaf8f4433f6404aae0ad34cdbbfac75174e244c11d38222e0d075af33863 - - - 36b78057cdcc5fa0dc950e29271a58c0a6efc5573bd9bd2845b99cccbb3116a7 - - - c605748036b7158edca0128c3febce6bae7c4b297406563ebae2a0dcbc591261 - - - 6c4f0bf404787c5a374c573b2445d5d6d8ce620f7c9ef41b2c601d1fe3836d6a - - - 1bb08194d76780cd885fbfd27ed24dfb1ca088ee0b7a8aea25a836cb1506eedc - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/baksmali.xml b/.idea/libraries/google_baksmali.xml similarity index 62% rename from .idea/libraries/baksmali.xml rename to .idea/libraries/google_baksmali.xml index 5538aad721ac..6b2eedef82a9 100644 --- a/.idea/libraries/baksmali.xml +++ b/.idea/libraries/google_baksmali.xml @@ -1,12 +1,12 @@ - - + + - - d74a3c71bc2cd5786a960a546221ad44abd05506067f1aa7ae50f041ff859e1e + + ffd6f3fbba2453440e4c04add42b9f903d84151b5b71f7e6bbb181d8096397a4 - - 7008f8d3fb63920d044e7d1f387a0ccff6a7e328ff252a90554d7a0e4c7f8014 + + 8078a04709f42072a240a6fe7666b71755324745c505b39f86ededfd9c2b90c4 @@ -17,13 +17,13 @@ - - + + - - + + \ No newline at end of file diff --git a/.idea/libraries/google_dexlib2.xml b/.idea/libraries/google_dexlib2.xml index f3f607c222ed..7d47ea1f9c7a 100644 --- a/.idea/libraries/google_dexlib2.xml +++ b/.idea/libraries/google_dexlib2.xml @@ -1,18 +1,18 @@ - + - - 9a0812a700e617f0d3aeec68aa085ff81fcd18a45597d41f862468dd1b53ae02 + + 11cc5e7b75b23feb65e41e28e5c225b4a77dbf7210d6cedd4bdb3f04c1f6ea24 - + - + \ No newline at end of file diff --git a/.idea/libraries/kotlin_multiplatform_android_models_proto.xml b/.idea/libraries/kotlin_multiplatform_android_models_proto.xml new file mode 100644 index 000000000000..ef5a7cdd3d4e --- /dev/null +++ b/.idea/libraries/kotlin_multiplatform_android_models_proto.xml @@ -0,0 +1,16 @@ + + + + + + 3c5c023ff60bcb06a79041114f63d0d2337bcb77810d49f8bd37249f4294686b + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/layoutinspector_skia_proto.xml b/.idea/libraries/layoutinspector_skia_proto.xml index d5789c408385..304680ac497d 100644 --- a/.idea/libraries/layoutinspector_skia_proto.xml +++ b/.idea/libraries/layoutinspector_skia_proto.xml @@ -1,14 +1,14 @@ - + - + 57a5b14934f746e0910e7a69104ce918af769c6ea821a8c193e51661f45ab2a4 - + diff --git a/.idea/libraries/layoutinspector_view_proto.xml b/.idea/libraries/layoutinspector_view_proto.xml index bedd20acddd8..e80c4b4733c0 100644 --- a/.idea/libraries/layoutinspector_view_proto.xml +++ b/.idea/libraries/layoutinspector_view_proto.xml @@ -1,26 +1,26 @@ - + - - 646ec119025d94f8f154caaca82433dfdd67f411e1dbac64e791c8221454c9a1 + + 98e2086f9dcdb2d0d4f78105c25382b310a70b28e8ed7b2584a1a8a30efcdb9b - - e919843d85b1b7d8252fbefd8ef1bb2a838fe112136ae5d23dc56be17a65216b + + 48b5319d11953f45ed584ba484d09c625f0b8081b6476f61deaa86388b9a323d - - b5acbacd2efe23a13e523e982a4af48ea0e789da9cac4612192edaac80ce3aa7 + + 4f991453b3bda2e4196328e4b95fa23af87b81dbe4cb0129006764f33cfed902 - - 124d5d061c4f4e20b2f45e9315f3e2700a4849b25456c4a446ec4432c0be0251 + + 0c55d7b1470662a7e26c4cfa98b814ce4a5352466c1dc8aa95585ffa68a99d46 - - - - + + + + diff --git a/.idea/libraries/layoutlib.xml b/.idea/libraries/layoutlib.xml index 1816c1a77adc..20daf4291bdc 100644 --- a/.idea/libraries/layoutlib.xml +++ b/.idea/libraries/layoutlib.xml @@ -1,14 +1,14 @@ - + - - c119161aa752e5a03eca2b64ebf23116169750ad86872e014292d4b83d8c100c + + 25268dc0123254fb765dba1b99dec38d4dc074e79af84205e54d6055a5896724 - + diff --git a/.idea/libraries/libam_instrumentation_data_proto.xml b/.idea/libraries/libam_instrumentation_data_proto.xml index 2c2e142fac39..1f03ad046c6a 100644 --- a/.idea/libraries/libam_instrumentation_data_proto.xml +++ b/.idea/libraries/libam_instrumentation_data_proto.xml @@ -1,14 +1,14 @@ - + - + 9e74dde675290902f77b42ebfae08d2f20b1e30e1449098e8f56b8e0d47afc05 - + diff --git a/.idea/libraries/libapp_processes_proto.xml b/.idea/libraries/libapp_processes_proto.xml index 5d9b4eecadd2..5338f0ee4a8d 100644 --- a/.idea/libraries/libapp_processes_proto.xml +++ b/.idea/libraries/libapp_processes_proto.xml @@ -1,14 +1,14 @@ - + - + 3faf2936c9d2f1da49ec915dc086b98981661084bf52e69b42bc8b0e94115f8e - + diff --git a/.idea/libraries/network_inspector_java_proto.xml b/.idea/libraries/network_inspector_java_proto.xml index 496d71bb1859..f7d1f713c62d 100644 --- a/.idea/libraries/network_inspector_java_proto.xml +++ b/.idea/libraries/network_inspector_java_proto.xml @@ -1,14 +1,14 @@ - + - + a0211d0d4cef5ee99e407f7be1fe65ee708f4188b7e0a9ad42af178a24752fa9 - + diff --git a/.idea/libraries/perfetto_proto.xml b/.idea/libraries/perfetto_proto.xml index c8951d330593..9ca359585d7c 100644 --- a/.idea/libraries/perfetto_proto.xml +++ b/.idea/libraries/perfetto_proto.xml @@ -1,14 +1,14 @@ - + - + 831d4b76986f36918dee489b1d8b8b9469d6856f2b3abfe70b5c6d374bf34c72 - + diff --git a/.idea/libraries/sqlite_inspector_proto.xml b/.idea/libraries/sqlite_inspector_proto.xml index 299c723c25db..c8f7e121b548 100644 --- a/.idea/libraries/sqlite_inspector_proto.xml +++ b/.idea/libraries/sqlite_inspector_proto.xml @@ -1,14 +1,14 @@ - + - + 1e52e915de03952a6bc72736125da70e0eb8a89583d31a4157bea609c3ebe8b9 - + diff --git a/.idea/libraries/studio_analytics_proto.xml b/.idea/libraries/studio_analytics_proto.xml index 9dedc1054ae5..e3b20a8bf864 100644 --- a/.idea/libraries/studio_analytics_proto.xml +++ b/.idea/libraries/studio_analytics_proto.xml @@ -1,14 +1,14 @@ - + - - 9d65977b9f93c7dc44f5618eed39217edc40061756f72657f8b17f97010268ca + + 60c3deb19b1cf40bf4771dbe26fd6b2aaf264b3b3828fd76d2f7457948917702 - + diff --git a/.idea/libraries/studio_grpc.xml b/.idea/libraries/studio_grpc.xml index 6143f765919a..6c0c6fc5ceb9 100644 --- a/.idea/libraries/studio_grpc.xml +++ b/.idea/libraries/studio_grpc.xml @@ -1,14 +1,14 @@ - + - - dafde19d7d30a439291282fa107faf1c74167179eac56cd10373a2d1b5a28cd3 + + 1b0a877dda69414b6149d96f9f50c60606ff0b19184313401623aaa3aa9d3990 - + diff --git a/.idea/libraries/studio_proto.xml b/.idea/libraries/studio_proto.xml index f6c3e6fa902c..64001cf70197 100644 --- a/.idea/libraries/studio_proto.xml +++ b/.idea/libraries/studio_proto.xml @@ -1,14 +1,14 @@ - + - + 263170a91b4cddea11a586fbddc290c56a9c8ce19c1e6596430de455d671a032 - + diff --git a/.idea/libraries/transport_proto.xml b/.idea/libraries/transport_proto.xml index 514c0863cbda..c62429f379c3 100644 --- a/.idea/libraries/transport_proto.xml +++ b/.idea/libraries/transport_proto.xml @@ -1,14 +1,14 @@ - + - - a27d48e4ae35e6e22742c0871d180aa9eb5cbc52d6aa004a7d3905ac8cb3a49e + + 4f78940274cc13a8f2e2da3e6e0c99eb6f5090e2a69191aa8fdb0f8f877b8377 - + diff --git a/.idea/libraries/utp_core_proto_jarjar.xml b/.idea/libraries/utp_core_proto_jarjar.xml index 2425698c1970..35fc2448c06a 100644 --- a/.idea/libraries/utp_core_proto_jarjar.xml +++ b/.idea/libraries/utp_core_proto_jarjar.xml @@ -1,14 +1,14 @@ - + - + 17106e8b6a1333c0101f4d25d675fa23705c0298c2b5e64d7ebc2942f78445d2 - + diff --git a/.idea/modules.xml b/.idea/modules.xml index 0d141c18c919..e359bbea1cf9 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -327,6 +327,7 @@ + @@ -345,6 +346,7 @@ + @@ -364,6 +366,7 @@ + @@ -410,7 +413,9 @@ + + @@ -426,8 +431,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -436,6 +471,7 @@ + @@ -445,7 +481,6 @@ - @@ -456,10 +491,13 @@ + + + @@ -470,7 +508,6 @@ - @@ -487,6 +524,7 @@ + @@ -505,6 +543,7 @@ + @@ -516,6 +555,7 @@ + @@ -540,9 +580,12 @@ + + + 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 996a1d23a71e..a0d20bbbc4d4 100644 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityLibraryLicenses.kt +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityLibraryLicenses.kt @@ -46,16 +46,15 @@ object CommunityLibraryLicenses { androidDependency(name = "Android Annotations", libraryName = "precompiled-android-annotations"), androidDependency(name = "Android Apk Analyzer", libraryName = "precompiled-analyzer"), androidDependency(name = "Android Apk Binary Resources", libraryName = "precompiled-binary-resources"), - androidDependency(name = "Android Apk Sig", libraryName = "apksig"), - androidDependency(name = "Android Apk ZLib", libraryName = "apkzlib"), + androidDependency(name = "Android Apk ZLib", libraryName = "android.tools.build.apkzlib"), androidDependency(name = "Android App Inspector (Background Task, proto)", libraryName = "background-inspector-proto"), androidDependency(name = "Android App Inspector (Network, proto)", libraryName = "network_inspector_java_proto"), androidDependency(name = "Android Archive Patcher (explainer)", libraryName = "explainer"), androidDependency(name = "Android Archive Patcher (generator)", libraryName = "generator"), androidDependency(name = "Android Archive Patcher (shared)", libraryName = "shared"), - androidDependency(name = "Android Baksmali", libraryName = "baksmali"), + androidDependency(name = "Android Baksmali", libraryName = "google-baksmali"), androidDependency(name = "Android Build Analysis Result Proto", libraryName = "build-analysis-results-proto"), - androidDependency(name = "Android Build Analyzer Common", libraryName = "precompiled-build-analyzer-common"), + androidDependency(name = "Android Build Analyzer", libraryName = "precompiled-build-analyzer.common"), androidDependency(name = "Android Builder Model", libraryName = "precompiled-builder-model"), androidDependency(name = "Android Chunkio", libraryName = "precompiled-chunkio"), androidDependency(name = "Android Common Library", libraryName = "precompiled-common"), @@ -85,10 +84,13 @@ object CommunityLibraryLicenses { version = LibraryLicense.CUSTOM_REVISION).apache("https://source.android.com/setup/start/licenses") .suppliedByOrganizations(Suppliers.GOOGLE), androidDependency(name = "Android JdwpPacket", libraryName = "precompiled-jdwppacket"), + androidDependency(name = "Android JdwpsCache", libraryName = "precompiled-jdwpscache"), androidDependency(name = "Android JdwpTracer", libraryName = "precompiled-jdwptracer"), androidDependency(name = "Android Jetifier Core", libraryName = "jetifier-core"), LibraryLicense(name = "Android Jimfs library", libraryName = "jimfs", url = "https://github.com/google/jimfs") .apache("https://github.com/google/jimfs/blob/master/LICENSE"), + androidDependency(name = "Android Kotlin Multiplatform Models", libraryName = "precompiled-kotlin-multiplatform-models"), + androidDependency(name = "Android Kotlin Multiplatform Models Proto", libraryName = "kotlin-multiplatform-android-models-proto"), androidDependency(name = "Android Layout Api Library", libraryName = "precompiled-layoutlib-api"), androidDependency(name = "Android Layout Inspector (Skia Proto)", libraryName = "layoutinspector-skia-proto"), androidDependency(name = "Android Layout Inspector (View Proto)", libraryName = "layoutinspector-view-proto"), @@ -101,7 +103,6 @@ object CommunityLibraryLicenses { androidDependency(name = "Android Lint Checks (proto)", libraryName = "liblint-checks-proto"), androidDependency(name = "Android Lint Cli", libraryName = "precompiled-lint-cli"), androidDependency(name = "Android Lint Model", libraryName = "precompiled-lint-model"), - androidDependency(name = "Android Lint Test Infrastructure", libraryName = "precompiled-lint-testinfrastructure"), androidDependency(name = "Android Manifest Merger", libraryName = "precompiled-manifest-merger"), androidDependency(name = "Android Manifest Parser", libraryName = "precompiled-manifest-parser"), androidDependency(name = "Android MLKit Common Library", libraryName = "precompiled-mlkit-common"), @@ -115,12 +116,13 @@ object CommunityLibraryLicenses { androidDependency(name = "Android Repository", libraryName = "precompiled-repository"), androidDependency(name = "Android Resource Repository", libraryName = "precompiled-resource-repository"), androidDependency(name = "Android Sdk Common", libraryName = "precompiled-sdk-common"), + androidDependency(name = "Android Sdk Common Gradle", libraryName = "precompiled-sdk-common.gradle"), androidDependency(name = "Android Sdk Lib", libraryName = "precompiled-sdklib"), androidDependency(name = "Android STracer", libraryName = "precompiled-tracer"), androidDependency(name = "Android Studio Driver (proto)", libraryName = "asdriver_proto"), androidDependency(name = "Android Threading Agent Callback", libraryName = "precompiled-threading-agent-callback"), androidDependency(name = "Android USB Devices", libraryName = "precompiled-usb-devices"), - androidDependency(name = "Android Version", libraryName = "android-libversion"), + androidDependency(name = "Android Version", libraryName = "libversion"), androidDependency(name = "Android Wizard Template", libraryName = "precompiled-wizardTemplate.impl"), androidDependency(name = "Android Wizard Template Plugin", libraryName = "precompiled-wizardTemplate.plugin"), androidDependency(name = "Android Zipflinger", libraryName = "precompiled-zipflinger"), @@ -1055,10 +1057,6 @@ object CommunityLibraryLicenses { LibraryLicense(name = "SourceCodePro", attachedTo = "intellij.platform.resources", version = "2.010", license = "OFL", url = "https://github.com/adobe-fonts/source-code-pro", licenseUrl = "https://github.com/adobe-fonts/source-code-pro/blob/master/LICENSE.md"), - LibraryLicense(name = "Spantable", libraryName = "spantable", version = "patched", license = "LGPL 2.1", - licenseUrl = "https://www.gnu.org/licenses/lgpl.html", - url = "https://android.googlesource.com/platform/prebuilts/tools/+/master/common/spantable/") - .suppliedByOrganizations(Suppliers.GOOGLE), LibraryLicense(name = "sphinxcontrib-napoleon", attachedTo = "intellij.python", version = "0.7", url = "https://sphinxcontrib-napoleon.readthedocs.io/", licenseUrl = "https://github.com/sphinx-contrib/napoleon/blob/master/LICENSE").simplifiedBsd(), @@ -1099,7 +1097,7 @@ object CommunityLibraryLicenses { url = "https://github.com/Thriftpy/thriftpy2/") .mit("https://github.com/Thriftpy/thriftpy2/blob/master/LICENSE"), // for traceprocessor-proto module library in intellij.android.profilersAndroid - androidDependency(name = "TraceProcessor Daemon Protos", libraryName = "traceprocessor-proto"), + androidDependency(name = "TraceProcessor Daemon Protos", libraryName = "traceprocessor-protos"), LibraryLicense(name = "Trang", libraryName = "trang-core.jar", url = "https://www.thaiopensource.com/relaxng/trang.html", version = LibraryLicense.CUSTOM_REVISION) diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityRepositoryModules.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityRepositoryModules.kt index bf29ce862ed1..9830f1973004 100644 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityRepositoryModules.kt +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityRepositoryModules.kt @@ -338,6 +338,7 @@ object CommunityRepositoryModules { spec.withModule("intellij.android.compose-designer") if (mainModuleName != "intellij.android.design-plugin") { spec.withModule("intellij.android.design-plugin") + spec.withModule("intellij.android.design-plugin.descriptor") } @Suppress("SpellCheckingInspection") spec.withModule("intellij.android.designer.customview") @@ -345,6 +346,7 @@ object CommunityRepositoryModules { spec.withModule("intellij.android.glance-designer") spec.withModule("intellij.android.layoutlib") spec.withModule("intellij.android.nav.editor") + spec.withModule("intellij.android.nav.editor.gradle") spec.withModule("intellij.android.preview-designer") spec.withModule("intellij.android.wear-designer") @@ -411,30 +413,29 @@ object CommunityRepositoryModules { spec.withModule("intellij.android.jps.model", "android-common.jar") // android-extensions-ide.jar - spec.withModule("intellij.android.kotlin.extensions.common", "android-extensions-ide.jar") // <= ADDED - spec.withModule("intellij.android.kotlin.extensions", "android-extensions-ide.jar") + spec.withModule("intellij.android.kotlin.extensions.common", "android-extensions-ide.jar") - // android-kotlin-extensions-tooling.jar - spec.withModule("intellij.android.kotlin.extensions.tooling", "android-kotlin-extensions-tooling.jar") + //android-gradle-tooling.jar + spec.withModule("intellij.android.gradle-tooling.api", "android-gradle.jar") + spec.withModule("intellij.android.gradle-tooling.impl", "android-gradle.jar") + spec.withModule("intellij.android.projectSystem.gradle.sync", "android-gradle.jar") // android-kotlin.jar - //TODO decide if should be moved from android-extensions-ide.jar - //spec.withModule("intellij.android.kotlin.extensions", "android-kotlin.jar") + spec.withModule("intellij.android.kotlin.extensions", "android-kotlin.jar") spec.withModule("intellij.android.kotlin.idea", "android-kotlin.jar") spec.withModule("intellij.android.kotlin.output.parser", "android-kotlin.jar") // android-profilers.jar - spec.withModule("intellij.android.profilers.atrace", "android-profilers.jar") - spec.withModule("intellij.android.profilers.ui", "android-profilers.jar") - spec.withModule("intellij.android.profilers", "android-profilers.jar") - spec.withModule("intellij.android.transportDatabase", "android-profilers.jar") + spec. withModule("intellij.android.profilers.atrace", "android-profilers.jar") + spec. withModule("intellij.android.profilers.ui", "android-profilers.jar") + spec. withModule("intellij.android.profilers", "android-profilers.jar") + spec. withModule("intellij.android.transportDatabase", "android-profilers.jar") // android-rt.jar //tools/adt/idea/rt:intellij.android.rt <= REMOVED // android-project-system-gradle-models.jar - //TODO decide if should be bundled here or with android.jar - //spec.withModule("intellij.android.projectSystem.gradle.models", "android-project-system-gradle-models.jar") + spec.withModule("intellij.android.projectSystem.gradle.models", "android-project-system-gradle-models.jar") // android.jar spec.withModule("intellij.android.analytics", "android.jar") @@ -472,10 +473,10 @@ object CommunityRepositoryModules { spec.withModule("intellij.android.debuggers", "android.jar") spec.withModule("intellij.android.deploy", "android.jar") spec.withModule("intellij.android.device-file-explorer-toolwindow", "android.jar") - spec.withModule("intellij.android.device-explorer-common", "android.jar") spec.withModule("intellij.android.device-explorer", "android.jar") spec.withModule("intellij.android.device-explorer-files", "android.jar") spec.withModule("intellij.android.device-explorer-monitor", "android.jar") + spec.withModule("intellij.android.device-explorer-common", "android.jar") spec.withModule("intellij.android.device-manager", "android.jar") spec.withModule("intellij.android.device-manager-v2", "android.jar") //tools/adt/idea/gradle-dsl:intellij.android.gradle.dsl <= REMOVED @@ -483,6 +484,7 @@ object CommunityRepositoryModules { spec.withModule("intellij.android.lang-databinding", "android.jar") spec.withModule("intellij.android.lang", "android.jar") spec.withModule("intellij.android.layout-inspector", "android.jar") + spec.withModule("intellij.android.layout-inspector.gradle", "android.jar") spec.withModule("intellij.android.layout-ui", "android.jar") spec.withModule("intellij.android.logcat", "android.jar") spec.withModule("intellij.android.mlkit", "android.jar") @@ -493,10 +495,9 @@ object CommunityRepositoryModules { spec.withModule("intellij.android.observable", "android.jar") if (mainModuleName != "intellij.android.plugin") { spec.withModule("intellij.android.plugin", "android.jar") + spec.withModule("intellij.android.plugin.descriptor", "android.jar") } spec.withModule("intellij.android.profilersAndroid", "android.jar") - //TODO decide if this should be moved to android-project-system-gradle-models - spec.withModule("intellij.android.projectSystem.gradle.models", "android.jar") spec.withModule("intellij.android.projectSystem.gradle.psd", "android.jar") spec.withModule("intellij.android.projectSystem.gradle.repositorySearch", "android.jar") spec.withModule("intellij.android.projectSystem.gradle.upgrade", "android.jar") @@ -514,19 +515,15 @@ object CommunityRepositoryModules { spec.withModule("intellij.android.wizard", "android.jar") spec.withModule("intellij.android.native-symbolizer", "android.jar") //tools/adt/idea/whats-new-assistant:whats-new-assistant <= REMOVED - spec.withModuleLibrary("precompiled-dynamic-layout-inspector.common", "android.sdktools.dynamic-layout-inspector.common", - "android.jar") + spec.withModuleLibrary("precompiled-dynamic-layout-inspector.common", "android.sdktools.dynamic-layout-inspector.common", "android.jar") spec.withModule("intellij.android.app-inspection.inspectors.network.ide", "android.jar") spec.withModule("intellij.android.app-inspection.inspectors.network.model", "android.jar") spec.withModule("intellij.android.app-inspection.inspectors.network.view", "android.jar") spec.withModule("intellij.android.server-flags", "android.jar") spec.withModule("intellij.android.codenavigation", "android.jar") spec.withModule("intellij.android.execution.common", "android.jar") + spec.withModuleLibrary("precompiled-kotlin-multiplatform-models", "android.sdktools.android.kotlin-multiplatform-models", "android.jar") - //android-gradle-tooling.jar - spec.withModule("intellij.android.gradle-tooling.api", "android-gradle-tooling.jar") - spec.withModule("intellij.android.gradle-tooling.impl", "android-gradle-tooling.jar") - spec.withModule("intellij.android.projectSystem.gradle.sync", "android-gradle-tooling.jar") // artwork.jar spec.withModule("intellij.android.artwork", "artwork.jar") @@ -549,6 +546,11 @@ object CommunityRepositoryModules { //tools/analytics-library/publisher:analytics-publisher <= REMOVED spec.withModuleLibrary("precompiled-analytics-crash", "android.sdktools.analytics-crash", "google-analytics-library.jar") + // google-login.jar + // We don't bundle Google Login with IDEA + //spec.withModuleLibrary("precompiled-google-login-as", "google-login-as", "google-login.jar") + + // inspectors-common.jar spec.withModule("intellij.android.inspectors-common.api", "inspectors-common.jar") spec.withModule("intellij.android.inspectors-common.api-ide", "inspectors-common.jar") @@ -578,18 +580,20 @@ object CommunityRepositoryModules { // sdk-common.jar spec.withModuleLibrary("precompiled-sdk-common", "android.sdktools.sdk-common", "sdk-common.jar") + spec.withModuleLibrary("precompiled-sdk-common.gradle", "android.sdktools.sdk-common.gradle", "sdk-common.jar") // sdk-tools.jar spec.withModuleLibrary("precompiled-android-annotations", "android.sdktools.android-annotations", "sdk-tools.jar") spec.withModuleLibrary("precompiled-analyzer", "android.sdktools.analyzer", "sdk-tools.jar") spec.withModuleLibrary("precompiled-binary-resources", "android.sdktools.binary-resources", "sdk-tools.jar") - spec.withModuleLibrary("precompiled-build-analyzer-common", "android.sdktools.android.build-analyzer.common", "sdk-tools.jar") + spec.withModuleLibrary("precompiled-build-analyzer.common", "android.sdktools.android.build-analyzer.common", "sdk-tools.jar") spec.withModuleLibrary("precompiled-builder-model", "android.sdktools.builder-model", "sdk-tools.jar") //tools/base/build-system/builder-test-api:studio.android.sdktools.builder-test-api <= API for testing. Nice to have in IDEA. spec.withModuleLibrary("precompiled-adblib", "android.sdktools.adblib", "sdk-tools.jar") spec.withModuleLibrary("precompiled-adblib.ddmlibcompatibility", "android.sdktools.adblib.ddmlibcompatibility", "sdk-tools.jar") spec.withModuleLibrary("precompiled-adblib.tools", "android.sdktools.adblib.tools", "sdk-tools.jar") spec.withModuleLibrary("precompiled-ddmlib", "android.sdktools.ddmlib", "sdk-tools.jar") + spec.withModuleLibrary("precompiled-jdwpscache", "android.sdktools.jdwpscache", "sdk-tools.jar") spec.withModuleLibrary("precompiled-device-provisioner", "android.sdktools.device-provisioner", "sdk-tools.jar") spec.withModuleLibrary("precompiled-deployer", "android.sdktools.deployer", "sdk-tools.jar") spec.withModuleLibrary("precompiled-dvlib", "android.sdktools.dvlib", "sdk-tools.jar") @@ -630,6 +634,12 @@ object CommunityRepositoryModules { spec.withModuleLibrary("javapoet", "android.sdktools.db-compiler", "") spec.withModuleLibrary("auto-common", "android.sdktools.db-compiler", "") spec.withModuleLibrary("jetifier-core", "android.sdktools.db-compilerCommon", "") + + // We do not bundle Google Login API + //spec.withModuleLibrary("javax-servlet", "google-login-as", "") + //spec.withModuleLibrary("jsr305-2.0.1", "google-login-as", "") + //spec.withModuleLibrary("oauth2", "google-login-as", "") + spec.withModuleLibrary("flatbuffers-java", "android.sdktools.mlkit-common", "") spec.withModuleLibrary("tensorflow-lite-metadata", "android.sdktools.mlkit-common", "") spec.withModuleLibrary("trace-perfetto-library", "intellij.android.profilersAndroid", "") @@ -643,14 +653,12 @@ object CommunityRepositoryModules { //spec.withModuleLibrary("skiko", "intellij.android.adt.ui.compose", "") spec.withProjectLibrary("aapt-proto") - spec.withProjectLibrary("aia-proto") spec.withProjectLibrary("android-test-plugin-host-device-info-proto") spec.withProjectLibrary("asm-tools") - spec.withProjectLibrary("baksmali") spec.withProjectLibrary("emulator-proto") - val ffmpegVersion = "5.1.2-1.5.8" - val javacppVersion = "1.5.8" + val ffmpegVersion = "6.0-1.5.9" + val javacppVersion = "1.5.9" // Add ffmpeg and javacpp spec.withModuleLibrary("ffmpeg", "intellij.android.streaming", "ffmpeg-$ffmpegVersion.jar") @@ -693,10 +701,16 @@ object CommunityRepositoryModules { //tools/adt/idea/.idea/libraries:ffmpeg-platform <= FIXME //tools/adt/idea/.idea/libraries:firebase_java_proto <= REMOVED + // We do not bundle Google API client in IJ + //spec.withProjectLibrary("google-api-client") + spec.withProjectLibrary("google-baksmali") spec.withProjectLibrary("google-dexlib2") + //spec.withProjectLibrary("gradle-shared-proto") spec.withProjectLibrary("HdrHistogram") spec.withProjectLibrary("javax-inject") + //spec.withProjectLibrary("jetty") spec.withProjectLibrary("kotlinx-coroutines-guava") + spec.withProjectLibrary("kotlin-multiplatform-android-models-proto") spec.withProjectLibrary("kxml2") spec.withProjectLibrary("layoutinspector-skia-proto") spec.withProjectLibrary("layoutinspector-view-proto") @@ -714,30 +728,31 @@ object CommunityRepositoryModules { spec.withProjectLibrary("utp-core-proto-jarjar") spec.withProjectLibrary("zxing-core") spec.withModuleLibrary("libandroid-core-proto", "intellij.android.core", "") + spec.withModuleLibrary("libandroid-core-proto", "intellij.android.projectSystem.gradle", "") spec.withModuleLibrary("libstudio.android-test-plugin-host-retention-proto", "intellij.android.core", "") //tools/adt/idea/android/lib:android-sdk-tools-jps <= this is jarutils.jar spec.withModuleLibrary("instantapps-api", "intellij.android.core", "") - spec.withModuleLibrary("spantable", "intellij.android.core", "") spec.withModuleLibrary("background-inspector-proto", "intellij.android.app-inspection.inspectors.backgroundtask.model", "") spec.withModuleLibrary("workmanager-inspector-proto", "intellij.android.app-inspection.inspectors.backgroundtask.model", "") spec.withModuleLibrary("background-inspector-proto", "intellij.android.app-inspection.inspectors.backgroundtask.view", "") spec.withModuleLibrary("workmanager-inspector-proto", "intellij.android.app-inspection.inspectors.backgroundtask.view", "") //spec.withModuleLibrary("play_vitals_java_proto", "intellij.android.app-quality-insights.play-vitals.model", "") //tools/adt/idea/compose-designer:ui-animation-tooling-internal <= not recognized - spec.withModuleLibrary("traceprocessor-proto", "intellij.android.profilersAndroid", "") - spec.withModuleLibrary("traceprocessor-proto", "intellij.android.profilers", "") + spec.withModuleLibrary("traceprocessor-protos", "intellij.android.profilersAndroid", "") + spec.withModuleLibrary("traceprocessor-protos", "intellij.android.profilers", "") spec.withModuleLibrary("pepk", "intellij.android.projectSystem.gradle", "") spec.withModuleLibrary("libstudio.android-test-plugin-result-listener-gradle-proto", "intellij.android.utp", "") spec.withModuleLibrary("deploy_java_proto", "android.sdktools.deployer", "") spec.withModuleLibrary("libjava_sites", "android.sdktools.deployer", "") spec.withModuleLibrary("liblint-checks-proto", "android.sdktools.lint-checks", "") + spec.withModuleLibrary("aia-proto", "android.sdktools.sdk-common", "") spec.withModuleLibrary("libjava_sites", "intellij.android.debuggers", "") spec.withModuleLibrary("libjava_version", "android.sdktools.deployer", "") //tools/vendor/google/game-tools/main:game-tools-protos <= not recognized spec.withModuleLibrary("compilerCommon.antlr_runtime.shaded", "android.sdktools.db-compiler", "") spec.withModuleLibrary("compilerCommon.antlr.shaded", "android.sdktools.db-compiler", "") spec.withModuleLibrary("build-analysis-results-proto", "intellij.android.build-attribution", "") - spec.withModuleLibrary("android-libversion", "android.sdktools.common", "") + spec.withModuleLibrary("libversion", "android.sdktools.common", "") // :libs @@ -765,6 +780,7 @@ object CommunityRepositoryModules { // "//tools/base/app-inspection/inspectors/backgroundtask:bundle", // "//tools/base/app-inspection/inspectors/network:bundle", // "//tools/base/dynamic-layout-inspector/agent/appinspection:bundle", + // "tools/base/process-monitor/process-tracker-agent:bundle", // "//tools/base/profiler/transform:profilers-transform", // "//tools/base/profiler/app:perfa", // "//tools/base/profiler/app:perfa_okhttp",