Skip to content

Commit

Permalink
Merge branch 'LawnchairLauncher:14-dev' into 14-dev
Browse files Browse the repository at this point in the history
  • Loading branch information
Unofficial-Life authored Sep 11, 2024
2 parents 00a3000 + 2d4c027 commit 28cba8e
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,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.00")
implementation platform("androidx.compose:compose-bom:2024.09.01")
implementation "androidx.compose.ui:ui"
implementation "androidx.compose.ui:ui-util"
debugImplementation "androidx.compose.ui:ui-tooling"
Expand Down Expand Up @@ -414,7 +414,7 @@ spotless {
kotlin {
target("lawnchair/src/**/*.kt")
ktlint().customRuleSets([
"io.nlopez.compose.rules:ktlint:0.4.11",
"io.nlopez.compose.rules:ktlint:0.4.12",
]).editorConfigOverride([
"ktlint_compose_compositionlocal-allowlist": "disabled",
])
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=5b9c5eb3f9fc2c94abaea57d90bd78747ca117ddbbf96c859d3741181a12bf2a
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
distributionSha256Sum=1541fa36599e12857140465f3c91a97409b4512501c26f9631fb113e392c5bd1
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
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"
id "com.gradle.develocity" version "3.18.1"
}

def isCI = providers.environmentVariable('CI').present
Expand Down

0 comments on commit 28cba8e

Please sign in to comment.