Merge branch 'LawnchairLauncher:12.1-dev' into trunk

Goooler · Nov 8, 2023 · f960dfe · f960dfe
2 parents 3095848 + 5994b51
commit f960dfe
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -24,8 +24,8 @@
         },
         {
             "groupName": "dev.rikka.tools.refine",
-            "matchPackagePatterns": [
-                "dev.rikka.tools.refine.*"
+            "matchPackagePrefixes": [
+                "dev.rikka.tools.refine"
             ]
         },
         {

diff --git a/build.gradle b/build.gradle
@@ -2,16 +2,16 @@ import com.android.build.gradle.api.AndroidBasePlugin
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    id 'com.android.application' version "8.1.2"
-    id 'com.android.library' version "8.1.2" apply false
-    id 'org.jetbrains.kotlin.android' version "1.9.10"
-    id 'org.jetbrains.kotlin.plugin.parcelize' version "1.9.10"
-    id 'org.jetbrains.kotlin.plugin.serialization' version "1.9.10"
-    id "com.google.devtools.ksp" version "1.9.10-1.0.13"
+    id 'com.android.application' version "8.1.3"
+    id 'com.android.library' version "8.1.3" apply false
+    id 'org.jetbrains.kotlin.android' version "1.9.20"
+    id 'org.jetbrains.kotlin.plugin.parcelize' version "1.9.20"
+    id 'org.jetbrains.kotlin.plugin.serialization' version "1.9.20"
+    id "com.google.devtools.ksp" version "1.9.20-1.0.14"
     id 'com.google.protobuf' version "0.9.4"
     id 'app.cash.licensee' version "1.8.0"
-    id 'dev.rikka.tools.refine' version "4.3.1"
-    id 'org.gradle.android.cache-fix' version '2.8.1'
+    id 'dev.rikka.tools.refine' version "4.4.0"
+    id 'org.gradle.android.cache-fix' version '3.0'
 }
 
 allprojects {
@@ -63,7 +63,7 @@ ext {
     FRAMEWORK_PREBUILTS_DIR = "$rootDir/prebuilts/libs"
     accompanist_version = '0.32.0'
     libsu_version = '5.2.1'
-    protocVersion = '3.24.4'
+    protocVersion = '3.25.0'
     room_version = '2.6.0'
     optoVersion = "1.0.18"
 }
@@ -122,7 +122,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.3"
+        kotlinCompilerExtensionVersion = "1.5.4"
     }
 
     final def keystorePropertiesFile = rootProject.file("keystore.properties")
@@ -318,7 +318,7 @@ dependencies {
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
     implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.0'
     implementation 'com.github.ChickenHook:RestrictionBypass:2.2'
-    implementation 'dev.rikka.tools.refine:runtime:4.3.1'
+    implementation 'dev.rikka.tools.refine:runtime:4.4.0'
 
     implementation platform("androidx.compose:compose-bom:2023.10.01")
     implementation "androidx.compose.ui:ui"
@@ -333,7 +333,7 @@ dependencies {
     implementation "androidx.constraintlayout:constraintlayout:2.1.4"
     implementation "androidx.activity:activity-compose:1.8.0"
     implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.6.2"
-    implementation "androidx.navigation:navigation-compose:2.7.4"
+    implementation "androidx.navigation:navigation-compose:2.7.5"
     implementation "androidx.palette:palette-ktx:1.0.0"
     implementation "androidx.slice:slice-core:1.1.0-alpha02"
     implementation "com.google.accompanist:accompanist-drawablepainter:$accompanist_version"
@@ -343,7 +343,7 @@ dependencies {
     implementation "com.google.android.material:material:1.10.0"
     implementation "io.github.fornewid:material-motion-compose-core:1.0.7"
     implementation 'dev.kdrag0n:colorkt:1.0.5'
-    implementation 'io.coil-kt:coil-compose:2.4.0'
+    implementation 'io.coil-kt:coil-compose:2.5.0'
     implementation 'me.xdrop:fuzzywuzzy:1.4.0'
     implementation "com.patrykmichalik.opto:domain:$optoVersion"
     implementation "com.patrykmichalik.opto:core:$optoVersion"

diff --git a/hidden-api/build.gradle b/hidden-api/build.gradle
@@ -7,6 +7,6 @@ android {
 }
 
 dependencies {
-    annotationProcessor 'dev.rikka.tools.refine:annotation-processor:4.3.1'
-    compileOnly 'dev.rikka.tools.refine:annotation:4.3.1'
+    annotationProcessor 'dev.rikka.tools.refine:annotation-processor:4.4.0'
+    compileOnly 'dev.rikka.tools.refine:annotation:4.4.0'
 }