Преглед на файлове

Chore: update dependencies & remove appcenter tracker

Kr328 преди 3 години
родител
ревизия
03bc3c0876

+ 0 - 3
.github/FUNDING.yml

@@ -1,3 +0,0 @@
-# These are supported funding model platforms
-
-github: [Kr328]

+ 1 - 1
app/src/main/java/com/github/kr328/clash/FilesActivity.kt

@@ -116,7 +116,7 @@ class FilesActivity : BaseActivity<FilesDesign>() {
                             }
                             is FilesDesign.Request.ExportFile -> {
                                 val uri: Uri? = startActivityForResult(
-                                    ActivityResultContracts.CreateDocument(),
+                                    ActivityResultContracts.CreateDocument("text/plain"),
                                     it.file.name
                                 )
 

+ 1 - 1
app/src/main/java/com/github/kr328/clash/LogcatActivity.kt

@@ -67,7 +67,7 @@ class LogcatActivity : BaseActivity<LogcatDesign>() {
                 }
                 LogcatDesign.Request.Export -> {
                     val output = startActivityForResult(
-                        ActivityResultContracts.CreateDocument(),
+                        ActivityResultContracts.CreateDocument("text/plain"),
                         file.fileName
                     )
 

+ 5 - 3
build.gradle.kts

@@ -40,8 +40,8 @@ subprojects {
             minSdk = 21
             targetSdk = 31
 
-            versionName = "2.5.9-pa02"
-            versionCode = 205009
+            versionName = "2.5.11-pa03"
+            versionCode = 205011
 
             resValue("string", "release_name", "v$versionName")
             resValue("integer", "release_code", "$versionCode")
@@ -65,7 +65,9 @@ subprojects {
 
         if (isApp) {
             packagingOptions {
-                excludes.add("DebugProbesKt.bin")
+                resources {
+                    excludes.add("DebugProbesKt.bin")
+                }
             }
         }
 

+ 3 - 3
service/build.gradle.kts

@@ -1,6 +1,5 @@
 plugins {
     kotlin("android")
-    kotlin("kapt")
     id("kotlinx-serialization")
     id("com.android.library")
     id("com.google.devtools.ksp")
@@ -11,7 +10,7 @@ dependencies {
     implementation(project(":common"))
 
     ksp(libs.kaidl.compiler)
-    kapt(libs.androidx.room.compiler)
+    ksp(libs.androidx.room.compiler)
 
     implementation(libs.kotlin.coroutine)
     implementation(libs.kotlin.serialization.json)
@@ -25,7 +24,8 @@ dependencies {
 afterEvaluate {
     android {
         libraryVariants.forEach {
-            sourceSets[it.name].java.srcDir(buildDir.resolve("generated/ksp/${it.name}/kotlin"))
+            sourceSets[it.name].kotlin.srcDir(buildDir.resolve("generated/ksp/${it.name}/kotlin"))
+            sourceSets[it.name].java.srcDir(buildDir.resolve("generated/ksp/${it.name}/java"))
         }
     }
 }

+ 10 - 13
settings.gradle.kts

@@ -18,21 +18,20 @@ pluginManagement {
 dependencyResolutionManagement {
     versionCatalogs {
         create("libs") {
-            val agp = "7.2.0"
-            val kotlin = "1.6.21"
-            val ksp = "$kotlin-1.0.5"
+            val agp = "7.2.1"
+            val kotlin = "1.7.0"
+            val ksp = "$kotlin-1.0.6"
             val golang = "1.0.4"
-            val coroutine = "1.6.1"
-            val coreKtx = "1.7.0"
-            val activity = "1.4.0"
-            val fragment = "1.4.1"
-            val appcompat = "1.4.1"
+            val coroutine = "1.6.3"
+            val coreKtx = "1.8.0"
+            val activity = "1.5.0"
+            val fragment = "1.5.0"
+            val appcompat = "1.4.2"
             val coordinator = "1.2.0"
             val recyclerview = "1.2.1"
             val viewpager = "1.0.0"
-            val material = "1.6.0"
-            val appcenter = "4.4.3"
-            val serialization = "1.3.2"
+            val material = "1.6.1"
+            val serialization = "1.3.3"
             val kaidl = "1.15"
             val room = "2.4.2"
             val multiprocess = "1.0.0"
@@ -55,8 +54,6 @@ dependencyResolutionManagement {
             library("androidx-room-runtime", "androidx.room:room-runtime:$room")
             library("androidx-room-ktx", "androidx.room:room-ktx:$room")
             library("google-material", "com.google.android.material:material:$material")
-            library("appcenter-analytics", "com.microsoft.appcenter:appcenter-analytics:$appcenter")
-            library("appcenter-crashes", "com.microsoft.appcenter:appcenter-crashes:$appcenter")
             library("kaidl-compiler", "com.github.kr328.kaidl:kaidl:$kaidl")
             library("kaidl-runtime", "com.github.kr328.kaidl:kaidl-runtime:$kaidl")
             library("rikkax-multiprocess", "dev.rikka.rikkax.preference:multiprocess:$multiprocess")