Bump compileSdk and dependencies

.github/renovate.json5

@@ -0,0 +1,19 @@
+{
+  $schema: 'https://docs.renovatebot.com/renovate-schema.json',
+  extends: [
+    'config:recommended',
+  ],
+  labels: [
+    'Update',
+  ],
+  packageRules: [
+    // Enable auto-merge for minor/patch updates.
+    {
+      matchUpdateTypes: [
+        'minor',
+        'patch',
+      ],
+      automerge: true,
+    },
+  ]
+}

.github/workflows/update-dependencies.yaml

@@ -60,7 +60,7 @@ jobs:
 
       - name: Create Pull Request
         id: cpr
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v8
         with:
           token: ${{ steps.generate-token.outputs.token }}
           commit-message: Update Dependencies

app/build.gradle.kts

@@ -1,3 +1,5 @@
+import com.android.build.api.variant.FilterConfiguration
+import org.gradle.kotlin.dsl.androidComponents
 import java.net.URL
 import java.nio.file.Files
 import java.nio.file.StandardCopyOption
@@ -8,6 +10,21 @@ plugins {
     id("com.android.application")
 }
 
+androidComponents {
+    onVariants(selector().withBuildType("release")) { variant ->
+        variant.outputs.forEach { output ->
+            // TODO: https://github.com/android/gradle-recipes/blob/cbe7c7dea2a3f5b1764756f24bf453d1235c80e2/listenToArtifacts/README.md
+            with(output as com.android.build.api.variant.impl.VariantOutputImpl) {
+                val abiName = output.filters
+                    .find { it.filterType == FilterConfiguration.FilterType.ABI }
+                    ?.identifier ?: "universal"
+                val newApkName = "cmfa-${versionName.get()}-meta-${abiName}-${variant.buildType}.apk"
+                outputFileName = newApkName
+            }
+        }
+    }
+}
+
 dependencies {
     compileOnly(project(":hideapi"))
 

app/proguard-rules.pro

@@ -31,29 +31,3 @@
     public static void checkParameterIsNotNull(...);
     public static void checkNotNullParameter(...);
 }
-
-# Kotlin Coroutine
-# Allow R8 to optimize away the FastServiceLoader.
-# Together with ServiceLoader optimization in R8
-# this results in direct instantiation when loading Dispatchers.Main
--assumenosideeffects class kotlinx.coroutines.internal.MainDispatcherLoader {
-    boolean FAST_SERVICE_LOADER_ENABLED return false;
-}
-
--assumenosideeffects class kotlinx.coroutines.internal.FastServiceLoaderKt {
-    boolean ANDROID_DETECTED return true;
-}
-
--keep class kotlinx.coroutines.android.AndroidDispatcherFactory {*;}
-
-# Disable support for "Missing Main Dispatcher", since we always have Android main dispatcher
--assumenosideeffects class kotlinx.coroutines.internal.MainDispatchersKt {
-    boolean SUPPORT_MISSING return false;
-}
-
-# Statically turn off all debugging facilities and assertions
--assumenosideeffects class kotlinx.coroutines.DebugKt {
-    boolean getASSERTIONS_ENABLED() return false;
-    boolean getDEBUG() return false;
-    boolean getRECOVER_STACK_TRACES() return false;
-}

build.gradle.kts

@@ -55,7 +55,8 @@ subprojects {
                 else "com.github.kr328.clash.$name"
             }
 
-            minSdk = 21
+            minSdk = 23
+            compileSdkVersion(36)
             targetSdk = 35
 
             versionName = "2.11.23"
@@ -76,15 +77,11 @@ subprojects {
 
             if (!isApp) {
                 consumerProguardFiles("consumer-rules.pro")
-            } else {
-                setProperty("archivesBaseName", "cmfa-$versionName")
             }
         }
 
         ndkVersion = "29.0.14206865"
 
-        compileSdkVersion(defaultConfig.targetSdk!!)
-
         if (isApp) {
             packagingOptions {
                 resources {
@@ -203,15 +200,3 @@ subprojects {
 task("clean", type = Delete::class) {
     delete(rootProject.buildDir)
 }
-
-tasks.wrapper {
-    distributionType = Wrapper.DistributionType.ALL
-
-    doLast {
-        val sha256 = URL("$distributionUrl.sha256").openStream()
-            .use { it.reader().readText().trim() }
-
-        file("gradle/wrapper/gradle-wrapper.properties")
-            .appendText("distributionSha256Sum=$sha256")
-    }
-}

design/src/main/java/com/github/kr328/clash/design/MainDesign.kt

@@ -81,7 +81,7 @@ class MainDesign(context: Context) : Design<MainDesign.Request>(context) {
     init {
         binding.self = this
 
-        binding.colorClashStarted = context.resolveThemedColor(com.google.android.material.R.attr.colorPrimary)
+        binding.colorClashStarted = context.resolveThemedColor(android.R.attr.colorPrimary)
         binding.colorClashStopped = context.resolveThemedColor(R.attr.colorClashStopped)
     }
 

design/src/main/java/com/github/kr328/clash/design/adapter/PopupListAdapter.kt

@@ -15,9 +15,9 @@ class PopupListAdapter(
     private val texts: List<CharSequence>,
     private val selected: Int,
 ) : BaseAdapter() {
-    private val colorPrimary = context.resolveThemedColor(com.google.android.material.R.attr.colorPrimary)
+    private val colorPrimary = context.resolveThemedColor(android.R.attr.colorPrimary)
     private val colorOnPrimary = context.resolveThemedColor(com.google.android.material.R.attr.colorOnPrimary)
-    private val colorControlNormal = context.resolveThemedColor(com.google.android.material.R.attr.colorControlNormal)
+    private val colorControlNormal = context.resolveThemedColor(android.R.attr.colorControlNormal)
 
     override fun getCount(): Int {
         return texts.size

design/src/main/java/com/github/kr328/clash/design/component/ProxyViewConfig.kt

@@ -14,7 +14,7 @@ class ProxyViewConfig(val context: Context, var proxyLine: Int) {
         context.resolveThemedResourceId(android.R.attr.selectableItemBackground)
 
     val selectedControl = context.resolveThemedColor(com.google.android.material.R.attr.colorOnPrimary)
-    val selectedBackground = context.resolveThemedColor(com.google.android.material.R.attr.colorPrimary)
+    val selectedBackground = context.resolveThemedColor(android.R.attr.colorPrimary)
 
     val unselectedControl = context.resolveThemedColor(com.google.android.material.R.attr.colorOnSurface)
     val unselectedBackground: Int

gradle/libs.versions.toml

@@ -1,23 +1,23 @@
 [versions]
-agp = "8.8.0"
-kotlin = "2.1.0"
-ksp = "2.1.0-1.0.29"
+agp = "8.13.2"
+kotlin = "2.3.10"
+ksp = "2.3.6"
 golang = "1.0.4"
-coroutine = "1.10.1"
-coreKtx = "1.8.0"
-activity = "1.5.0"
-fragment = "1.5.0"
-appcompat = "1.4.2"
-coordinator = "1.2.0"
-recyclerview = "1.2.1"
-viewpager = "1.0.0"
-material = "1.6.1"
-serialization = "1.3.3"
+coroutine = "1.10.2"
+coreKtx = "1.17.0"
+activity = "1.12.4"
+fragment = "1.8.9"
+appcompat = "1.7.1"
+coordinator = "1.3.0"
+recyclerview = "1.4.0"
+viewpager = "1.1.0"
+material = "1.13.0"
+serialization = "1.10.0"
 kaidl = "1.15"
-room = "2.4.2"
+room = "2.8.4"
 multiprocess = "1.0.0"
 quickie = "1.11.0"
-androidx-activity-ktx = "1.9.0"
+androidx-activity-ktx = "1.12.4"
 
 [libraries]
 build-android = { module = "com.android.tools.build:gradle", version.ref = "agp" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,8 @@
-#Tue Jan 14 14:06:42 CST 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionSha256Sum=b266d5ff6b90eada6dc3b20cb090e3731302e553a27c5d3e4df1f0d76beaff06

service/build.gradle.kts

@@ -19,7 +19,7 @@ dependencies {
     implementation(libs.androidx.room.ktx)
     implementation(libs.kaidl.runtime)
     implementation(libs.rikkax.multiprocess)
-    implementation(platform("com.squareup.okhttp3:okhttp-bom:4.12.0"))
+    implementation(platform("com.squareup.okhttp3:okhttp-bom:5.3.2"))
 
     // define any required OkHttp artifacts without version
     implementation("com.squareup.okhttp3:okhttp")