Skip to content

Commit

Permalink
Merge branch 'LawnchairLauncher:develop' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
xteamlyer authored Dec 13, 2024
2 parents 5c9503f + 731b009 commit 3f0368e
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ dependencies {
implementation("androidx.core:core-ktx:1.15.0")
implementation("androidx.core:core-splashscreen:1.0.1")
implementation("androidx.activity:activity-compose:1.9.3")
implementation(platform("androidx.compose:compose-bom:2024.11.00"))
implementation(platform("androidx.compose:compose-bom:2024.12.01"))
implementation("androidx.compose.ui:ui")
implementation("androidx.compose.ui:ui-tooling-preview")
implementation("androidx.compose.ui:ui-util")
Expand All @@ -152,12 +152,12 @@ dependencies {
implementation("androidx.compose.material:material-icons-core-android")
implementation("androidx.compose.material3:material3")
implementation("androidx.compose.material3:material3-window-size-class")
implementation("androidx.navigation:navigation-compose:2.8.4")
implementation("androidx.navigation:navigation-compose:2.8.5")
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.8.7")

implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3")

val hiltVersion = "2.53"
val hiltVersion = "2.53.1"
implementation("com.google.dagger:hilt-android:$hiltVersion")
ksp("com.google.dagger:hilt-compiler:$hiltVersion")
implementation("androidx.hilt:hilt-navigation-compose:1.2.0")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ object PlaceholderDefaults {
* on/off screen. The boolean parameter defined for the transition is [visible].
*/
// TODO: need to migrate to Modifier.Node, see https://mrmans0n.github.io/compose-rules/rules/#avoid-modifier-extension-factory-functions
@Suppress("ktlint:compose:modifier-composable-check", "ktlint:compose:modifier-composed-check")
@Suppress("ktlint:compose:modifier-composed-check")
@Composable
fun Modifier.placeholder(
visible: Boolean,
Expand Down
4 changes: 2 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ plugins {
id("org.jetbrains.kotlin.plugin.compose") version "2.1.0"
id("org.jetbrains.kotlin.plugin.serialization") version "2.1.0" apply false
id("com.google.devtools.ksp") version "2.1.0-1.0.29" apply false
id("com.google.dagger.hilt.android") version "2.53" apply false
id("com.google.dagger.hilt.android") version "2.53.1" apply false
id("app.cash.licensee") version "1.12.0" apply false
id("com.diffplug.spotless") version "6.25.0" apply false
id("org.gradle.android.cache-fix") version "3.0.1" apply false
Expand All @@ -31,7 +31,7 @@ allprojects {
target("src/**/*.kt")
ktlint().customRuleSets(
listOf(
"io.nlopez.compose.rules:ktlint:0.4.19",
"io.nlopez.compose.rules:ktlint:0.4.22",
),
).editorConfigOverride(
mapOf(
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ pluginManagement {

// https://docs.gradle.com/enterprise/gradle-plugin/
plugins {
id("com.gradle.develocity") version "3.18.2"
id("com.gradle.develocity") version "3.19"
}

develocity {
Expand Down

0 comments on commit 3f0368e

Please sign in to comment.