Chore: bump dependencies (#39)

Kr328 · Oct 22, 2023 · 7c5719f · 7c5719f
1 parent c11fef6
commit 7c5719f
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 20 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -10,4 +10,4 @@ dependencies {
     compileOnly(project(":hideapi"))
 
     implementation(project(":shared"))
-}
+}
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -3,9 +3,9 @@ import com.android.build.gradle.BaseExtension
 import java.util.*
 
 plugins {
-    val agp = "7.4.1"
-    val zygote = "3.0"
-    val refine = "4.0.0"
+    val agp = "8.1.2"
+    val zygote = "3.1"
+    val refine = "4.3.1"
 
     id("com.android.application") version agp apply false
     id("com.android.library") version agp apply false
@@ -18,18 +18,18 @@ subprojects {
         extensions.configure<BaseExtension> {
             val isApp = this is AppExtension
 
-            compileSdkVersion(31)
+            compileSdkVersion(34)
 
             defaultConfig {
                 if (isApp) {
                     applicationId = "com.github.kr328.clipboard"
                 }
 
                 minSdk = 29
-                targetSdk = 33
+                targetSdk = 34
 
-                versionName = "v24"
-                versionCode = 24
+                versionName = "v26"
+                versionCode = 26
 
                 if (!isApp) {
                     consumerProguardFiles("consumer-rules.pro")
@@ -69,5 +69,5 @@ subprojects {
 }
 
 task("clean", type = Delete::class) {
-    delete(rootProject.buildDir)
+    delete(layout.buildDirectory)
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/hideapi/build.gradle.kts b/hideapi/build.gradle.kts
@@ -10,4 +10,4 @@ dependencies {
     annotationProcessor(libs.refine.processor)
 
     compileOnly(libs.refine.annotation)
-}
+}
diff --git a/module/build.gradle.kts b/module/build.gradle.kts
@@ -11,7 +11,7 @@ android {
 
     sourceSets {
         all {
-            assets.srcDir(buildDir.resolve("intermediates/manager_apk/$name"))
+            assets.srcDir(layout.buildDirectory.dir("intermediates/manager_apk/$name"))
         }
     }
 }
@@ -54,20 +54,20 @@ androidComponents {
         val buildType = it.buildType!!
 
         afterEvaluate {
-            val packaging = project(":app").tasks["package${buildType.capitalize()}"]
-            val syncManager = task("syncManagerApk${name.capitalize()}", Sync::class) {
+            val packaging = project(":app").tasks["package${buildType.replaceFirstChar(Char::uppercase)}"]
+            val syncManager = task("syncManagerApk${name.replaceFirstChar(Char::uppercase)}", Sync::class) {
                 dependsOn(packaging)
 
-                destinationDir = buildDir.resolve("intermediates/manager_apk/$name")
+                into(layout.buildDirectory.dir("intermediates/manager_apk/$name"))
 
                 from(packaging.outputs) {
                     include("*.apk")
                     into("system/app/ClipboardWhitelist")
                     rename { "ClipboardWhitelist.apk" }
                 }
             }
-            tasks["merge${name.capitalize()}Assets"].dependsOn(syncManager)
-            tasks.findByName("lintVitalAnalyze${name.capitalize()}")?.dependsOn(syncManager)
+            tasks["merge${name.replaceFirstChar(Char::uppercase)}Assets"].dependsOn(syncManager)
+            tasks.findByName("lintVitalAnalyze${name.replaceFirstChar(Char::uppercase)}")?.dependsOn(syncManager)
         }
     }
 }

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -21,8 +21,8 @@ dependencyResolutionManagement {
     }
     versionCatalogs {
         create("libs") {
-            val refine = "4.0.0"
-            val magic = "1.5"
+            val refine = "4.3.1"
+            val magic = "1.9"
 
             library("refine-processor", "dev.rikka.tools.refine:annotation-processor:$refine")
             library("refine-annotation", "dev.rikka.tools.refine:annotation:$refine")

diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
@@ -4,4 +4,8 @@ plugins {
 
 android {
     namespace = "com.github.kr328.clipboard.shared"
-}
+
+    buildFeatures {
+        aidl = true
+    }
+}