KMT-1568 [android] (Narwhal Feature Drop STABLE) Merge Android Studio 2025.1.2 Merge in the stable studio-2025.1.2 tag

GitOrigin-RevId: dc5de263a9a432e51eebf80ca385d9ae8dacea7b
This commit is contained in:
Ilia Bogdanovich
2025-08-12 11:30:27 +02:00
committed by intellij-monorepo-bot
4 changed files with 12 additions and 10 deletions

View File

@@ -1,18 +1,18 @@
<component name="libraryTable">
<library name="studio-platform" type="repository">
<properties maven-id="org.jetbrains.intellij.deps:studio-platform:2025.1.1-273">
<properties maven-id="org.jetbrains.intellij.deps:studio-platform:2025.1.2-287">
<verification>
<artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/studio-platform/2025.1.1-273/studio-platform-2025.1.1-273.jar">
<sha256sum>ba4d248daf7bcc2d8977c44e737e31df87014eeb1e23abe90d7cae96317c6570</sha256sum>
<artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/studio-platform/2025.1.2-287/studio-platform-2025.1.2-287.jar">
<sha256sum>21a748abc565fd6d97d90f2547d0fd1da36810171050b2a337cbc02799cfe482</sha256sum>
</artifact>
</verification>
</properties>
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/studio-platform/2025.1.1-273/studio-platform-2025.1.1-273.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/studio-platform/2025.1.2-287/studio-platform-2025.1.2-287.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/studio-platform/2025.1.1-273/studio-platform-2025.1.1-273-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/studio-platform/2025.1.2-287/studio-platform-2025.1.2-287-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@@ -1,18 +1,18 @@
<component name="libraryTable">
<library name="studio-test-platform" type="repository">
<properties maven-id="org.jetbrains.intellij.deps:studio-test-platform:2025.1.1-273">
<properties maven-id="org.jetbrains.intellij.deps:studio-test-platform:2025.1.2-287">
<verification>
<artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/studio-test-platform/2025.1.1-273/studio-test-platform-2025.1.1-273.jar">
<sha256sum>f474bafaa219e0cf855a73b5d3f7f6ee3658d39c91aae0135b635d4dc1c0e362</sha256sum>
<artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/studio-test-platform/2025.1.2-287/studio-test-platform-2025.1.2-287.jar">
<sha256sum>146d8ebb454cccee149a81cc47026b6a576953aeb811f2ef6979bb44a5e4b50f</sha256sum>
</artifact>
</verification>
</properties>
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/studio-test-platform/2025.1.1-273/studio-test-platform-2025.1.1-273.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/studio-test-platform/2025.1.2-287/studio-test-platform-2025.1.2-287.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/studio-test-platform/2025.1.1-273/studio-test-platform-2025.1.1-273-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/studio-test-platform/2025.1.2-287/studio-test-platform-2025.1.2-287-sources.jar!/" />
</SOURCES>
</library>
</component>

1
.idea/modules.xml generated
View File

@@ -131,6 +131,7 @@
<module fileurl="file://$PROJECT_DIR$/android/designer-perf-tests/intellij.android.designer-perf-tests.iml" filepath="$PROJECT_DIR$/android/designer-perf-tests/intellij.android.designer-perf-tests.iml" />
<module fileurl="file://$PROJECT_DIR$/android/designer/customview/intellij.android.designer.customview.iml" filepath="$PROJECT_DIR$/android/designer/customview/intellij.android.designer.customview.iml" />
<module fileurl="file://$PROJECT_DIR$/android/designer/customview/intellij.android.designer.customview.tests.iml" filepath="$PROJECT_DIR$/android/designer/customview/intellij.android.designer.customview.tests.iml" />
<module fileurl="file://$PROJECT_DIR$/android/designer/gradle/intellij.android.designer.gradle.iml" filepath="$PROJECT_DIR$/android/designer/gradle/intellij.android.designer.gradle.iml" />
<module fileurl="file://$PROJECT_DIR$/android/designer/intellij.android.designer.integration.iml" filepath="$PROJECT_DIR$/android/designer/intellij.android.designer.integration.iml" />
<module fileurl="file://$PROJECT_DIR$/android/designer/intellij.android.designer.tests.iml" filepath="$PROJECT_DIR$/android/designer/intellij.android.designer.tests.iml" />
<module fileurl="file://$PROJECT_DIR$/android/intellij.android.device/intellij.android.device.iml" filepath="$PROJECT_DIR$/android/intellij.android.device/intellij.android.device.iml" />

View File

@@ -243,6 +243,7 @@ object CommunityRepositoryModules {
spec.withModule("intellij.android.design-plugin.descriptor")
}
spec.withModule("intellij.android.designer.customview")
spec.withModule("intellij.android.designer.gradle")
spec.withModule("intellij.android.designer")
spec.withModule("intellij.android.glance-designer")
spec.withModule("intellij.android.layoutlib")