TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-04-16 08:51:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Android Studio

Browse Source
This commit is contained in:
topjohnwu 2021-07-24 03:51:00 -07:00
parent 1eb83ad812
commit c59f8adc4a
4 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
app/build.gradle.kts
View File

@ -27,7 +27,7 @@ android {
vectorDrawables.useSupportLibrary = true vectorDrawables.useSupportLibrary = true
versionName = Config.version versionName = Config.version
versionCode = Config.versionCode versionCode = Config.versionCode
ndk.abiFilters("armeabi-v7a", "arm64-v8a", "x86", "x86_64") ndk.abiFilters.addAll(listOf("armeabi-v7a", "arm64-v8a", "x86", "x86_64"))
} }
buildTypes { buildTypes {
@ -51,18 +51,22 @@ android {
} }
packagingOptions { packagingOptions {
exclude("/META-INF/*") resources {
exclude("/org/bouncycastle/**") excludes.add("/META-INF/*")
exclude("/kotlin/**") excludes.add("/org/bouncycastle/**")
exclude("/kotlinx/**") excludes.add("/kotlin/**")
exclude("/okhttp3/**") excludes.add("/kotlinx/**")
exclude("/*.txt") excludes.add("/okhttp3/**")
exclude("/*.bin") excludes.add("/*.txt")
doNotStrip("**/*.so") excludes.add("/*.bin")
}
jniLibs {
keepDebugSymbols.add("**/*.so")
}
} }
kotlinOptions { kotlinOptions {
jvmTarget = "1.8" jvmTarget = "11"
} }
} }
@ -170,7 +174,7 @@ android.applicationVariants.all {
} }
} }
} }
registerJavaGeneratingTask(genSrcTask.get(), outSrcDir) registerJavaGeneratingTask(genSrcTask, outSrcDir)
} }
dependencies { dependencies {
@ -185,7 +189,7 @@ dependencies {
implementation("com.github.topjohnwu:lz4-java:1.7.1") implementation("com.github.topjohnwu:lz4-java:1.7.1")
implementation("com.jakewharton.timber:timber:4.7.1") implementation("com.jakewharton.timber:timber:4.7.1")
val vBC = "1.68" val vBC = "1.69"
implementation("org.bouncycastle:bcprov-jdk15on:${vBC}") implementation("org.bouncycastle:bcprov-jdk15on:${vBC}")
implementation("org.bouncycastle:bcpkix-jdk15on:${vBC}") implementation("org.bouncycastle:bcpkix-jdk15on:${vBC}")
@ -232,10 +236,10 @@ dependencies {
implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0") implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
implementation("androidx.browser:browser:1.3.0") implementation("androidx.browser:browser:1.3.0")
implementation("androidx.preference:preference:1.1.1") implementation("androidx.preference:preference:1.1.1")
implementation("androidx.recyclerview:recyclerview:1.2.0") implementation("androidx.recyclerview:recyclerview:1.2.1")
implementation("androidx.fragment:fragment-ktx:1.3.3") implementation("androidx.fragment:fragment-ktx:1.3.6")
implementation("androidx.work:work-runtime-ktx:2.5.0") implementation("androidx.work:work-runtime-ktx:2.5.0")
implementation("androidx.transition:transition:1.4.1") implementation("androidx.transition:transition:1.4.1")
implementation("androidx.core:core-ktx:1.3.2") implementation("androidx.core:core-ktx:1.6.0")
implementation("com.google.android.material:material:1.3.0") implementation("com.google.android.material:material:1.4.0")
} }

8
build.gradle.kts
View File

@ -16,8 +16,8 @@ buildscript {
extra["vNav"] = vNav extra["vNav"] = vNav
dependencies { dependencies {
classpath("com.android.tools.build:gradle:4.2.1") classpath("com.android.tools.build:gradle:7.0.0")
classpath(kotlin("gradle-plugin", version = "1.5.0")) classpath(kotlin("gradle-plugin", version = "1.5.21"))
classpath("androidx.navigation:navigation-safe-args-gradle-plugin:${vNav}") classpath("androidx.navigation:navigation-safe-args-gradle-plugin:${vNav}")
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
@ -54,8 +54,8 @@ subprojects {
} }
compileOptions { compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8 sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_11
} }
} }
} }

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

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip

2
stub/build.gradle.kts
View File

@ -24,7 +24,7 @@ android {
} }
} }
aaptOptions { androidResources {
additionalParameters("--package-id", "0x80") additionalParameters("--package-id", "0x80")
} }