Merge studio/studio-merge/studio-2024.2.1-beta2 into master

GitOrigin-RevId: cd599c0b44382aab5aab24b537cb3f59aca73a5d
This commit is contained in:
Patronus
2024-09-25 21:39:06 +00:00
committed by intellij-monorepo-bot
4 changed files with 16 additions and 14 deletions

View File

@@ -1,14 +1,14 @@
<component name="libraryTable">
<library name="layoutlib" type="repository">
<properties maven-id="com.android.tools.layoutlib:layoutlib:14.0.7">
<properties maven-id="com.android.tools.layoutlib:layoutlib:14.0.11">
<verification>
<artifact url="file://$MAVEN_REPOSITORY$/com/android/tools/layoutlib/layoutlib/14.0.7/layoutlib-14.0.7.jar">
<sha256sum>f0c612d53668e51e747c6ebf254f0e3ee75189af5af5ba17640e7c409f92aefb</sha256sum>
<artifact url="file://$MAVEN_REPOSITORY$/com/android/tools/layoutlib/layoutlib/14.0.11/layoutlib-14.0.11.jar">
<sha256sum>9a8ab05c9617ec18a3bd8546ef9d56b4ea6271208ade27710b0baf564fe4dd59</sha256sum>
</artifact>
</verification>
</properties>
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/android/tools/layoutlib/layoutlib/14.0.7/layoutlib-14.0.7.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/com/android/tools/layoutlib/layoutlib/14.0.11/layoutlib-14.0.11.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />

View File

@@ -1,18 +1,18 @@
<component name="libraryTable">
<library name="studio-platform" type="repository">
<properties maven-id="org.jetbrains.intellij.deps:studio-platform:2024.2.1-canary7-194">
<properties maven-id="org.jetbrains.intellij.deps:studio-platform:2024.2.1-beta2-48">
<verification>
<artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/studio-platform/2024.2.1-canary7-194/studio-platform-2024.2.1-canary7-194.jar">
<sha256sum>156f90d6fee16bc5647f733f49703c21a35bdc3af55fb4f8324a78a51a552693</sha256sum>
<artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/studio-platform/2024.2.1-beta2-48/studio-platform-2024.2.1-beta2-48.jar">
<sha256sum>db6c65619d1e44d2bb0bdd765da5f81c1c145c873d76920cbdd55eabf414c19c</sha256sum>
</artifact>
</verification>
</properties>
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/studio-platform/2024.2.1-canary7-194/studio-platform-2024.2.1-canary7-194.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/studio-platform/2024.2.1-beta2-48/studio-platform-2024.2.1-beta2-48.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/studio-platform/2024.2.1-canary7-194/studio-platform-2024.2.1-canary7-194-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/studio-platform/2024.2.1-beta2-48/studio-platform-2024.2.1-beta2-48-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:2024.2.1-canary7-194">
<properties maven-id="org.jetbrains.intellij.deps:studio-test-platform:2024.2.1-beta2-48">
<verification>
<artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/studio-test-platform/2024.2.1-canary7-194/studio-test-platform-2024.2.1-canary7-194.jar">
<sha256sum>819a962a08459c0f744141a9d6c2b81a10e0dc6a2959503cf2f055ec084f4263</sha256sum>
<artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/studio-test-platform/2024.2.1-beta2-48/studio-test-platform-2024.2.1-beta2-48.jar">
<sha256sum>91b5dd13a9a8339924773b3c4223b9bfa48f7d72d76d4945e58db8aff4f373d3</sha256sum>
</artifact>
</verification>
</properties>
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/studio-test-platform/2024.2.1-canary7-194/studio-test-platform-2024.2.1-canary7-194.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/studio-test-platform/2024.2.1-beta2-48/studio-test-platform-2024.2.1-beta2-48.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/studio-test-platform/2024.2.1-canary7-194/studio-test-platform-2024.2.1-canary7-194-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/studio-test-platform/2024.2.1-beta2-48/studio-test-platform-2024.2.1-beta2-48-sources.jar!/" />
</SOURCES>
</library>
</component>

2
.idea/modules.xml generated
View File

@@ -144,6 +144,8 @@
<module fileurl="file://$PROJECT_DIR$/android/glance-designer/intellij.android.glance-designer.tests.iml" filepath="$PROJECT_DIR$/android/glance-designer/intellij.android.glance-designer.tests.iml" />
<module fileurl="file://$PROJECT_DIR$/android/gradle-tooling/studio-gradle-tooling-api/intellij.android.gradle-tooling.api.iml" filepath="$PROJECT_DIR$/android/gradle-tooling/studio-gradle-tooling-api/intellij.android.gradle-tooling.api.iml" />
<module fileurl="file://$PROJECT_DIR$/android/gradle-tooling/studio-gradle-tooling-impl/intellij.android.gradle-tooling.impl.iml" filepath="$PROJECT_DIR$/android/gradle-tooling/studio-gradle-tooling-impl/intellij.android.gradle-tooling.impl.iml" />
<module fileurl="file://$PROJECT_DIR$/android/gradle-declarative-lang/intellij.android.gradle.declarative.lang.iml" filepath="$PROJECT_DIR$/android/gradle-declarative-lang/intellij.android.gradle.declarative.lang.iml" />
<module fileurl="file://$PROJECT_DIR$/android/gradle-declarative-lang/intellij.android.gradle.declarative.lang.tests.iml" filepath="$PROJECT_DIR$/android/gradle-declarative-lang/intellij.android.gradle.declarative.lang.tests.iml" />
<module fileurl="file://$PROJECT_DIR$/android/gradle-dsl/intellij.android.gradle.dsl.iml" filepath="$PROJECT_DIR$/android/gradle-dsl/intellij.android.gradle.dsl.iml" />
<module fileurl="file://$PROJECT_DIR$/android/gradle-dsl-declarative/intellij.android.gradle.dsl.declarative.iml" filepath="$PROJECT_DIR$/android/gradle-dsl-declarative/intellij.android.gradle.dsl.declarative.iml" />
<module fileurl="file://$PROJECT_DIR$/android/gradle-dsl-kotlin/intellij.android.gradle.dsl.kotlin.iml" filepath="$PROJECT_DIR$/android/gradle-dsl-kotlin/intellij.android.gradle.dsl.kotlin.iml" />