Skip to content

Commit

Permalink
Merge branch 'LawnchairLauncher:14-dev' into trunk
Browse files Browse the repository at this point in the history
  • Loading branch information
Goooler authored Oct 17, 2024
2 parents 6624004 + 12734ac commit 06b44d4
Show file tree
Hide file tree
Showing 6 changed files with 252 additions and 252 deletions.
2 changes: 1 addition & 1 deletion baseline-profile/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,5 @@ dependencies {
implementation 'androidx.test.ext:junit:1.2.1'
implementation 'androidx.test.espresso:espresso-core:3.6.1'
implementation 'androidx.test.uiautomator:uiautomator:2.3.0'
implementation 'androidx.benchmark:benchmark-macro-junit4:1.3.2'
implementation 'androidx.benchmark:benchmark-macro-junit4:1.3.3'
}
18 changes: 9 additions & 9 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@ import com.android.build.gradle.api.AndroidBasePlugin
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
id 'com.android.application' version "8.7.0"
id 'com.android.library' version "8.7.0" apply false
id 'com.android.test' version '8.7.0' apply false
id 'androidx.baselineprofile' version '1.3.2'
id 'com.android.application' version "8.7.1"
id 'com.android.library' version "8.7.1" apply false
id 'com.android.test' version '8.7.1' apply false
id 'androidx.baselineprofile' version '1.3.3'
id 'org.jetbrains.kotlin.android' version "2.0.21"
id 'org.jetbrains.kotlin.plugin.compose' version "2.0.21"
id 'org.jetbrains.kotlin.plugin.parcelize' version "2.0.21"
id 'org.jetbrains.kotlin.plugin.serialization' version "2.0.21"
id "com.google.devtools.ksp" version "2.0.21-1.0.25"
id 'com.google.protobuf' version "0.9.4"
id 'app.cash.licensee' version "1.11.0"
id 'app.cash.licensee' version "1.12.0"
id 'dev.rikka.tools.refine' version "4.4.0"
id 'org.gradle.android.cache-fix' version '3.0.1'
id 'com.diffplug.spotless' version '6.25.0'
Expand Down Expand Up @@ -344,7 +344,7 @@ dependencies {
implementation 'com.github.ChickenHook:RestrictionBypass:2.2'
implementation 'dev.rikka.tools.refine:runtime:4.4.0'

implementation platform("androidx.compose:compose-bom:2024.09.03")
implementation platform("androidx.compose:compose-bom:2024.10.00")
implementation "androidx.compose.ui:ui"
implementation "androidx.compose.ui:ui-util"
debugImplementation "androidx.compose.ui:ui-tooling"
Expand All @@ -356,9 +356,9 @@ dependencies {
implementation "androidx.compose.runtime:runtime-livedata"
implementation 'androidx.compose.material3:material3'
implementation 'androidx.compose.material3:material3-window-size-class'
implementation "androidx.activity:activity-compose:1.9.2"
implementation "androidx.activity:activity-compose:1.9.3"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.8.6"
implementation "androidx.navigation:navigation-compose:2.8.2"
implementation "androidx.navigation:navigation-compose:2.8.3"
implementation "androidx.constraintlayout:constraintlayout:2.1.4"
implementation "androidx.palette:palette-ktx:1.0.0"
implementation "androidx.slice:slice-core:1.1.0-alpha02"
Expand Down Expand Up @@ -418,7 +418,7 @@ spotless {
kotlin {
target("lawnchair/src/**/*.kt")
ktlint().customRuleSets([
"io.nlopez.compose.rules:ktlint:0.4.15",
"io.nlopez.compose.rules:ktlint:0.4.16",
]).editorConfigOverride([
"ktlint_compose_compositionlocal-allowlist": "disabled",
"ktlint_compose_lambda-param-event-trailing": "disabled",
Expand Down
Loading

0 comments on commit 06b44d4

Please sign in to comment.