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

Bump target SDK to 30

Browse Source
This commit is contained in:
topjohnwu 2021-01-22 05:03:33 -08:00
parent c87fdbea0f
commit ab9a83c82f
5 changed files with 34 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/shared/src/main/AndroidManifest.xml
View File

@ -2,16 +2,26 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
package="com.topjohnwu.shared"> package="com.topjohnwu.shared">
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" /> <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
<uses-permission
android:name="android.permission.WRITE_EXTERNAL_STORAGE"
android:maxSdkVersion="29"
tools:ignore="ScopedStorage" />
<uses-permission
android:name="android.permission.QUERY_ALL_PACKAGES"
tools:ignore="QueryAllPackagesPermission" />
<application <application
android:label="Magisk Manager" android:allowBackup="false"
android:installLocation="internalOnly" android:installLocation="internalOnly"
android:usesCleartextTraffic="true" android:label="Magisk Manager"
android:requestLegacyExternalStorage="true"
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@android:style/Theme.Translucent.NoTitleBar" android:theme="@android:style/Theme.Translucent.NoTitleBar"
tools:ignore="UnusedAttribute"> android:usesCleartextTraffic="true"
</application> tools:ignore="UnusedAttribute" />
</manifest> </manifest>

26
app/src/main/AndroidManifest.xml
View File

@ -3,18 +3,11 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
package="com.topjohnwu.magisk"> package="com.topjohnwu.magisk">
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission
android:name="android.permission.WRITE_EXTERNAL_STORAGE"
android:maxSdkVersion="29" />
<application <application
android:icon="@drawable/ic_launcher"
android:name="a.e" android:name="a.e"
android:allowBackup="false"
android:multiArch="true"
android:extractNativeLibs="true" android:extractNativeLibs="true"
android:icon="@drawable/ic_launcher"
android:multiArch="true"
tools:ignore="UnusedAttribute,GoogleAppIndexingWarning"> tools:ignore="UnusedAttribute,GoogleAppIndexingWarning">
<!-- Splash --> <!-- Splash -->
@ -42,15 +35,16 @@
android:exported="false" android:exported="false"
tools:ignore="AppLinkUrlError"> tools:ignore="AppLinkUrlError">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.VIEW"/> <action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT"/> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>
</activity> </activity>
<!-- Receiver --> <!-- Receiver -->
<receiver <receiver
android:name="a.h" android:name="a.h"
android:directBootAware="true"> android:directBootAware="true"
android:exported="false">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.REBOOT" /> <action android:name="android.intent.action.REBOOT" />
<action android:name="android.intent.action.LOCALE_CHANGED" /> <action android:name="android.intent.action.LOCALE_CHANGED" />
@ -72,8 +66,7 @@
android:authorities="${applicationId}.provider" android:authorities="${applicationId}.provider"
android:directBootAware="true" android:directBootAware="true"
android:exported="false" android:exported="false"
android:grantUriPermissions="true"> android:grantUriPermissions="true" />
</provider>
<!-- Hardcode GMS version --> <!-- Hardcode GMS version -->
<meta-data <meta-data
@ -84,12 +77,13 @@
<provider <provider
android:name="androidx.work.impl.WorkManagerInitializer" android:name="androidx.work.impl.WorkManagerInitializer"
android:authorities="${applicationId}.workmanager-init" android:authorities="${applicationId}.workmanager-init"
tools:node="remove" /> tools:node="remove"
tools:ignore="ExportedContentProvider" />
<!-- We don't invalidate Room --> <!-- We don't invalidate Room -->
<service <service
android:name="androidx.room.MultiInstanceInvalidationService" android:name="androidx.room.MultiInstanceInvalidationService"
tools:node="remove"/> tools:node="remove" />
<!-- We don't use Device Credentials --> <!-- We don't use Device Credentials -->
<activity <activity

2
build.gradle.kts
View File

@ -69,7 +69,7 @@ subprojects {
defaultConfig { defaultConfig {
if (minSdkVersion == null) if (minSdkVersion == null)
minSdkVersion(17) minSdkVersion(17)
targetSdkVersion(28) targetSdkVersion(30)
} }
compileOptions { compileOptions {

2
stub/build.gradle.kts
View File

@ -9,7 +9,7 @@ android {
applicationId = "com.topjohnwu.magisk" applicationId = "com.topjohnwu.magisk"
versionCode = 1 versionCode = 1
versionName = Config.version versionName = Config.version
buildConfigField("int", "STUB_VERSION", "15") buildConfigField("int", "STUB_VERSION", "16")
buildConfigField("String", "DEV_CHANNEL", Config["DEV_CHANNEL"] ?: "null") buildConfigField("String", "DEV_CHANNEL", Config["DEV_CHANNEL"] ?: "null")
buildConfigField("boolean", "CANARY", if (canary) "true" else "false") buildConfigField("boolean", "CANARY", if (canary) "true" else "false")
} }

24
stub/src/main/AndroidManifest.xml
View File

@ -4,24 +4,16 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
package="com.topjohnwu.magisk"> package="com.topjohnwu.magisk">
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<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" />
<uses-permission
android:name="android.permission.WRITE_EXTERNAL_STORAGE"
android:maxSdkVersion="29" />
<application <application
android:appComponentFactory=".DelegateComponentFactory"
android:name="a.e" android:name="a.e"
android:allowBackup="false" android:appComponentFactory=".DelegateComponentFactory"
tools:ignore="UnusedAttribute,GoogleAppIndexingWarning" > tools:ignore="GoogleAppIndexingWarning,MissingApplicationIcon,UnusedAttribute">
<!-- Splash --> <!-- Splash -->
<activity <activity android:name="a.c">
android:name="a.c">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />
@ -43,15 +35,16 @@
android:exported="false" android:exported="false"
tools:ignore="AppLinkUrlError"> tools:ignore="AppLinkUrlError">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.VIEW"/> <action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT"/> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>
</activity> </activity>
<!-- Receiver --> <!-- Receiver -->
<receiver <receiver
android:name="a.h" android:name="a.h"
android:directBootAware="true"> android:directBootAware="true"
android:exported="false">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.REBOOT" /> <action android:name="android.intent.action.REBOOT" />
<action android:name="android.intent.action.LOCALE_CHANGED" /> <action android:name="android.intent.action.LOCALE_CHANGED" />
@ -73,8 +66,7 @@
android:authorities="${applicationId}.provider" android:authorities="${applicationId}.provider"
android:directBootAware="true" android:directBootAware="true"
android:exported="false" android:exported="false"
android:grantUriPermissions="true"> android:grantUriPermissions="true" />
</provider>
<!-- Hardcode GMS version --> <!-- Hardcode GMS version -->
<meta-data <meta-data