Update deps

* Gradle 8.8 * AGP 8.4.1 * Kotlin 2.0.0
YuKongA · Jun 5, 2024 · be9b1a4 · be9b1a4
1 parent ed23e1e
commit be9b1a4
Show file tree

Hide file tree

Showing 8 changed files with 226 additions and 147 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -2,8 +2,8 @@ import com.android.build.gradle.internal.api.BaseVariantOutputImpl
 import java.util.Properties
 
 plugins {
-    alias(libs.plugins.androidApplication)
-    alias(libs.plugins.kotlinAndroid)
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.kotlin.android)
 }
 
 android {
@@ -47,25 +47,29 @@ android {
     buildTypes {
         release {
             isMinifyEnabled = true
+            isShrinkResources = true
             proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
             signingConfig = signingConfigs.getByName(if (keystorePath != null) "github" else "release")
         }
         debug {
             if (keystorePath != null) signingConfig = signingConfigs.getByName("github")
         }
     }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_21
-        targetCompatibility = JavaVersion.VERSION_21
+    java {
+        toolchain {
+            languageVersion = JavaLanguageVersion.of(21)
+        }
     }
-    kotlinOptions {
-        jvmTarget = "21"
-        freeCompilerArgs = listOf(
-            "-Xno-param-assertions",
-            "-Xno-call-assertions",
-            "-Xno-receiver-assertions",
-            "-language-version=2.0",
-        )
+    kotlin {
+        jvmToolchain(21)
+        compilerOptions {
+            freeCompilerArgs = listOf(
+                "-Xno-param-assertions",
+                "-Xno-call-assertions",
+                "-Xno-receiver-assertions",
+                "-language-version=2.0"
+            )
+        }
     }
     packaging {
         resources {

diff --git a/app/src/main/kotlin/top/yukonga/mediaControlBlur/utils/blur/MiBlurUtils.kt b/app/src/main/kotlin/top/yukonga/mediaControlBlur/utils/blur/MiBlurUtils.kt
@@ -50,7 +50,7 @@ object MiBlurUtils {
     }
 
     fun View.setMiBackgroundBlurRadius(radius: Int) {
-        if (radius < 0 || radius > 200) {
+        if (radius < 0 || radius > 500) {
             Log.e("MiBlurUtils", "setMiBackgroundBlurRadius error radius is " + radius + " " + this.javaClass.getName() + " hashcode " + this.hashCode())
             return
         }

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,4 +1,4 @@
 plugins {
-    alias(libs.plugins.androidApplication) apply false
-    alias(libs.plugins.kotlinAndroid) apply false
+    alias(libs.plugins.android.application) apply false
+    alias(libs.plugins.kotlin.android) apply false
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,13 +1,13 @@
 [versions]
-agp = "8.4.0"
+agp = "8.4.1"
 ezXHelper = "2.1.0"
-kotlin = "1.9.23"
+kotlin = "2.0.0"
 xposed = "82"
 
 [libraries]
 ezXHelper = { module = "com.github.kyuubiran:EzXHelper", version.ref = "ezXHelper" }
 xposed = { module = "de.robv.android.xposed:api", version.ref = "xposed" }
 
 [plugins]
-androidApplication = { id = "com.android.application", version.ref = "agp" }
-kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+android-application = { id = "com.android.application", version.ref = "agp" }
+kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 #Tue Dec 12 16:56:06 CST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME