Skip to content

Commit d8d31bc

Browse files
authored
Remove material-icons-core dependency from material (#2029)
It was [removed](https://android-review.googlesource.com/c/platform/frameworks/support/+/3260612) in Jetpack 1.7.1 without proper mention in the changelog, so we have to align here. See #2022 for the same change in material3 Fixes [CMP-8007](https://youtrack.jetbrains.com/issue/CMP-8007) ## Release Notes ### Migration Notes - Multiple Platforms - material/material3 libraries no longer add a dependency to `material-icons-core` so if your project relied on that, you will have to explicitly add that dependency in your `build.gradle[.kts]` files: ``` implementation("org.jetbrains.compose.material:material-icons-core:1.6.11") ```
1 parent b258a4d commit d8d31bc

File tree

4 files changed

+22
-24
lines changed

4 files changed

+22
-24
lines changed

Diff for: compose/desktop/desktop/samples/build.gradle

+7
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,13 @@ kotlin {
3838
jvmMain.dependencies {
3939
implementation(libs.skikoCurrentOs)
4040
implementation(project(":compose:desktop:desktop"))
41+
42+
implementation("org.jetbrains.compose.material:material-icons-core:1.6.11") {
43+
// exclude dependencies, because they override local projects when we build 0.0.0-* version
44+
// (see https://repo1.maven.org/maven2/org/jetbrains/compose/material/material-icons-core-desktop/1.6.11/material-icons-core-desktop-1.6.11.module)
45+
exclude group: "org.jetbrains.compose.runtime"
46+
exclude group: "org.jetbrains.compose.ui"
47+
}
4148
}
4249
}
4350
}

Diff for: compose/material/material/build.gradle

-5
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,6 @@ if(AndroidXComposePlugin.isMultiplatformEnabled(project)) {
9898
implementation(libs.kotlinStdlib)
9999
api(project(":compose:animation:animation-core"))
100100
api(project(":compose:foundation:foundation"))
101-
api("org.jetbrains.compose.material:material-icons-core:1.6.11") {
102-
// exclude dependencies, because they override local projects when we build 0.0.0-* version
103-
// (see https://repo1.maven.org/maven2/org/jetbrains/compose/material/material-icons-core-desktop/1.6.11/material-icons-core-desktop-1.6.11.module)
104-
exclude group: "org.jetbrains.compose.ui"
105-
}
106101
api(project(":compose:material:material-ripple"))
107102
api(project(":compose:runtime:runtime"))
108103
api(project(":compose:ui:ui"))

Diff for: compose/ui/ui/src/desktopTest/kotlin/androidx/compose/ui/ImageComposeSceneTest.kt

+1-4
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ import androidx.compose.foundation.layout.fillMaxWidth
2626
import androidx.compose.foundation.layout.padding
2727
import androidx.compose.foundation.layout.size
2828
import androidx.compose.material.ExtendedFloatingActionButton
29-
import androidx.compose.material.Icon
30-
import androidx.compose.material.icons.Icons
31-
import androidx.compose.material.icons.filled.AccountBox
3229
import androidx.compose.runtime.getValue
3330
import androidx.compose.runtime.mutableStateOf
3431
import androidx.compose.runtime.setValue
@@ -115,7 +112,7 @@ class ImageComposeSceneTest {
115112
it.setContent {
116113
Box(Modifier.fillMaxWidth()) {
117114
ExtendedFloatingActionButton(
118-
icon = { Icon(Icons.Filled.AccountBox, "") },
115+
icon = { Box(Modifier.size(100.dp).background(Color.Red)) },
119116
text = {},
120117
onClick = {},
121118
modifier = Modifier.fillMaxWidth()

Diff for: compose/ui/ui/src/desktopTest/kotlin/androidx/compose/ui/awt/ComplexApplicationTest.kt

+14-15
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import androidx.compose.foundation.ExperimentalFoundationApi
2323
import androidx.compose.foundation.Image
2424
import androidx.compose.foundation.ScrollState
2525
import androidx.compose.foundation.VerticalScrollbar
26-
import androidx.compose.foundation.mouseClickable
2726
import androidx.compose.foundation.background
2827
import androidx.compose.foundation.clickable
2928
import androidx.compose.foundation.layout.Arrangement
@@ -42,6 +41,7 @@ import androidx.compose.foundation.layout.wrapContentSize
4241
import androidx.compose.foundation.lazy.LazyColumn
4342
import androidx.compose.foundation.lazy.items
4443
import androidx.compose.foundation.lazy.rememberLazyListState
44+
import androidx.compose.foundation.mouseClickable
4545
import androidx.compose.foundation.rememberScrollState
4646
import androidx.compose.foundation.rememberScrollbarAdapter
4747
import androidx.compose.foundation.shape.CircleShape
@@ -58,7 +58,6 @@ import androidx.compose.material.CircularProgressIndicator
5858
import androidx.compose.material.DropdownMenu
5959
import androidx.compose.material.DropdownMenuItem
6060
import androidx.compose.material.ExtendedFloatingActionButton
61-
import androidx.compose.material.Icon
6261
import androidx.compose.material.IconButton
6362
import androidx.compose.material.MaterialTheme
6463
import androidx.compose.material.Scaffold
@@ -67,8 +66,6 @@ import androidx.compose.material.Switch
6766
import androidx.compose.material.Text
6867
import androidx.compose.material.TextField
6968
import androidx.compose.material.TopAppBar
70-
import androidx.compose.material.icons.Icons
71-
import androidx.compose.material.icons.filled.Menu
7269
import androidx.compose.runtime.Composable
7370
import androidx.compose.runtime.CompositionLocalProvider
7471
import androidx.compose.runtime.LaunchedEffect
@@ -79,30 +76,32 @@ import androidx.compose.runtime.setValue
7976
import androidx.compose.ui.Alignment
8077
import androidx.compose.ui.ExperimentalComposeUiApi
8178
import androidx.compose.ui.Modifier
82-
import androidx.compose.ui.focus.focusProperties
8379
import androidx.compose.ui.focus.FocusRequester
80+
import androidx.compose.ui.focus.FocusRequester.Companion.FocusRequesterFactory.component1
81+
import androidx.compose.ui.focus.FocusRequester.Companion.FocusRequesterFactory.component2
82+
import androidx.compose.ui.focus.focusProperties
8483
import androidx.compose.ui.focus.focusRequester
8584
import androidx.compose.ui.geometry.Offset
8685
import androidx.compose.ui.graphics.Color
8786
import androidx.compose.ui.graphics.Shadow
8887
import androidx.compose.ui.graphics.graphicsLayer
8988
import androidx.compose.ui.input.key.Key
9089
import androidx.compose.ui.input.key.isCtrlPressed
91-
import androidx.compose.ui.input.pointer.isAltPressed
92-
import androidx.compose.ui.input.pointer.isCtrlPressed
93-
import androidx.compose.ui.input.pointer.isMetaPressed
94-
import androidx.compose.ui.input.pointer.isPrimaryPressed
95-
import androidx.compose.ui.input.pointer.isSecondaryPressed
96-
import androidx.compose.ui.input.pointer.isShiftPressed
97-
import androidx.compose.ui.input.pointer.isTertiaryPressed
9890
import androidx.compose.ui.input.key.isMetaPressed
9991
import androidx.compose.ui.input.key.isShiftPressed
10092
import androidx.compose.ui.input.key.key
10193
import androidx.compose.ui.input.key.onPreviewKeyEvent
10294
import androidx.compose.ui.input.pointer.PointerEventType
10395
import androidx.compose.ui.input.pointer.PointerIcon
96+
import androidx.compose.ui.input.pointer.isAltPressed
10497
import androidx.compose.ui.input.pointer.isBackPressed
98+
import androidx.compose.ui.input.pointer.isCtrlPressed
10599
import androidx.compose.ui.input.pointer.isForwardPressed
100+
import androidx.compose.ui.input.pointer.isMetaPressed
101+
import androidx.compose.ui.input.pointer.isPrimaryPressed
102+
import androidx.compose.ui.input.pointer.isSecondaryPressed
103+
import androidx.compose.ui.input.pointer.isShiftPressed
104+
import androidx.compose.ui.input.pointer.isTertiaryPressed
106105
import androidx.compose.ui.input.pointer.onPointerEvent
107106
import androidx.compose.ui.input.pointer.pointerHoverIcon
108107
import androidx.compose.ui.platform.LocalDensity
@@ -124,16 +123,16 @@ import androidx.compose.ui.unit.DpSize
124123
import androidx.compose.ui.unit.dp
125124
import androidx.compose.ui.unit.em
126125
import androidx.compose.ui.unit.sp
127-
import androidx.compose.ui.window.Window
128126
import androidx.compose.ui.window.FrameWindowScope
127+
import androidx.compose.ui.window.Window
129128
import androidx.compose.ui.window.awaitApplication
130129
import androidx.compose.ui.window.launchApplication
131130
import androidx.compose.ui.window.rememberWindowState
132131
import androidx.compose.ui.window.runApplicationTest
133132
import com.google.common.truth.Truth
133+
import kotlin.random.Random
134134
import kotlinx.coroutines.DelicateCoroutinesApi
135135
import kotlinx.coroutines.GlobalScope
136-
import kotlin.random.Random
137136
import kotlinx.coroutines.delay
138137
import org.junit.Test
139138

@@ -176,7 +175,7 @@ private fun FrameWindowScope.App() {
176175
IconButton(
177176
onClick = {}
178177
) {
179-
Icon(Icons.Filled.Menu, "Menu", Modifier.size(ButtonDefaults.IconSize))
178+
Box(Modifier.size(ButtonDefaults.IconSize).background(Color.Red))
180179
}
181180
}
182181
},

0 commit comments

Comments
 (0)