WeiguangTWK
/
LSPosed
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[gradle] Update gradle, AGP & fix build issue & downgrade safe-args (#749) 

* [gradle] Fix build in some unknown cases

* [gradle] Update gradle
This commit is contained in:
LoveSy 2021-06-17 15:49:26 +08:00 committed by GitHub
parent eeeebe1ca1
commit 73e27dc86b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/build.gradle.kts
View File

@ -18,6 +18,7 @@
*/ */
import com.android.build.api.variant.impl.ApplicationVariantImpl import com.android.build.api.variant.impl.ApplicationVariantImpl
import com.android.build.api.component.analytics.AnalyticsEnabledApplicationVariant
import com.android.build.gradle.internal.dsl.BuildType import com.android.build.gradle.internal.dsl.BuildType
import java.nio.file.Paths import java.nio.file.Paths
@ -143,7 +144,9 @@ android {
} }
androidComponents.onVariants { v -> androidComponents.onVariants { v ->
val variant = v as ApplicationVariantImpl val variant: ApplicationVariantImpl =
if (v is ApplicationVariantImpl) v
else (v as AnalyticsEnabledApplicationVariant).delegate as ApplicationVariantImpl
variant.outputs.forEach { variant.outputs.forEach {
it.outputFileName.set("LSPosedManager-${verName}-${verCode}-${variant.name}.apk") it.outputFileName.set("LSPosedManager-${verName}-${verCode}-${variant.name}.apk")
} }

4
build.gradle.kts
View File

@ -25,9 +25,9 @@ buildscript {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath("com.android.tools.build:gradle:7.0.0-beta03") classpath("com.android.tools.build:gradle:7.0.0-beta04")
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("androidx.navigation:navigation-safe-args-gradle-plugin:2.4.0-alpha02") classpath("androidx.navigation:navigation-safe-args-gradle-plugin:2.3.5")
classpath(kotlin("gradle-plugin", version = "1.4.32")) classpath(kotlin("gradle-plugin", version = "1.4.32"))
} }
} }

5
core/build.gradle.kts
View File

@ -18,6 +18,7 @@
*/ */
import com.android.build.api.variant.impl.ApplicationVariantImpl import com.android.build.api.variant.impl.ApplicationVariantImpl
import com.android.build.api.component.analytics.AnalyticsEnabledApplicationVariant
import com.android.build.gradle.BaseExtension import com.android.build.gradle.BaseExtension
import com.android.ide.common.signing.KeystoreHelper import com.android.ide.common.signing.KeystoreHelper
import org.apache.tools.ant.filters.FixCrLfFilter import org.apache.tools.ant.filters.FixCrLfFilter
@ -183,7 +184,9 @@ android {
} }
androidComponents.onVariants { v -> androidComponents.onVariants { v ->
val variant = v as ApplicationVariantImpl val variant: ApplicationVariantImpl =
if (v is ApplicationVariantImpl) v
else (v as AnalyticsEnabledApplicationVariant).delegate as ApplicationVariantImpl
val variantCapped = variant.name.capitalize() val variantCapped = variant.name.capitalize()
val variantLowered = variant.name.toLowerCase() val variantLowered = variant.name.toLowerCase()
val zipFileName = "$moduleName-$verName-$verCode-$variantLowered.zip" val zipFileName = "$moduleName-$verName-$verCode-$variantLowered.zip"

4
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
#Thu May 20 19:22:07 CST 2021 #Thu Jun 17 15:02:36 CST 2021
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME