[gradle] Sync navigation version (#1242)

This commit is contained in:
南宫雪珊 2021-10-08 20:41:42 +08:00 committed by GitHub
parent 614607a878
commit 9b1533bb61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 13 deletions

View File

@ -162,7 +162,7 @@ tasks.whenTaskAdded {
dependencies { dependencies {
val glideVersion = "4.12.0" val glideVersion = "4.12.0"
val okhttpVersion = "4.9.1" val okhttpVersion = "4.9.1"
val navVersion = "2.4.0-alpha08" val navVersion: String by rootProject.extra
annotationProcessor("com.github.bumptech.glide:compiler:$glideVersion") annotationProcessor("com.github.bumptech.glide:compiler:$glideVersion")
implementation("androidx.activity:activity:1.3.1") implementation("androidx.activity:activity:1.3.1")
implementation("androidx.browser:browser:1.3.0") implementation("androidx.browser:browser:1.3.0")
@ -196,8 +196,8 @@ dependencies {
} }
configurations.all { configurations.all {
resolutionStrategy { exclude("org.jetbrains", "annotations")
exclude(group = "org.jetbrains", module = "annotations") exclude("androidx.appcompat", "appcompat")
exclude(group = "androidx.appcompat", module = "appcompat") exclude("org.jetbrains.kotlin", "kotlin-stdlib-jdk7")
} exclude("org.jetbrains.kotlin", "kotlin-stdlib-jdk8")
} }

View File

@ -24,10 +24,12 @@ buildscript {
google() google()
mavenCentral() mavenCentral()
} }
val navVersion by extra("2.4.0-alpha10")
val agpVersion by extra("7.0.2")
dependencies { dependencies {
classpath("com.android.tools.build:gradle:7.0.2") classpath("com.android.tools.build:gradle:$agpVersion")
classpath("org.eclipse.jgit:org.eclipse.jgit:5.12.0.202106070339-r") classpath("org.eclipse.jgit:org.eclipse.jgit:5.12.0.202106070339-r")
classpath("androidx.navigation:navigation-safe-args-gradle-plugin:2.4.0-alpha10") classpath("androidx.navigation:navigation-safe-args-gradle-plugin:$navVersion")
} }
} }
@ -36,6 +38,7 @@ val refId = repo.refDatabase.exactRef("refs/remotes/origin/master").objectId!!
val commitCount = Git(repo).log().add(refId).call().count() val commitCount = Git(repo).log().add(refId).call().count()
val defaultManagerPackageName by extra("org.lsposed.manager") val defaultManagerPackageName by extra("org.lsposed.manager")
val apiCode by extra(93)
val verCode by extra(commitCount + 4200) val verCode by extra(commitCount + 4200)
val verName by extra("1.6.0") val verName by extra("1.6.0")
val androidTargetSdkVersion by extra(31) val androidTargetSdkVersion by extra(31)
@ -45,7 +48,6 @@ val androidCompileSdkVersion by extra(31)
val androidCompileNdkVersion by extra("23.0.7599858") val androidCompileNdkVersion by extra("23.0.7599858")
val androidSourceCompatibility by extra(JavaVersion.VERSION_11) val androidSourceCompatibility by extra(JavaVersion.VERSION_11)
val androidTargetCompatibility by extra(JavaVersion.VERSION_11) val androidTargetCompatibility by extra(JavaVersion.VERSION_11)
val apiCode by extra(93)
tasks.register("Delete", Delete::class) { tasks.register("Delete", Delete::class) {
delete(rootProject.buildDir) delete(rootProject.buildDir)

View File

@ -24,11 +24,11 @@ import com.android.ide.common.signing.KeystoreHelper
import org.apache.commons.codec.binary.Hex import org.apache.commons.codec.binary.Hex
import org.apache.tools.ant.filters.FixCrLfFilter import org.apache.tools.ant.filters.FixCrLfFilter
import org.apache.tools.ant.filters.ReplaceTokens import org.apache.tools.ant.filters.ReplaceTokens
import java.io.FileOutputStream
import java.io.PrintStream import java.io.PrintStream
import java.security.MessageDigest import java.security.MessageDigest
import java.util.jar.JarFile import java.util.jar.JarFile
import java.util.zip.ZipOutputStream import java.util.zip.ZipOutputStream
import java.io.FileOutputStream
plugins { plugins {
id("com.android.application") id("com.android.application")
@ -46,8 +46,12 @@ val moduleMaxRiruApiVersion = 25
val injectedPackageName = "com.android.shell" val injectedPackageName = "com.android.shell"
val injectedPackageUid = 2000 val injectedPackageUid = 2000
val agpVersion: String by rootProject.extra
val defaultManagerPackageName: String by rootProject.extra val defaultManagerPackageName: String by rootProject.extra
val apiCode: Int by rootProject.extra val apiCode: Int by rootProject.extra
val verCode: Int by rootProject.extra
val verName: String by rootProject.extra
val androidTargetSdkVersion: Int by rootProject.extra val androidTargetSdkVersion: Int by rootProject.extra
val androidMinSdkVersion: Int by rootProject.extra val androidMinSdkVersion: Int by rootProject.extra
@ -57,14 +61,11 @@ val androidCompileNdkVersion: String by rootProject.extra
val androidSourceCompatibility: JavaVersion by rootProject.extra val androidSourceCompatibility: JavaVersion by rootProject.extra
val androidTargetCompatibility: JavaVersion by rootProject.extra val androidTargetCompatibility: JavaVersion by rootProject.extra
val verCode: Int by rootProject.extra
val verName: String by rootProject.extra
dependencies { dependencies {
implementation("dev.rikka.ndk:riru:26.0.0") implementation("dev.rikka.ndk:riru:26.0.0")
implementation("dev.rikka.ndk.thirdparty:cxx:1.1.0") implementation("dev.rikka.ndk.thirdparty:cxx:1.1.0")
implementation("io.github.vvb2060.ndk:dobby:1.2") implementation("io.github.vvb2060.ndk:dobby:1.2")
implementation("com.android.tools.build:apksig:7.0.2") implementation("com.android.tools.build:apksig:$agpVersion")
implementation("org.apache.commons:commons-lang3:3.12.0") implementation("org.apache.commons:commons-lang3:3.12.0")
implementation("de.upb.cs.swt:axml:2.1.1") implementation("de.upb.cs.swt:axml:2.1.1")
compileOnly("androidx.annotation:annotation:1.2.0") compileOnly("androidx.annotation:annotation:1.2.0")