升级gradle，APG，等

build.gradle

@@ -144,6 +144,11 @@ android {
     kotlinOptions {
         jvmTarget = '17'
     }
+
+    buildFeatures {
+        buildConfig = true
+    }
+
 }
 
 allprojects {
@@ -162,14 +167,14 @@ allprojects {
 
 dependencies {
     implementation "androidx.dynamicanimation:dynamicanimation:${ANDROID_X_VERSION}"
-    implementation "androidx.recyclerview:recyclerview:${ANDROID_X_VERSION}"
+    implementation "androidx.recyclerview:recyclerview:1.3.2"
     implementation "androidx.preference:preference:${ANDROID_X_VERSION}"
     implementation project(':IconLoader')
     implementation project(':systemUIPluginCore')
 //    implementation project(':UiTestsLibLauncher')
 //    withQuickstepImplementation project(':SharedLibWrapper')
-    implementation 'com.google.protobuf:protobuf-javalite:3.8.0'
-    implementation 'androidx.core:core-ktx:1.10.1'
+    implementation 'com.google.protobuf:protobuf-javalite:4.26.1'
+    implementation 'androidx.core:core-ktx:1.13.1'
 
     // Recents lib dependency
     withQuickstepImplementation fileTree(dir: "${FRAMEWORK_PREBUILTS_DIR}", include: 'sysui_shared.jar')
@@ -177,22 +182,22 @@ dependencies {
     // Required for AOSP to compile. This is already included in the sysui_shared.jar
     withoutQuickstepImplementation fileTree(dir: "${FRAMEWORK_PREBUILTS_DIR}", include: 'plugin_core.jar')
 
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13.2'
     androidTestImplementation "org.mockito:mockito-core:1.9.5"
     androidTestImplementation 'com.google.dexmaker:dexmaker:1.2'
     androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:1.2'
-    androidTestImplementation 'com.android.support.test:runner:1.0.0'
-    androidTestImplementation 'com.android.support.test:rules:1.0.0'
-    androidTestImplementation 'com.android.support.test.uiautomator:uiautomator-v18:2.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}"
 
     api 'com.airbnb.android:lottie:3.3.0'
 
-    implementation 'com.google.android.material:material:1.4.0'
+    implementation 'com.google.android.material:material:1.10.0'
     implementation 'androidx.slice:slice-builders:1.0.0'
 }
 
-def protocVersion = '3.8.0'
+def protocVersion = '4.26.1'//'3.8.0'
 
 protobuf {
     // Configure the protoc executable

gradle.properties

@@ -6,12 +6,14 @@ org.gradle.parallel=true
 ANDROID_X_VERSION=1+
 
 #GRADLE_CLASS_PATH=com.android.tools.build:gradle:3.5.1
-GRADLE_CLASS_PATH=com.android.tools.build:gradle:7.4.1
-#GRADLE_CLASS_PATH=com.android.tools.build:gradle:8.2.2
+#GRADLE_CLASS_PATH=com.android.tools.build:gradle:7.4.1
+GRADLE_CLASS_PATH=com.android.tools.build:gradle:8.4.1
 
 #PROTOBUF_CLASS_PATH=com.google.protobuf:protobuf-gradle-plugin:0.8.8
-PROTOBUF_CLASS_PATH=com.google.protobuf:protobuf-gradle-plugin:0.8.18
-PROTOBUF_DEPENDENCY=com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-7
+#PROTOBUF_CLASS_PATH=com.google.protobuf:protobuf-gradle-plugin:0.8.18
+PROTOBUF_CLASS_PATH=com.google.protobuf:protobuf-gradle-plugin:0.9.4
+#PROTOBUF_DEPENDENCY=com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-7
+PROTOBUF_DEPENDENCY=com.google.protobuf.nano:protobuf-javanano:3.1.0
 
 BUILD_TOOLS_VERSION=28.0.3
 COMPILE_SDK=android-34

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

iconloaderlib/build.gradle

@@ -34,5 +34,5 @@ android {
 
 dependencies {
     implementation "androidx.core:core:1.13.1"
-    implementation "androidx.annotation:annotation:1.8.0"
+    implementation "androidx.annotation:annotation:1.8.1"
 }

src/com/android/launcher3/Utilities.java

@@ -653,7 +653,7 @@ public final class Utilities {
         } else {
             return Process.myUserHandle().equals(info.user)
                     ? new ColorDrawable(Color.TRANSPARENT)
-                    : context.getDrawable(R.drawable.ic_work_app_badge);
+                    : context.getDrawable(com.android.launcher3.icons.R.drawable.ic_work_app_badge);
         }
     }
 

src/com/android/launcher3/widget/WidgetCell.java

@@ -350,7 +350,7 @@ public class WidgetCell extends LinearLayout {
             mWidgetBadge.setVisibility(View.GONE);
         } else {
             mWidgetBadge.setVisibility(View.VISIBLE);
-            mWidgetBadge.setImageResource(R.drawable.ic_work_app_badge);
+            mWidgetBadge.setImageResource(com.android.launcher3.icons.R.drawable.ic_work_app_badge);
         }
     }