Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump kotlin from 2.1.0 to 2.1.10 #345

Merged
merged 2 commits into from
Jan 28, 2025
Merged

Bump kotlin from 2.1.0 to 2.1.10 #345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6afe6ad
Bump kotlin from 2.1.0 to 2.1.10
dependabot[bot] Jan 27, 2025
5a96de1
FOrmtting
alorma Jan 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/detekt/detekt.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ complexity:
active: true
threshold: 100
LongParameterList:
active: true
active: false
functionThreshold: 12
constructorThreshold: 10
ignoreDefaultParameters: false
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ mavenPlugin = "0.30.0"
agp = "8.8.0"
compose-plugin = "1.7.3"

kotlin = "2.1.0"
kotlin = "2.1.10"

android-minSdk = "21"
android-minSdkSample = "26"
Expand Down
1 change: 0 additions & 1 deletion samples/jsApp/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,3 @@ kotlin {
composeCompiler {
includeSourceInformation = true
}

39 changes: 9 additions & 30 deletions samples/shared/config/ktlint/baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,40 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<baseline version="1.0">
<file name="build/generated/compose/resourceGenerator/kotlin/commonMainResourceCollectors/compose_settings/samples/shared/generated/resources/ExpectResourceCollectors.kt">
<error line="1" column="9" source="standard:package-name" />
<error line="3" column="1" source="standard:import-ordering" />
</file>
<file name="build/generated/compose/resourceGenerator/kotlin/commonResClass/compose_settings/samples/shared/generated/resources/Res.kt">
<error line="6" column="9" source="standard:package-name" />
<error line="8" column="1" source="standard:import-ordering" />
<error line="26" column="1" source="standard:indent" />
<error line="26" column="25" source="standard:multiline-expression-wrapping" />
<error line="26" column="25" source="standard:wrapping" />
<error line="26" column="25" source="standard:argument-list-wrapping" />
<error line="27" column="10" source="standard:wrapping" />
<error line="27" column="11" source="standard:argument-list-wrapping" />
<error line="38" column="44" source="standard:function-signature" />
<error line="39" column="1" source="standard:indent" />
<error line="41" column="17" source="standard:class-naming" />
<error line="43" column="17" source="standard:class-naming" />
<error line="45" column="17" source="standard:class-naming" />
<error line="47" column="17" source="standard:class-naming" />
<error line="49" column="17" source="standard:class-naming" />
</file>
<file name="src/commonMain/kotlin/com/alorma/compose/settings/sample/shared/SampleApp.kt">
<error line="7" column="5" source="standard:function-naming" />
</file>
<file name="src/commonMain/kotlin/com/alorma/compose/settings/sample/shared/SettingsScreen.kt">
<error line="37" column="5" source="standard:function-naming" />
<error line="90" column="13" source="standard:function-naming" />
<error line="104" column="13" source="standard:function-naming" />
<error line="118" column="13" source="standard:function-naming" />
<error line="135" column="13" source="standard:function-naming" />
<error line="202" column="13" source="standard:function-naming" />
<error line="209" column="13" source="standard:function-naming" />
<error line="225" column="13" source="standard:function-naming" />
<error line="280" column="13" source="standard:function-naming" />
<error line="379" column="13" source="standard:function-naming" />
<error line="89" column="13" source="standard:function-naming" />
<error line="103" column="13" source="standard:function-naming" />
<error line="117" column="13" source="standard:function-naming" />
<error line="134" column="13" source="standard:function-naming" />
<error line="201" column="13" source="standard:function-naming" />
<error line="208" column="13" source="standard:function-naming" />
<error line="224" column="13" source="standard:function-naming" />
<error line="279" column="13" source="standard:function-naming" />
<error line="378" column="13" source="standard:function-naming" />
</file>
<file name="src/commonMain/kotlin/com/alorma/compose/settings/sample/shared/internal/LabelCheckbox.kt">
<error line="14" column="14" source="standard:function-naming" />
Expand Down
113 changes: 57 additions & 56 deletions .../shared/src/commonMain/kotlin/com/alorma/compose/settings/sample/shared/SettingsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,11 @@ fun SettingsScreen(
) { padding ->
val scrollState = rememberScrollState()
Column(
modifier = Modifier
.consumeWindowInsets(padding)
.verticalScroll(scrollState)
.padding(top = padding.calculateTopPadding()),
modifier =
Modifier
.consumeWindowInsets(padding)
.verticalScroll(scrollState)
.padding(top = padding.calculateTopPadding()),
) {
val iconState = remember { mutableStateOf(false) }

Expand Down Expand Up @@ -235,41 +236,41 @@ private fun SettingsMenuLinkSectionSample(showIcon: Boolean) {
onClick = { },
icon = iconSampleOrNull(showIcon),
action =
if (!actionState.value) {
null
} else {
{
IconButton(
onClick = {},
) {
Icon(
imageVector = Icons.Default.Build,
contentDescription = null,
)
if (!actionState.value) {
null
} else {
{
IconButton(
onClick = {},
) {
Icon(
imageVector = Icons.Default.Build,
contentDescription = null,
)
}
}
}
},
},
)
SettingsMenuLink(
title = { Text(text = "Menu") },
subtitle = { Text(text = "With subtitle") },
onClick = { },
icon = iconSampleOrNull(showIcon),
action =
if (!actionState.value) {
null
} else {
{
IconButton(
onClick = {},
) {
Icon(
imageVector = Icons.Default.Build,
contentDescription = null,
)
if (!actionState.value) {
null
} else {
{
IconButton(
onClick = {},
) {
Icon(
imageVector = Icons.Default.Build,
contentDescription = null,
)
}
}
}
},
},
)
}
}
Expand All @@ -296,20 +297,20 @@ private fun SettingsSelectorsSample(showIcon: Boolean) {
onClick = { showSingleChoiceDialog.value = true },
icon = iconSampleOrNull(showIcon),
action =
if (singleSelectionState.value == null) {
null
} else {
{
IconButton(
onClick = { singleSelectionState.value = null },
) {
Icon(
imageVector = Icons.Default.Delete,
contentDescription = null,
)
if (singleSelectionState.value == null) {
null
} else {
{
IconButton(
onClick = { singleSelectionState.value = null },
) {
Icon(
imageVector = Icons.Default.Delete,
contentDescription = null,
)
}
}
}
},
},
)

if (showSingleChoiceDialog.value) {
Expand Down Expand Up @@ -342,20 +343,20 @@ private fun SettingsSelectorsSample(showIcon: Boolean) {
onClick = { showMultiChoiceDialog.value = true },
icon = iconSampleOrNull(showIcon),
action =
if (multipleSelectionState.value == null) {
null
} else {
{
IconButton(
onClick = { multipleSelectionState.value = null },
) {
Icon(
imageVector = Icons.Default.Delete,
contentDescription = null,
)
if (multipleSelectionState.value == null) {
null
} else {
{
IconButton(
onClick = { multipleSelectionState.value = null },
) {
Icon(
imageVector = Icons.Default.Delete,
contentDescription = null,
)
}
}
}
},
},
)

if (showMultiChoiceDialog.value) {
Expand Down
1 change: 0 additions & 1 deletion samples/wasmApp/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,3 @@ kotlin {
composeCompiler {
includeSourceInformation = true
}

14 changes: 7 additions & 7 deletions ui-tiles/config/ktlint/baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<baseline version="1.0">
<file name="src/commonMain/kotlin/com/alorma/compose/settings/ui/SettingsCheckbox.kt">
<error line="18" column="5" source="standard:function-naming" />
<error line="21" column="5" source="standard:function-naming" />
</file>
<file name="src/commonMain/kotlin/com/alorma/compose/settings/ui/SettingsGroup.kt">
<error line="22" column="5" source="standard:function-naming" />
<error line="49" column="14" source="standard:function-naming" />
<error line="24" column="5" source="standard:function-naming" />
<error line="53" column="14" source="standard:function-naming" />
</file>
<file name="src/commonMain/kotlin/com/alorma/compose/settings/ui/SettingsMenuLink.kt">
<error line="13" column="5" source="standard:function-naming" />
<error line="15" column="5" source="standard:function-naming" />
</file>
<file name="src/commonMain/kotlin/com/alorma/compose/settings/ui/SettingsRadioButton.kt">
<error line="17" column="5" source="standard:function-naming" />
<error line="20" column="5" source="standard:function-naming" />
</file>
<file name="src/commonMain/kotlin/com/alorma/compose/settings/ui/SettingsSwitch.kt">
<error line="18" column="5" source="standard:function-naming" />
<error line="21" column="5" source="standard:function-naming" />
</file>
<file name="src/commonMain/kotlin/com/alorma/compose/settings/ui/SettingsTriStateCheckbox.kt">
<error line="22" column="5" source="standard:function-naming" />
<error line="25" column="5" source="standard:function-naming" />
</file>
</baseline>
16 changes: 8 additions & 8 deletions ui-tiles/src/commonMain/kotlin/com/alorma/compose/settings/ui/SettingsCheckbox.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@ fun SettingsCheckbox(
) {
val update: (Boolean) -> Unit = { boolean -> onCheckedChange(boolean) }
SettingsTileScaffold(
modifier = Modifier.toggleable(
enabled = enabled,
value = state,
role = Role.Switch,
onValueChange = { update(!state) },
).semantics(properties = semanticProperties)
.then(modifier),
modifier =
Modifier.toggleable(
enabled = enabled,
value = state,
role = Role.Switch,
onValueChange = { update(!state) },
).semantics(properties = semanticProperties).then(modifier),
enabled = enabled,
title = title,
subtitle = subtitle,
Expand All @@ -55,7 +55,7 @@ fun SettingsCheckbox(
shadowElevation = shadowElevation,
) {
Checkbox(
modifier = Modifier.clearAndSetSemantics { },
modifier = Modifier.clearAndSetSemantics { },
enabled = enabled,
checked = state,
onCheckedChange = update,
Expand Down
4 changes: 4 additions & 0 deletions ui-tiles/src/commonMain/kotlin/com/alorma/compose/settings/ui/SettingsGroup.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.semantics.SemanticsPropertyReceiver
import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.unit.dp
import com.alorma.compose.settings.ui.base.internal.LocalSettingsGroupEnabled
import com.alorma.compose.settings.ui.base.internal.SettingsTileColors
Expand All @@ -25,12 +27,14 @@ fun SettingsGroup(
contentPadding: PaddingValues = PaddingValues(0.dp),
colors: SettingsTileColors = SettingsTileDefaults.colors(),
title: @Composable (() -> Unit)? = null,
semanticProperties: (SemanticsPropertyReceiver.() -> Unit) = {},
content: @Composable ColumnScope.() -> Unit,
) {
Column(
modifier =
Modifier
.fillMaxWidth()
.semantics(properties = semanticProperties)
.then(modifier)
.padding(contentPadding),
) {
Expand Down
5 changes: 4 additions & 1 deletion ui-tiles/src/commonMain/kotlin/com/alorma/compose/settings/ui/SettingsMenuLink.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ package com.alorma.compose.settings.ui
import androidx.compose.foundation.clickable
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.semantics.SemanticsPropertyReceiver
import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.unit.Dp
import com.alorma.compose.settings.ui.base.internal.LocalSettingsGroupEnabled
import com.alorma.compose.settings.ui.base.internal.SettingsTileColors
Expand All @@ -20,14 +22,15 @@ fun SettingsMenuLink(
colors: SettingsTileColors = SettingsTileDefaults.colors(),
tonalElevation: Dp = SettingsTileDefaults.Elevation,
shadowElevation: Dp = SettingsTileDefaults.Elevation,
semanticProperties: (SemanticsPropertyReceiver.() -> Unit) = {},
onClick: () -> Unit,
) {
SettingsTileScaffold(
modifier =
Modifier.clickable(
enabled = enabled,
onClick = onClick,
).then(modifier),
).semantics(properties = semanticProperties).then(modifier),
enabled = enabled,
title = title,
subtitle = subtitle,
Expand Down
15 changes: 8 additions & 7 deletions ui-tiles/src/commonMain/kotlin/com/alorma/compose/settings/ui/SettingsRadioButton.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,13 @@ fun SettingsRadioButton(
onClick: () -> Unit,
) {
SettingsTileScaffold(
modifier = Modifier.toggleable(
enabled = enabled,
value = state,
role = Role.RadioButton,
onValueChange = { onClick() },
).semantics(properties = semanticProperties).then(modifier),
modifier =
Modifier.toggleable(
enabled = enabled,
value = state,
role = Role.RadioButton,
onValueChange = { onClick() },
).semantics(properties = semanticProperties).then(modifier),
enabled = enabled,
title = title,
subtitle = subtitle,
Expand All @@ -51,7 +52,7 @@ fun SettingsRadioButton(
shadowElevation = shadowElevation,
) {
RadioButton(
modifier = Modifier.clearAndSetSemantics { },
modifier = Modifier.clearAndSetSemantics { },
enabled = enabled,
selected = state,
onClick = onClick,
Expand Down
14 changes: 7 additions & 7 deletions ui-tiles/src/commonMain/kotlin/com/alorma/compose/settings/ui/SettingsSwitch.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@ fun SettingsSwitch(
val update: (Boolean) -> Unit = { boolean -> onCheckedChange(boolean) }

SettingsTileScaffold(
modifier = Modifier.toggleable(
enabled = enabled,
value = state,
role = Role.Switch,
onValueChange = { update(!state) },
).semantics(properties = semanticProperties)
.then(modifier),
modifier =
Modifier.toggleable(
enabled = enabled,
value = state,
role = Role.Switch,
onValueChange = { update(!state) },
).semantics(properties = semanticProperties).then(modifier),
enabled = enabled,
title = title,
subtitle = subtitle,
Expand Down
Loading
Loading