Merge branch 'remove-material-2-library-droid-198'

4 files changed, 41 insertions, 18 deletions

diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
index 1e6ad7b08e..b40bab7c92 100644
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@@ -224,7 +224,6 @@ dependencies {
     implementation(Dependencies.Compose.constrainLayout)
     implementation(Dependencies.Compose.foundation)
     implementation(Dependencies.Compose.viewModelLifecycle)
-    implementation(Dependencies.Compose.material)
     implementation(Dependencies.Compose.material3)
     implementation(Dependencies.Compose.uiController)
     implementation(Dependencies.Compose.ui)
diff --git a/android/buildSrc/src/main/kotlin/Dependencies.kt b/android/buildSrc/src/main/kotlin/Dependencies.kt
index f0ca83c629..288198f47c 100644
--- a/android/buildSrc/src/main/kotlin/Dependencies.kt
+++ b/android/buildSrc/src/main/kotlin/Dependencies.kt
@@ -52,7 +52,6 @@ object Dependencies {
         const val junit = "androidx.compose.ui:ui-test-junit4:${Versions.Compose.base}"
         const val viewModelLifecycle =
             "androidx.lifecycle:lifecycle-viewmodel-compose:${Versions.Compose.viewModelLifecycle}"
-        const val material = "androidx.compose.material:material:${Versions.Compose.material}"
         const val material3 = "androidx.compose.material3:material3:${Versions.Compose.material3}"
         const val testManifest = "androidx.compose.ui:ui-test-manifest:${Versions.Compose.base}"
         const val uiController =
diff --git a/android/buildSrc/src/main/kotlin/Versions.kt b/android/buildSrc/src/main/kotlin/Versions.kt
index 52561dab5b..cf41917e6f 100644
--- a/android/buildSrc/src/main/kotlin/Versions.kt
+++ b/android/buildSrc/src/main/kotlin/Versions.kt
@@ -44,7 +44,6 @@ object Versions {
         const val composeCollapsingToolbar = "2.3.5"
         const val constrainLayout = "1.0.1"
         const val foundation = base
-        const val material = base
         const val material3 = "1.0.1"
         const val uiController = "0.30.1"
         const val viewModelLifecycle = "2.6.1"
diff --git a/android/gradle/verification-metadata.xml b/android/gradle/verification-metadata.xml
index da9356ec6e..d824c6dabe 100644
--- a/android/gradle/verification-metadata.xml
+++ b/android/gradle/verification-metadata.xml
@@ -245,6 +245,11 @@
             <sha256 value="d5b8621503f053f60186256dfc7f4ab45337b98228152751d7b22103cea2cf4b" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.compose.animation" name="animation-core" version="1.1.1">
+         <artifact name="animation-core-1.1.1.module">
+            <sha256 value="6834b1b466930369a6cb9f76df6257eff28428e42ef42a26515319638cceee3d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.compose.animation" name="animation-core" version="1.2.1">
          <artifact name="animation-core-1.2.1.aar">
             <sha256 value="e1a44dc558d1966e3345f5c51f63afaaf2b5aeea20f478f026594363ae910675" origin="Generated by Gradle"/>
@@ -295,28 +300,49 @@
             <sha256 value="bf8b385f1eea5b36423c43905ba0e253a61f7f0013649932a48216a40fa8843b" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.compose.material" name="material" version="1.4.3">
-         <artifact name="material-1.4.3.aar">
-            <sha256 value="2d9b66b4b19c461293d355906d7cfff161dd155adf7f837323f1b7a4ffd10ca8" origin="Generated by Gradle"/>
+      <component group="androidx.compose.material" name="material" version="1.0.0">
+         <artifact name="material-1.0.0.module">
+            <sha256 value="e8ae601d866e627b361f4d686e90b1918660b55bf97947b5f31eae7df304d0bc" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.material" name="material" version="1.3.0">
+         <artifact name="material-1.3.0.aar">
+            <sha256 value="568d02b36161968a899659e48cc0f901f2c14d7abab5b3e7890d31ca5bd1864e" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="material-1.3.0.module">
+            <sha256 value="9f9e1162be3c13b77e0052cb075a152ee6a93bb2f6bef88fdcd73b6e4ce56ee8" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.material" name="material-icons-core" version="1.0.2">
+         <artifact name="material-icons-core-1.0.2.aar">
+            <sha256 value="6a508acc9cc3ef872a9c445dce34e980ac39050edbf8e161d441b4a8c518f2f0" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="material-icons-core-1.0.2.module">
+            <sha256 value="c7e4c1410a139154b7e236b1cf4dc248a91d4c0f8e486ed6a2cdcf57fbc86f17" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="androidx.compose.material" name="material-icons-core" version="1.3.0">
+         <artifact name="material-icons-core-1.3.0.aar">
+            <sha256 value="587af5671ed6a1c6b1b6bfbf54bc63285692610abf9524e0318b19a4eee8a512" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="material-1.4.3.module">
-            <sha256 value="5247191af853257f16635988c765f562e3d173ad10cbca0b9c4b0f8320939257" origin="Generated by Gradle"/>
+         <artifact name="material-icons-core-1.3.0.module">
+            <sha256 value="9014fba2e8ee93635dc70ed0f4c5b46fba1eb7ed34eb6332016f8846085f9c54" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.compose.material" name="material-icons-core" version="1.4.3">
-         <artifact name="material-icons-core-1.4.3.aar">
-            <sha256 value="5ef4030ae792e46fa6866d32c7554347b51afd5820c20c2cd2448d5dd9d20c7b" origin="Generated by Gradle"/>
+      <component group="androidx.compose.material" name="material-ripple" version="1.0.0">
+         <artifact name="material-ripple-1.0.0.aar">
+            <sha256 value="0d3ac24c815fba15c57e1ca03f406399cd69ac1e41e390f61258c22a3226f550" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="material-icons-core-1.4.3.module">
-            <sha256 value="b3baa77917136ebbd303421a5f05d8f4fbe56a05e27976ee9e89da5f77236878" origin="Generated by Gradle"/>
+         <artifact name="material-ripple-1.0.0.module">
+            <sha256 value="03eb853a7cb720707b49a50c29a16089033cc905b6cabe3220358c34902100b1" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="androidx.compose.material" name="material-ripple" version="1.4.3">
-         <artifact name="material-ripple-1.4.3.aar">
-            <sha256 value="34e3319f8c3646f000ecb1d6e10ee950d63a6b9d5f92178470669418c1b1ac32" origin="Generated by Gradle"/>
+      <component group="androidx.compose.material" name="material-ripple" version="1.3.0">
+         <artifact name="material-ripple-1.3.0.aar">
+            <sha256 value="d481800a414176a1cbe56a27ec517301a485d697047e6b76b5de7e6345382455" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="material-ripple-1.4.3.module">
-            <sha256 value="50962026cf09cb72c44e6c968b961fa35c481b2bed0477f6725a23fb1c0c986f" origin="Generated by Gradle"/>
+         <artifact name="material-ripple-1.3.0.module">
+            <sha256 value="793e9bed644c0481b9f896fe172b3800d1da45463dcfcee784d336d9d5a9b5e9" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="androidx.compose.material3" name="material3" version="1.0.1">