Skip to content

Commit af33aca

Browse files
alexvanyoalexvanyo
authored
Merge pull request #1835 from android/av/material3-adaptive-1.1
Update to material3-adaptive 1.1
2 parents e308246 + fc418fc commit af33aca

File tree

60 files changed

+263
-185
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+263
-185
lines changed

‎app-nia-catalog/dependencies/releaseRuntimeClasspath.txt

+44-42
Original file line numberDiff line numberDiff line change
@@ -9,48 +9,48 @@ androidx.arch.core:core-common:2.2.0
99
androidx.arch.core:core-runtime:2.2.0
1010
androidx.autofill:autofill:1.0.0
1111
androidx.browser:browser:1.8.0
12-
androidx.collection:collection-jvm:1.5.0-beta01
13-
androidx.collection:collection-ktx:1.5.0-beta01
14-
androidx.collection:collection:1.5.0-beta01
15-
androidx.compose.animation:animation-android:1.8.0-alpha07
16-
androidx.compose.animation:animation-core-android:1.8.0-alpha07
17-
androidx.compose.animation:animation-core:1.8.0-alpha07
18-
androidx.compose.animation:animation:1.8.0-alpha07
19-
androidx.compose.foundation:foundation-android:1.8.0-alpha07
20-
androidx.compose.foundation:foundation-layout-android:1.8.0-alpha07
21-
androidx.compose.foundation:foundation-layout:1.8.0-alpha07
22-
androidx.compose.foundation:foundation:1.8.0-alpha07
23-
androidx.compose.material3.adaptive:adaptive-android:1.0.0
24-
androidx.compose.material3.adaptive:adaptive:1.0.0
25-
androidx.compose.material3:material3-adaptive-navigation-suite-android:1.3.1
26-
androidx.compose.material3:material3-adaptive-navigation-suite:1.3.1
27-
androidx.compose.material3:material3-android:1.3.1
28-
androidx.compose.material3:material3:1.3.1
29-
androidx.compose.material:material-icons-core-android:1.7.6
30-
androidx.compose.material:material-icons-core:1.7.6
31-
androidx.compose.material:material-icons-extended-android:1.7.6
32-
androidx.compose.material:material-icons-extended:1.7.6
33-
androidx.compose.material:material-ripple-android:1.7.6
34-
androidx.compose.material:material-ripple:1.7.6
35-
androidx.compose.runtime:runtime-android:1.8.0-alpha07
36-
androidx.compose.runtime:runtime-saveable-android:1.8.0-alpha07
37-
androidx.compose.runtime:runtime-saveable:1.8.0-alpha07
38-
androidx.compose.runtime:runtime:1.8.0-alpha07
39-
androidx.compose.ui:ui-android:1.8.0-alpha07
40-
androidx.compose.ui:ui-geometry-android:1.8.0-alpha07
41-
androidx.compose.ui:ui-geometry:1.8.0-alpha07
42-
androidx.compose.ui:ui-graphics-android:1.8.0-alpha07
43-
androidx.compose.ui:ui-graphics:1.8.0-alpha07
44-
androidx.compose.ui:ui-text-android:1.8.0-alpha07
45-
androidx.compose.ui:ui-text:1.8.0-alpha07
46-
androidx.compose.ui:ui-tooling-preview-android:1.8.0-alpha07
47-
androidx.compose.ui:ui-tooling-preview:1.8.0-alpha07
48-
androidx.compose.ui:ui-unit-android:1.8.0-alpha07
49-
androidx.compose.ui:ui-unit:1.8.0-alpha07
50-
androidx.compose.ui:ui-util-android:1.8.0-alpha07
51-
androidx.compose.ui:ui-util:1.8.0-alpha07
52-
androidx.compose.ui:ui:1.8.0-alpha07
53-
androidx.compose:compose-bom:2024.12.01
12+
androidx.collection:collection-jvm:1.5.0-beta03
13+
androidx.collection:collection-ktx:1.5.0-beta03
14+
androidx.collection:collection:1.5.0-beta03
15+
androidx.compose.animation:animation-android:1.8.0-beta02
16+
androidx.compose.animation:animation-core-android:1.8.0-beta02
17+
androidx.compose.animation:animation-core:1.8.0-beta02
18+
androidx.compose.animation:animation:1.8.0-beta02
19+
androidx.compose.foundation:foundation-android:1.8.0-beta02
20+
androidx.compose.foundation:foundation-layout-android:1.8.0-beta02
21+
androidx.compose.foundation:foundation-layout:1.8.0-beta02
22+
androidx.compose.foundation:foundation:1.8.0-beta02
23+
androidx.compose.material3.adaptive:adaptive-android:1.1.0-rc01
24+
androidx.compose.material3.adaptive:adaptive:1.1.0-rc01
25+
androidx.compose.material3:material3-adaptive-navigation-suite-android:1.4.0-alpha08
26+
androidx.compose.material3:material3-adaptive-navigation-suite:1.4.0-alpha08
27+
androidx.compose.material3:material3-android:1.4.0-alpha08
28+
androidx.compose.material3:material3:1.4.0-alpha08
29+
androidx.compose.material:material-icons-core-android:1.7.8
30+
androidx.compose.material:material-icons-core:1.7.8
31+
androidx.compose.material:material-icons-extended-android:1.7.8
32+
androidx.compose.material:material-icons-extended:1.7.8
33+
androidx.compose.material:material-ripple-android:1.8.0-beta02
34+
androidx.compose.material:material-ripple:1.8.0-beta02
35+
androidx.compose.runtime:runtime-android:1.8.0-beta02
36+
androidx.compose.runtime:runtime-saveable-android:1.8.0-beta02
37+
androidx.compose.runtime:runtime-saveable:1.8.0-beta02
38+
androidx.compose.runtime:runtime:1.8.0-beta02
39+
androidx.compose.ui:ui-android:1.8.0-beta02
40+
androidx.compose.ui:ui-geometry-android:1.8.0-beta02
41+
androidx.compose.ui:ui-geometry:1.8.0-beta02
42+
androidx.compose.ui:ui-graphics-android:1.8.0-beta02
43+
androidx.compose.ui:ui-graphics:1.8.0-beta02
44+
androidx.compose.ui:ui-text-android:1.8.0-beta02
45+
androidx.compose.ui:ui-text:1.8.0-beta02
46+
androidx.compose.ui:ui-tooling-preview-android:1.8.0-beta02
47+
androidx.compose.ui:ui-tooling-preview:1.8.0-beta02
48+
androidx.compose.ui:ui-unit-android:1.8.0-beta02
49+
androidx.compose.ui:ui-unit:1.8.0-beta02
50+
androidx.compose.ui:ui-util-android:1.8.0-beta02
51+
androidx.compose.ui:ui-util:1.8.0-beta02
52+
androidx.compose.ui:ui:1.8.0-beta02
53+
androidx.compose:compose-bom-alpha:2025.02.00
5454
androidx.concurrent:concurrent-futures:1.1.0
5555
androidx.core:core-ktx:1.13.1
5656
androidx.core:core:1.13.1
@@ -60,6 +60,8 @@ androidx.emoji2:emoji2:1.4.0
6060
androidx.exifinterface:exifinterface:1.3.7
6161
androidx.fragment:fragment:1.5.1
6262
androidx.graphics:graphics-path:1.0.1
63+
androidx.graphics:graphics-shapes-android:1.0.1
64+
androidx.graphics:graphics-shapes:1.0.1
6365
androidx.interpolator:interpolator:1.0.0
6466
androidx.lifecycle:lifecycle-common-java8:2.8.7
6567
androidx.lifecycle:lifecycle-common-jvm:2.8.7

‎app/build.gradle.kts

+1
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ dependencies {
8686
implementation(projects.sync.work)
8787

8888
implementation(libs.androidx.activity.compose)
89+
implementation(libs.androidx.compose.material3)
8990
implementation(libs.androidx.compose.material3.adaptive)
9091
implementation(libs.androidx.compose.material3.adaptive.layout)
9192
implementation(libs.androidx.compose.material3.adaptive.navigation)

‎app/dependencies/prodReleaseRuntimeClasspath.txt

+51-49
Original file line numberDiff line numberDiff line change
@@ -10,55 +10,55 @@ androidx.arch.core:core-common:2.2.0
1010
androidx.arch.core:core-runtime:2.2.0
1111
androidx.autofill:autofill:1.0.0
1212
androidx.browser:browser:1.8.0
13-
androidx.collection:collection-jvm:1.5.0-beta01
14-
androidx.collection:collection-ktx:1.5.0-beta01
15-
androidx.collection:collection:1.5.0-beta01
16-
androidx.compose.animation:animation-android:1.8.0-alpha07
17-
androidx.compose.animation:animation-core-android:1.8.0-alpha07
18-
androidx.compose.animation:animation-core:1.8.0-alpha07
19-
androidx.compose.animation:animation:1.8.0-alpha07
20-
androidx.compose.foundation:foundation-android:1.8.0-alpha07
21-
androidx.compose.foundation:foundation-layout-android:1.8.0-alpha07
22-
androidx.compose.foundation:foundation-layout:1.8.0-alpha07
23-
androidx.compose.foundation:foundation:1.8.0-alpha07
24-
androidx.compose.material3.adaptive:adaptive-android:1.0.0
25-
androidx.compose.material3.adaptive:adaptive-layout-android:1.0.0
26-
androidx.compose.material3.adaptive:adaptive-layout:1.0.0
27-
androidx.compose.material3.adaptive:adaptive-navigation-android:1.0.0
28-
androidx.compose.material3.adaptive:adaptive-navigation:1.0.0
29-
androidx.compose.material3.adaptive:adaptive:1.0.0
30-
androidx.compose.material3:material3-adaptive-navigation-suite-android:1.3.1
31-
androidx.compose.material3:material3-adaptive-navigation-suite:1.3.1
32-
androidx.compose.material3:material3-android:1.3.1
33-
androidx.compose.material3:material3-window-size-class-android:1.3.1
34-
androidx.compose.material3:material3-window-size-class:1.3.1
35-
androidx.compose.material3:material3:1.3.1
36-
androidx.compose.material:material-icons-core-android:1.7.6
37-
androidx.compose.material:material-icons-core:1.7.6
38-
androidx.compose.material:material-icons-extended-android:1.7.6
39-
androidx.compose.material:material-icons-extended:1.7.6
40-
androidx.compose.material:material-ripple-android:1.7.6
41-
androidx.compose.material:material-ripple:1.7.6
42-
androidx.compose.runtime:runtime-android:1.8.0-alpha07
43-
androidx.compose.runtime:runtime-saveable-android:1.8.0-alpha07
44-
androidx.compose.runtime:runtime-saveable:1.8.0-alpha07
45-
androidx.compose.runtime:runtime-tracing:1.8.0-alpha07
46-
androidx.compose.runtime:runtime:1.8.0-alpha07
47-
androidx.compose.ui:ui-android:1.8.0-alpha07
48-
androidx.compose.ui:ui-geometry-android:1.8.0-alpha07
49-
androidx.compose.ui:ui-geometry:1.8.0-alpha07
50-
androidx.compose.ui:ui-graphics-android:1.8.0-alpha07
51-
androidx.compose.ui:ui-graphics:1.8.0-alpha07
52-
androidx.compose.ui:ui-text-android:1.8.0-alpha07
53-
androidx.compose.ui:ui-text:1.8.0-alpha07
54-
androidx.compose.ui:ui-tooling-preview-android:1.8.0-alpha07
55-
androidx.compose.ui:ui-tooling-preview:1.8.0-alpha07
56-
androidx.compose.ui:ui-unit-android:1.8.0-alpha07
57-
androidx.compose.ui:ui-unit:1.8.0-alpha07
58-
androidx.compose.ui:ui-util-android:1.8.0-alpha07
59-
androidx.compose.ui:ui-util:1.8.0-alpha07
60-
androidx.compose.ui:ui:1.8.0-alpha07
61-
androidx.compose:compose-bom:2024.12.01
13+
androidx.collection:collection-jvm:1.5.0-beta03
14+
androidx.collection:collection-ktx:1.5.0-beta03
15+
androidx.collection:collection:1.5.0-beta03
16+
androidx.compose.animation:animation-android:1.8.0-beta02
17+
androidx.compose.animation:animation-core-android:1.8.0-beta02
18+
androidx.compose.animation:animation-core:1.8.0-beta02
19+
androidx.compose.animation:animation:1.8.0-beta02
20+
androidx.compose.foundation:foundation-android:1.8.0-beta02
21+
androidx.compose.foundation:foundation-layout-android:1.8.0-beta02
22+
androidx.compose.foundation:foundation-layout:1.8.0-beta02
23+
androidx.compose.foundation:foundation:1.8.0-beta02
24+
androidx.compose.material3.adaptive:adaptive-android:1.1.0-rc01
25+
androidx.compose.material3.adaptive:adaptive-layout-android:1.1.0-rc01
26+
androidx.compose.material3.adaptive:adaptive-layout:1.1.0-rc01
27+
androidx.compose.material3.adaptive:adaptive-navigation-android:1.1.0-rc01
28+
androidx.compose.material3.adaptive:adaptive-navigation:1.1.0-rc01
29+
androidx.compose.material3.adaptive:adaptive:1.1.0-rc01
30+
androidx.compose.material3:material3-adaptive-navigation-suite-android:1.4.0-alpha08
31+
androidx.compose.material3:material3-adaptive-navigation-suite:1.4.0-alpha08
32+
androidx.compose.material3:material3-android:1.4.0-alpha08
33+
androidx.compose.material3:material3-window-size-class-android:1.4.0-alpha08
34+
androidx.compose.material3:material3-window-size-class:1.4.0-alpha08
35+
androidx.compose.material3:material3:1.4.0-alpha08
36+
androidx.compose.material:material-icons-core-android:1.7.8
37+
androidx.compose.material:material-icons-core:1.7.8
38+
androidx.compose.material:material-icons-extended-android:1.7.8
39+
androidx.compose.material:material-icons-extended:1.7.8
40+
androidx.compose.material:material-ripple-android:1.8.0-beta02
41+
androidx.compose.material:material-ripple:1.8.0-beta02
42+
androidx.compose.runtime:runtime-android:1.8.0-beta02
43+
androidx.compose.runtime:runtime-saveable-android:1.8.0-beta02
44+
androidx.compose.runtime:runtime-saveable:1.8.0-beta02
45+
androidx.compose.runtime:runtime-tracing:1.8.0-beta02
46+
androidx.compose.runtime:runtime:1.8.0-beta02
47+
androidx.compose.ui:ui-android:1.8.0-beta02
48+
androidx.compose.ui:ui-geometry-android:1.8.0-beta02
49+
androidx.compose.ui:ui-geometry:1.8.0-beta02
50+
androidx.compose.ui:ui-graphics-android:1.8.0-beta02
51+
androidx.compose.ui:ui-graphics:1.8.0-beta02
52+
androidx.compose.ui:ui-text-android:1.8.0-beta02
53+
androidx.compose.ui:ui-text:1.8.0-beta02
54+
androidx.compose.ui:ui-tooling-preview-android:1.8.0-beta02
55+
androidx.compose.ui:ui-tooling-preview:1.8.0-beta02
56+
androidx.compose.ui:ui-unit-android:1.8.0-beta02
57+
androidx.compose.ui:ui-unit:1.8.0-beta02
58+
androidx.compose.ui:ui-util-android:1.8.0-beta02
59+
androidx.compose.ui:ui-util:1.8.0-beta02
60+
androidx.compose.ui:ui:1.8.0-beta02
61+
androidx.compose:compose-bom-alpha:2025.02.00
6262
androidx.concurrent:concurrent-futures-ktx:1.1.0
6363
androidx.concurrent:concurrent-futures:1.1.0
6464
androidx.core:core-ktx:1.15.0
@@ -84,6 +84,8 @@ androidx.emoji2:emoji2:1.4.0
8484
androidx.exifinterface:exifinterface:1.3.7
8585
androidx.fragment:fragment:1.5.4
8686
androidx.graphics:graphics-path:1.0.1
87+
androidx.graphics:graphics-shapes-android:1.0.1
88+
androidx.graphics:graphics-shapes:1.0.1
8789
androidx.hilt:hilt-common:1.2.0
8890
androidx.hilt:hilt-navigation-compose:1.2.0
8991
androidx.hilt:hilt-navigation:1.2.0

0 commit comments

Comments
 (0)