MarcoBuster/Magisk
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update Android Studio

Browse Source
This commit is contained in:
topjohnwu 2020-05-30 12:50:08 -07:00
parent c071ac8973
commit fde78be2b4
6 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/build.gradle
View File

@ -82,7 +82,7 @@ dependencies {
implementation "${bindingAdapter}:${vBAdapt}" implementation "${bindingAdapter}:${vBAdapt}"
implementation "${bindingAdapter}-recyclerview:${vBAdapt}" implementation "${bindingAdapter}-recyclerview:${vBAdapt}"
def vMarkwon = '4.3.1' def vMarkwon = '4.4.0'
implementation "io.noties.markwon:core:${vMarkwon}" implementation "io.noties.markwon:core:${vMarkwon}"
implementation "io.noties.markwon:html:${vMarkwon}" implementation "io.noties.markwon:html:${vMarkwon}"
implementation "io.noties.markwon:image:${vMarkwon}" implementation "io.noties.markwon:image:${vMarkwon}"
@ -97,7 +97,7 @@ dependencies {
implementation "org.koin:koin-android:${vKoin}" implementation "org.koin:koin-android:${vKoin}"
implementation "org.koin:koin-androidx-viewmodel:${vKoin}" implementation "org.koin:koin-androidx-viewmodel:${vKoin}"
def vRetrofit = '2.8.1' def vRetrofit = '2.9.0'
implementation "com.squareup.retrofit2:retrofit:${vRetrofit}" implementation "com.squareup.retrofit2:retrofit:${vRetrofit}"
implementation "com.squareup.retrofit2:converter-moshi:${vRetrofit}" implementation "com.squareup.retrofit2:converter-moshi:${vRetrofit}"
implementation "com.squareup.retrofit2:converter-scalars:${vRetrofit}" implementation "com.squareup.retrofit2:converter-scalars:${vRetrofit}"
@ -122,7 +122,7 @@ dependencies {
implementation "androidx.navigation:navigation-ui-ktx:${vNav}" implementation "androidx.navigation:navigation-ui-ktx:${vNav}"
implementation 'androidx.biometric:biometric:1.0.1' implementation 'androidx.biometric:biometric:1.0.1'
implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta4' implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta6'
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-rc01' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-rc01'
implementation 'androidx.browser:browser:1.2.0' implementation 'androidx.browser:browser:1.2.0'
implementation 'androidx.preference:preference:1.1.1' implementation 'androidx.preference:preference:1.1.1'
@ -131,6 +131,6 @@ dependencies {
implementation 'androidx.work:work-runtime:2.3.4' implementation 'androidx.work:work-runtime:2.3.4'
implementation 'androidx.transition:transition:1.3.1' implementation 'androidx.transition:transition:1.3.1'
implementation 'androidx.multidex:multidex:2.0.1' implementation 'androidx.multidex:multidex:2.0.1'
implementation 'androidx.core:core-ktx:1.2.0' implementation 'androidx.core:core-ktx:1.3.0'
implementation 'com.google.android.material:material:1.2.0-alpha05' implementation 'com.google.android.material:material:1.2.0-alpha05'
} }

4
build.gradle
View File

@ -8,7 +8,7 @@ if (configPath.exists())
buildscript { buildscript {
ext.vKotlin = '1.3.72' ext.vKotlin = '1.3.72'
ext.vNav = '2.3.0-alpha05' ext.vNav = '2.3.0-beta01'
repositories { repositories {
google() google()
@ -17,7 +17,7 @@ buildscript {
maven { url 'https://kotlin.bintray.com/kotlinx' } maven { url 'https://kotlin.bintray.com/kotlinx' }
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.6.3' classpath 'com.android.tools.build:gradle:4.0.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${vKotlin}" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${vKotlin}"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$vNav" classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$vNav"

6
build.py
View File

@ -55,8 +55,8 @@ arch64 = ['arm64-v8a', 'x86_64']
support_targets = ['magisk', 'magiskinit', 'magiskboot', 'magiskpolicy', 'resetprop', 'busybox', 'test'] support_targets = ['magisk', 'magiskinit', 'magiskboot', 'magiskpolicy', 'resetprop', 'busybox', 'test']
default_targets = ['magisk', 'magiskinit', 'magiskboot', 'busybox'] default_targets = ['magisk', 'magiskinit', 'magiskboot', 'busybox']
ndk_ver = '21b' ndk_ver = '21c'
ndk_ver_full = '21.1.6352462' ndk_ver_full = '21.2.6472646'
build_tools_ver = '29.0.3' build_tools_ver = '29.0.3'
ndk_root = op.join(os.environ['ANDROID_HOME'], 'ndk') ndk_root = op.join(os.environ['ANDROID_HOME'], 'ndk')
@ -574,7 +574,7 @@ def setup_ndk(args):
src_prop = op.join(ndk_path, 'source.properties') src_prop = op.join(ndk_path, 'source.properties')
props = parse_props(src_prop) props = parse_props(src_prop)
props['Pkg.Revision.orig'] = props['Pkg.Revision'] props['Pkg.Revision.orig'] = props['Pkg.Revision']
props['Pkg.Revision'] = '0.0.0' props['Pkg.Revision'] = '99.99.99'
with open(src_prop, 'w') as p: with open(src_prop, 'w') as p:
for key, val in props.items(): for key, val in props.items():
print(f'{key} = {val}', file=p) print(f'{key} = {val}', file=p)

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

@ -1,6 +1,6 @@
#Sun Jan 12 04:46:30 CST 2020 #Fri May 29 10:45:31 PDT 2020
distributionBase=GRADLE_USER_HOME 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-5.6.4-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

2
native/build.gradle
View File

@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
android { android {
ndkVersion '0.0.0' ndkVersion '99.99.99'
externalNativeBuild { externalNativeBuild {
ndkBuild { ndkBuild {

5
signing/build.gradle
View File

@ -34,7 +34,6 @@ repositories {
dependencies { dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs') implementation fileTree(include: ['*.jar'], dir: 'libs')
def bcVer = '1.64' api "org.bouncycastle:bcprov-jdk15on:1.65.01"
api "org.bouncycastle:bcprov-jdk15on:${bcVer}" api "org.bouncycastle:bcpkix-jdk15on:1.65"
api "org.bouncycastle:bcpkix-jdk15on:${bcVer}"
} }