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 Aug 31, 2024
2 parents d9c4d4e + 195991d commit fcb1ded
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
16 changes: 8 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import com.android.build.gradle.api.AndroidBasePlugin
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
id 'com.android.application' version "8.5.2"
id 'com.android.library' version "8.5.2" apply false
id 'com.android.test' version '8.5.2' apply false
id 'com.android.application' version "8.6.0"
id 'com.android.library' version "8.6.0" apply false
id 'com.android.test' version '8.6.0' apply false
id 'androidx.baselineprofile' version '1.3.0'
id 'org.jetbrains.kotlin.android' version "2.0.20"
id 'org.jetbrains.kotlin.plugin.compose' version "2.0.20"
Expand Down Expand Up @@ -42,7 +42,7 @@ allprojects {
}

plugins.withId('com.google.protobuf') {
def protocVersion = '4.27.3'
def protocVersion = '4.28.0'
protobuf {
// Configure the protoc executable
protoc {
Expand Down Expand Up @@ -325,7 +325,7 @@ dependencies {
implementation fileTree(dir: FRAMEWORK_PREBUILTS_DIR, include: 'WindowManager-Shell-14.jar')
withQuickstepCompileOnly fileTree(dir: FRAMEWORK_PREBUILTS_DIR, include: 'framework-14.jar')

coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.0'
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.1'

implementation 'androidx.profileinstaller:profileinstaller:1.3.1'
baselineProfile projects.baselineProfile
Expand All @@ -335,7 +335,7 @@ dependencies {
implementation "androidx.preference:preference-ktx:1.2.1"

implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1'
implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.1'
implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.2'
implementation "org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.7"
implementation 'com.github.ChickenHook:RestrictionBypass:2.2'
implementation 'dev.rikka.tools.refine:runtime:4.4.0'
Expand Down Expand Up @@ -386,7 +386,7 @@ dependencies {
// Persian Date
implementation 'com.github.samanzamani:PersianDate:1.7.1'

implementation 'com.airbnb.android:lottie:6.5.0'
implementation 'com.airbnb.android:lottie:6.5.1'

// Compose drag and drop library
implementation 'sh.calvin.reorderable:reorderable:2.3.1'
Expand Down Expand Up @@ -414,7 +414,7 @@ spotless {
kotlin {
target("lawnchair/src/**/*.kt")
ktlint().customRuleSets([
"io.nlopez.compose.rules:ktlint:0.4.10",
"io.nlopez.compose.rules:ktlint:0.4.11",
]).editorConfigOverride([
"ktlint_compose_compositionlocal-allowlist": "disabled",
])
Expand Down
2 changes: 1 addition & 1 deletion systemUILog/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ compileOnlyCommonJars()
dependencies {
compileOnly projects.systemUIPluginCore
compileOnly projects.systemUICommon
implementation 'com.google.errorprone:error_prone_annotations:2.30.0'
implementation 'com.google.errorprone:error_prone_annotations:2.31.0'
}

0 comments on commit fcb1ded

Please sign in to comment.