Update android gradle plugin (#466)

This commit is contained in:
tehcneko 2021-04-07 13:18:52 +08:00 committed by GitHub
parent 8ed46a0c18
commit 445b87711f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 16 deletions

View File

@ -123,19 +123,12 @@ val optimizeReleaseRes = task("optimizeReleaseRes").doLast {
project.android.buildToolsVersion, project.android.buildToolsVersion,
"aapt2" "aapt2"
) )
val mapping = Paths.get(
project.buildDir.path,
"outputs",
"mapping",
"release",
"shortening.txt"
)
val zip = Paths.get( val zip = Paths.get(
project.buildDir.path, project.buildDir.path,
"intermediates", "intermediates",
"shrunk_processed_res", "optimized_processed_res",
"release", "release",
"resources-release-stripped.ap_" "resources-release-optimize.ap_"
) )
val optimized = File("${zip}.opt") val optimized = File("${zip}.opt")
val cmd = exec { val cmd = exec {
@ -143,8 +136,6 @@ val optimizeReleaseRes = task("optimizeReleaseRes").doLast {
aapt2, "optimize", aapt2, "optimize",
"--collapse-resource-names", "--collapse-resource-names",
"--enable-sparse-encoding", "--enable-sparse-encoding",
"--shorten-resource-paths",
"--resource-path-shortening-map", mapping,
"-o", optimized, "-o", optimized,
zip zip
) )
@ -157,7 +148,7 @@ val optimizeReleaseRes = task("optimizeReleaseRes").doLast {
} }
tasks.whenTaskAdded { tasks.whenTaskAdded {
if (name == "shrinkReleaseRes") { if (name == "optimizeReleaseResources") {
finalizedBy(optimizeReleaseRes) finalizedBy(optimizeReleaseRes)
} }
} }
@ -171,7 +162,7 @@ dependencies {
implementation("androidx.browser:browser:1.3.0") implementation("androidx.browser:browser:1.3.0")
implementation("androidx.constraintlayout:constraintlayout:2.0.4") implementation("androidx.constraintlayout:constraintlayout:2.0.4")
implementation("androidx.core:core:1.3.2") implementation("androidx.core:core:1.3.2")
implementation("androidx.fragment:fragment:1.3.1") implementation("androidx.fragment:fragment:1.3.2")
implementation("androidx.recyclerview:recyclerview:1.1.0") implementation("androidx.recyclerview:recyclerview:1.1.0")
implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0") implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
implementation("com.caverock:androidsvg-aar:1.4") implementation("com.caverock:androidsvg-aar:1.4")

View File

@ -26,8 +26,8 @@ buildscript {
maven("https://storage.googleapis.com/r8-releases/raw") maven("https://storage.googleapis.com/r8-releases/raw")
} }
dependencies { dependencies {
classpath("com.android.tools:r8:3.0.30-dev") classpath("com.android.tools:r8:3.0.32-dev")
classpath("com.android.tools.build:gradle:7.0.0-alpha12") classpath("com.android.tools.build:gradle:7.0.0-alpha13")
classpath("org.eclipse.jgit:org.eclipse.jgit:5.10.0.202012080955-r") classpath("org.eclipse.jgit:org.eclipse.jgit:5.10.0.202012080955-r")
classpath(kotlin("gradle-plugin", version = "1.4.32")) classpath(kotlin("gradle-plugin", version = "1.4.32"))
} }

View File

@ -13,4 +13,3 @@
#Sat Jan 30 19:20:27 CST 202130.0.322.0.7026061 #Sat Jan 30 19:20:27 CST 202130.0.322.0.7026061
android.useAndroidX=true android.useAndroidX=true
android.enableJetifier=true android.enableJetifier=true
android.enableResourceOptimizations=false