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

Update gradle files

This commit is contained in:
topjohnwu 2020-06-17 02:33:33 -07:00
parent 1e2f776b83
commit 56602cb9a3
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/build.gradle
View File

@ -109,13 +109,15 @@ dependencies {
implementation "com.squareup.retrofit2:adapter-rxjava2:${vRetrofit}" implementation "com.squareup.retrofit2:adapter-rxjava2:${vRetrofit}"
def vOkHttp = '3.12.12' def vOkHttp = '3.12.12'
implementation("com.squareup.okhttp3:okhttp:${vOkHttp}") { implementation("com.squareup.okhttp3:okhttp") {
force = true version {
strictly "$vOkHttp"
}
} }
implementation "com.squareup.okhttp3:logging-interceptor:${vOkHttp}" implementation "com.squareup.okhttp3:logging-interceptor:${vOkHttp}"
implementation("com.squareup.okhttp3:okhttp-dnsoverhttps:${vOkHttp}") implementation("com.squareup.okhttp3:okhttp-dnsoverhttps:${vOkHttp}")
def vMoshi = '1.10.0-SNAPSHOT' def vMoshi = '1.9.3'
implementation "com.squareup.moshi:moshi:${vMoshi}" implementation "com.squareup.moshi:moshi:${vMoshi}"
kapt "com.squareup.moshi:moshi-kotlin-codegen:${vMoshi}" kapt "com.squareup.moshi:moshi-kotlin-codegen:${vMoshi}"
@ -128,15 +130,15 @@ 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-beta6' implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta7'
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'
implementation 'androidx.recyclerview:recyclerview:1.1.0' implementation 'androidx.recyclerview:recyclerview:1.1.0'
implementation 'androidx.fragment:fragment-ktx:1.2.4' implementation 'androidx.fragment:fragment-ktx:1.2.5'
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.3.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-beta01'
} }

8
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-beta01' ext.vNav = '2.3.0-rc01'
repositories { repositories {
google() google()
@ -19,7 +19,7 @@ buildscript {
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.0.0' 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}"
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
@ -44,8 +44,8 @@ subprojects {
if (getPlugins().hasPlugin('com.android.library') || if (getPlugins().hasPlugin('com.android.library') ||
getPlugins().hasPlugin('com.android.application')) { getPlugins().hasPlugin('com.android.application')) {
android { android {
compileSdkVersion 29 compileSdkVersion 30
buildToolsVersion '29.0.3' buildToolsVersion '30.0.0'
defaultConfig { defaultConfig {
if (minSdkVersion == null) if (minSdkVersion == null)

2
build.py
View File

@ -57,7 +57,7 @@ default_targets = ['magisk', 'magiskinit', 'magiskboot', 'busybox']
ndk_ver = '21c' ndk_ver = '21c'
ndk_ver_full = '21.2.6472646' ndk_ver_full = '21.2.6472646'
build_tools_ver = '29.0.3' build_tools_ver = '30.0.0'
ndk_root = op.join(os.environ['ANDROID_HOME'], 'ndk') ndk_root = op.join(os.environ['ANDROID_HOME'], 'ndk')
ndk_path = op.join(ndk_root, 'magisk') ndk_path = op.join(ndk_root, 'magisk')