[gradle] Update gradle, AGP & fix build issue & downgrade safe-args (L…

…SPosed#749) * [gradle] Fix build in some unknown cases * [gradle] Update gradle
seeblog · Jun 17, 2021 · 73e27dc · 73e27dc
1 parent eeeebe1
commit 73e27dc
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -18,6 +18,7 @@
  */
 
 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 java.nio.file.Paths
 
@@ -143,7 +144,9 @@ android {
 }
 
 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 {
         it.outputFileName.set("LSPosedManager-${verName}-${verCode}-${variant.name}.apk")
     }

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -25,9 +25,9 @@ buildscript {
         mavenCentral()
     }
     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("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"))
     }
 }

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -18,6 +18,7 @@
  */
 
 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.ide.common.signing.KeystoreHelper
 import org.apache.tools.ant.filters.FixCrLfFilter
@@ -183,7 +184,9 @@ android {
 }
 
 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 variantLowered = variant.name.toLowerCase()
     val zipFileName = "$moduleName-$verName-$verCode-$variantLowered.zip"

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu May 20 19:22:07 CST 2021
+#Thu Jun 17 15:02:36 CST 2021
 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
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME