Update Android Studio

This commit is contained in:
topjohnwu 2022-05-09 20:53:47 -07:00
parent 4eb9240806
commit 24603b3cef
10 changed files with 16 additions and 12 deletions

View File

@ -19,6 +19,8 @@ kapt {
} }
android { android {
namespace = "com.topjohnwu.magisk"
defaultConfig { defaultConfig {
applicationId = "com.topjohnwu.magisk" applicationId = "com.topjohnwu.magisk"
vectorDrawables.useSupportLibrary = true vectorDrawables.useSupportLibrary = true
@ -123,5 +125,5 @@ dependencies {
implementation("androidx.transition:transition:1.4.1") implementation("androidx.transition:transition:1.4.1")
implementation("androidx.core:core-ktx:1.7.0") implementation("androidx.core:core-ktx:1.7.0")
implementation("androidx.core:core-splashscreen:1.0.0-beta02") implementation("androidx.core:core-splashscreen:1.0.0-beta02")
implementation("com.google.android.material:material:1.5.0") implementation("com.google.android.material:material:1.6.0")
} }

View File

@ -5,6 +5,7 @@ plugins {
setupCommon() setupCommon()
android { android {
namespace = "com.topjohnwu.shared"
defaultConfig { defaultConfig {
consumerProguardFiles("proguard-rules.pro") consumerProguardFiles("proguard-rules.pro")
} }

View File

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools">
package="com.topjohnwu.magisk">
<uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" /> <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />

View File

@ -25,7 +25,7 @@ tasks.withType<KotlinCompile> {
dependencies { dependencies {
implementation(kotlin("gradle-plugin", "1.6.21")) implementation(kotlin("gradle-plugin", "1.6.21"))
implementation("com.android.tools.build:gradle:7.1.3") implementation("com.android.tools.build:gradle:7.2.0")
implementation("androidx.navigation:navigation-safe-args-gradle-plugin:2.5.0-beta01") implementation("androidx.navigation:navigation-safe-args-gradle-plugin:2.5.0-beta01")
implementation("io.michaelrocks:paranoid-gradle-plugin:0.3.7") implementation("io.michaelrocks:paranoid-gradle-plugin:0.3.7")
implementation("org.eclipse.jgit:org.eclipse.jgit:6.1.0.202203080745-r") implementation("org.eclipse.jgit:org.eclipse.jgit:6.1.0.202203080745-r")

View File

@ -27,13 +27,13 @@ private val Project.android: BaseAppModuleExtension
fun Project.setupCommon() { fun Project.setupCommon() {
androidBase { androidBase {
compileSdkVersion(31) compileSdkVersion(32)
buildToolsVersion = "31.0.0" buildToolsVersion = "32.0.0"
ndkPath = "$sdkDirectory/ndk/magisk" ndkPath = "$sdkDirectory/ndk/magisk"
defaultConfig { defaultConfig {
minSdk = 21 minSdk = 21
targetSdk = 31 targetSdk = 32
} }
compileOptions { compileOptions {

View File

@ -5,6 +5,8 @@ plugins {
setupCommon() setupCommon()
android { android {
namespace = "com.topjohnwu.magisk.native"
externalNativeBuild { externalNativeBuild {
ndkBuild { ndkBuild {
path("jni/Android.mk") path("jni/Android.mk")

View File

@ -1 +1 @@
<manifest package="com.topjohnwu.magisk.binary" /> <manifest/>

View File

@ -9,6 +9,8 @@ paranoid {
} }
android { android {
namespace = "com.topjohnwu.magisk"
val canary = !Config.version.contains(".") val canary = !Config.version.contains(".")
val url = if (canary) null val url = if (canary) null

View File

@ -1,2 +1 @@
<?xml version="1.0" encoding="utf-8"?> <manifest/>
<manifest package="com.topjohnwu.magisk" />

View File

@ -1,8 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools">
package="com.topjohnwu.magisk">
<uses-permission android:name="android.permission.USE_BIOMETRIC" /> <uses-permission android:name="android.permission.USE_BIOMETRIC" />
<uses-permission android:name="android.permission.USE_FINGERPRINT" /> <uses-permission android:name="android.permission.USE_FINGERPRINT" />