Update android gradle plugin to 7.0.2

buildSrc/build.gradle.kts

@@ -9,14 +9,13 @@ apply(from = "../repositories.gradle.kts")
 dependencies {
     val androidPluginVersion = rootProject.extra["androidPluginVersion"].toString()
     val kotlinVersion = rootProject.extra["kotlinVersion"].toString()
-    val playPublisherVersion = rootProject.extra["playPublisherVersion"].toString()
     implementation("com.android.tools.build:gradle:$androidPluginVersion")
     implementation("com.android.tools.build:gradle-api:$androidPluginVersion")
     implementation(kotlin("gradle-plugin", kotlinVersion))
     implementation(kotlin("stdlib"))
     implementation("cn.hutool:hutool-crypto:5.7.12")
     implementation("org.tukaani:xz:1.9")
-    implementation("com.github.triplet.gradle:play-publisher:$playPublisherVersion")
+    implementation("com.github.triplet.gradle:play-publisher:3.6.0")
     implementation("org.kohsuke:github-api:1.131")
     implementation("com.squareup.okhttp3:okhttp:5.0.0-alpha.2")
     implementation("org.mozilla.rust-android-gradle:plugin:0.9.0")

buildSrc/src/main/kotlin/Helpers.kt

@@ -1,10 +1,10 @@
+import cn.hutool.core.codec.Base64
 import cn.hutool.core.util.RuntimeUtil
 import cn.hutool.crypto.digest.DigestUtil
 import com.android.build.gradle.AbstractAppExtension
 import com.android.build.gradle.BaseExtension
 import com.android.build.gradle.internal.api.BaseVariantOutputImpl
 import com.github.triplet.gradle.play.PlayPublisherExtension
-import org.apache.commons.codec.binary.Base64InputStream
 import org.apache.tools.ant.filters.StringInputStream
 import org.gradle.api.JavaVersion
 import org.gradle.api.Project
@@ -62,7 +62,8 @@ fun Project.requireLocalProperties(): Properties {
 
         val base64 = System.getenv("LOCAL_PROPERTIES")
         if (!base64.isNullOrBlank()) {
-            localProperties.load(Base64InputStream(StringInputStream(base64)))
+
+            localProperties.load(StringInputStream(Base64.decodeStr(base64)))
         } else if (project.rootProject.file("local.properties").exists()) {
             localProperties.load(rootProject.file("local.properties").inputStream())
         }
@@ -91,8 +92,8 @@ fun Project.setupCommon() {
         buildToolsVersion("30.0.3")
         compileSdkVersion(31)
         defaultConfig {
-            minSdkVersion(21)
-            targetSdkVersion(31)
+            minSdk = 21
+            targetSdk = 31
         }
         buildTypes {
             getByName("release") {
@@ -104,21 +105,26 @@ fun Project.setupCommon() {
             targetCompatibility = javaVersion
         }
         lintOptions {
-            disable("MissingTranslation")
-            disable("ExtraTranslation")
-            disable("BlockedPrivateApi")
+            isShowAll = true
+            isCheckAllWarnings = true
+            isCheckReleaseBuilds = false
+            htmlOutput = project.file("build/lint.html")
         }
         packagingOptions {
-            exclude("**/*.kotlin_*")
-            exclude("/META-INF/*.version")
-            exclude("/META-INF/native/**")
-            exclude("/META-INF/native-image/**")
-            exclude("/META-INF/INDEX.LIST")
-            exclude("DebugProbesKt.bin")
-            exclude("com/**")
-            exclude("org/**")
-            exclude("**/*.java")
-            exclude("**/*.proto")
+            excludes.addAll(
+                listOf(
+                    "**/*.kotlin_*",
+                    "/META-INF/*.version",
+                    "/META-INF/native/**",
+                    "/META-INF/native-image/**",
+                    "/META-INF/INDEX.LIST",
+                    "DebugProbesKt.bin",
+                    "com/**",
+                    "org/**",
+                    "**/*.java",
+                    "**/*.proto"
+                )
+            )
         }
         packagingOptions {
             jniLibs.useLegacyPackaging = true

buildSrc/src/main/kotlin/V2RayAssets.kt

@@ -2,9 +2,10 @@ import cn.hutool.core.util.ZipUtil
 import cn.hutool.crypto.digest.DigestUtil
 import okhttp3.OkHttpClient
 import okhttp3.Request
-import org.apache.commons.compress.compressors.xz.XZCompressorOutputStream
 import org.gradle.api.Project
 import org.kohsuke.github.GitHubBuilder
+import org.tukaani.xz.LZMA2Options
+import org.tukaani.xz.XZOutputStream
 import java.io.File
 import java.util.*
 
@@ -168,7 +169,7 @@ fun Project.downloadAssets() {
 
         ZipUtil.get(cacheFile, null, "browserforwarder/index.js").use { input ->
             File(assets, "v2ray/index.js.xz").outputStream().use { out ->
-                XZCompressorOutputStream(out, 9).use {
+                XZOutputStream(out, LZMA2Options(9)).use {
                     input.copyTo(it)
                 }
             }

repositories.gradle.kts

@@ -1,7 +1,6 @@
 rootProject.extra.apply {
-    set("androidPluginVersion", "4.2.2")
+    set("androidPluginVersion", "7.0.2")
     set("kotlinVersion", "1.5.30")
-    set("playPublisherVersion", "3.5.0")
 }
 
 repositories {