Cleanup deps (#2829)

2026-02-27 15:26:58 +00:00 · 2022-08-15 18:36:32 +08:00
parent 6fcd83a535
commit 7f26a4c179
8 changed files with 32 additions and 35 deletions
--- a/CompatLib/build.gradle
+++ b/CompatLib/build.gradle
@@ -33,5 +33,5 @@ android {
 }

 dependencies {
-    implementation 'androidx.core:core-ktx:1.7.0'
+    implementation 'androidx.core:core-ktx:1.8.0'
 }
--- a/CompatLibVR/build.gradle
+++ b/CompatLibVR/build.gradle
@@ -33,6 +33,6 @@ android {
 }

 dependencies {
-    implementation 'androidx.core:core-ktx:1.7.0'
+    implementation 'androidx.core:core-ktx:1.8.0'
    implementation project(':CompatLib')
 }
--- a/CompatLibVS/build.gradle
+++ b/CompatLibVS/build.gradle
@@ -33,6 +33,6 @@ android {
 }

 dependencies {
-    implementation 'androidx.core:core-ktx:1.7.0'
+    implementation 'androidx.core:core-ktx:1.8.0'
    implementation project(':CompatLib')
 }
--- a/SystemUIShared/build.gradle
+++ b/SystemUIShared/build.gradle
@@ -36,13 +36,12 @@ android {
    }

    addFrameworkJar('framework-12l.jar')
-    replaceFrameworkJar('framework-12l.jar')
 }

 dependencies {
    compileOnly fileTree(dir: new File(rootProject.projectDir, 'prebuilts/libs'), include: 'WindowManager-Shell.jar')
    implementation "androidx.concurrent:concurrent-futures:1.1.0"
-    implementation "androidx.lifecycle:lifecycle-common-java8:2.4.1"
+    implementation "androidx.lifecycle:lifecycle-common:2.5.1"
    implementation "androidx.dynamicanimation:dynamicanimation:1.0.0"
    implementation project(':CompatLib')
    implementation project(':CompatLibVR')
--- a/SystemUIShared/src/com/android/systemui/unfold/util/NaturalRotationUnfoldProgressProvider.kt
+++ b/SystemUIShared/src/com/android/systemui/unfold/util/NaturalRotationUnfoldProgressProvider.kt
@@ -28,12 +28,12 @@ class NaturalRotationUnfoldProgressProvider(

    fun init() {
        try {
-            windowManagerInterface.watchRotation(rotationWatcher, context.display.displayId)
+            windowManagerInterface.watchRotation(rotationWatcher, context.display!!.displayId)
        } catch (e: RemoteException) {
            throw e.rethrowFromSystemServer()
        }

-        onRotationChanged(context.display.rotation)
+        onRotationChanged(context.display!!.rotation)
    }

    private fun onRotationChanged(rotation: Int) {
--- a/build.gradle
+++ b/build.gradle
@@ -1,25 +1,24 @@
 buildscript {
    ext {
-        ANDROID_X_VERSION = "1+"
-        BUILD_TOOLS_VERSION = "32.0.0"
        COMPILE_SDK = 33
        TARGET_SDK = 32
        MIN_SDK = 26
        kotlin_version = "1.7.10"
-        compose_version = "1.2.0"
-        compose_compiler_version = "1.3.0-rc02"
-        accompanist_version = '0.25.0'
-        libsu_version = '3.1.2'
-        protocVersion = '3.18.0'
-        room_version = '2.4.2'
+        compose_version = "1.2.1"
+        compose_compiler_version = "1.3.0"
+        accompanist_version = '0.25.1'
+        libsu_version = '5.0.2'
+        protocVersion = '3.21.5'
+        room_version = '2.4.3'
    }
    repositories {
+        gradlePluginPortal()
        mavenCentral()
        google()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.1'
-        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.16'
+        classpath 'com.android.tools.build:gradle:7.2.2'
+        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.19'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
        classpath 'com.google.android.gms:oss-licenses-plugin:0.10.5'
@@ -49,9 +48,6 @@ allprojects {
            tasks.withType(JavaCompile) {
                options.bootstrapClasspath = files([frameworkJar] + (options.bootstrapClasspath.files as Iterable<File>))
            }
-            tasks.withType(org.jetbrains.kotlin.gradle.internal.KaptWithoutKotlincTask) {
-                it.classpath.from(files([frameworkJar]))
-            }
            tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
                it.classpath.from(files([frameworkJar]))
            }
@@ -322,9 +318,9 @@ android {
 dependencies {
    final def FRAMEWORK_PREBUILTS_DIR = "prebuilts"

-    implementation "androidx.dynamicanimation:dynamicanimation:${ANDROID_X_VERSION}"
-    implementation "androidx.recyclerview:recyclerview:${ANDROID_X_VERSION}"
-    implementation "androidx.preference:preference-ktx:${ANDROID_X_VERSION}"
+    implementation "androidx.dynamicanimation:dynamicanimation:1.0.0"
+    implementation "androidx.recyclerview:recyclerview:1.2.1"
+    implementation "androidx.preference:preference-ktx:1.2.0"
    implementation project(':iconloaderlib')
    implementation project(':searchuilib')
    implementation fileTree(dir: "${FRAMEWORK_PREBUILTS_DIR}/libs", include: 'SystemUI-statsd.jar')
@@ -337,15 +333,15 @@ dependencies {
    // Required for AOSP to compile. This is already included in the sysui_shared.jar
    withoutQuickstepImplementation fileTree(dir: "${FRAMEWORK_PREBUILTS_DIR}/libs", include: 'plugin_core.jar')

-    implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2'
+    implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.3'
    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'org.mockito:mockito-core:4.5.1'
+    androidTestImplementation 'org.mockito:mockito-core:4.6.1'
    androidTestImplementation 'com.google.dexmaker:dexmaker:1.2'
    androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:1.2'
    androidTestImplementation 'com.android.support.test:runner:1.0.2'
    androidTestImplementation 'com.android.support.test:rules:1.0.2'
    androidTestImplementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.3'
-    androidTestImplementation "androidx.annotation:annotation:${ANDROID_X_VERSION}"
+    androidTestImplementation "androidx.annotation:annotation:1.4.0"
    implementation 'com.github.ChickenHook:RestrictionBypass:2.2'
    implementation 'dev.rikka.tools.refine:runtime:3.1.1'

@@ -360,10 +356,10 @@ dependencies {
    implementation "androidx.compose.runtime:runtime-rxjava2:$compose_version"
    implementation "androidx.compose.compiler:compiler:$compose_compiler_version"
    implementation "androidx.constraintlayout:constraintlayout:2.1.4"
-    implementation "androidx.activity:activity-compose:1.5.0"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.5.0"
-    implementation "androidx.navigation:navigation-compose:2.5.0"
-    implementation "androidx.palette:palette-ktx:${ANDROID_X_VERSION}"
+    implementation "androidx.activity:activity-compose:1.5.1"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.5.1"
+    implementation "androidx.navigation:navigation-compose:2.5.1"
+    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"
    implementation "com.google.accompanist:accompanist-insets-ui:$accompanist_version"
@@ -373,9 +369,9 @@ dependencies {
    implementation "com.google.accompanist:accompanist-placeholder-material:$accompanist_version"
    implementation "com.google.accompanist:accompanist-systemuicontroller:$accompanist_version"
    implementation "com.google.android.material:material:1.6.1"
-    implementation "io.github.fornewid:material-motion-compose-core:0.8.4"
+    implementation "io.github.fornewid:material-motion-compose-core:0.9.0"
    implementation 'dev.kdrag0n:colorkt:1.0.5'
-    implementation 'io.coil-kt:coil-compose:2.0.0'
+    implementation 'io.coil-kt:coil-compose:2.1.0'
    implementation 'me.xdrop:fuzzywuzzy:1.4.0'
    implementation "com.patrykmichalik:opto:1.0.12"
    implementation "androidx.datastore:datastore-preferences:1.0.0"
@@ -390,13 +386,13 @@ dependencies {
    implementation "com.github.topjohnwu.libsu:core:$libsu_version"
    implementation "com.github.topjohnwu.libsu:service:$libsu_version"

-    implementation 'com.google.protobuf:protobuf-javalite:3.8.0'
+    implementation 'com.google.protobuf:protobuf-javalite:3.21.5'
    implementation 'com.github.LawnchairLauncher:oss-notices:1.0.2'

    // Persian Date
    implementation 'com.github.samanzamani:PersianDate:1.5.4'

-    implementation 'com.airbnb.android:lottie:5.0.3'
+    implementation 'com.airbnb.android:lottie:5.2.0'
 }

 protobuf {
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,6 +4,8 @@ android.nonTransitiveRClass=true
 android.useAndroidX=true

 kotlin.code.style=official
+# https://blog.jetbrains.com/kotlin/2022/07/a-new-approach-to-incremental-compilation-in-kotlin/
+kotlin.incremental.useClasspathSnapshot=true

 org.gradle.caching=true
 org.gradle.jvmargs=-Xmx4g -Dfile.encoding=UTF-8
--- a/2
+++ b/2