From 2e7ce2a7690e9bb1c396148ce9112dc4a5bb4059 Mon Sep 17 00:00:00 2001 From: topjohnwu Date: Wed, 21 Aug 2019 10:38:09 +0800 Subject: [PATCH] Update gradle files --- app/build.gradle | 14 +++++++------- build.gradle | 6 ++---- stub/build.gradle | 2 +- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index efcff6e57..35426e94c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,8 +17,8 @@ android { applicationId 'com.topjohnwu.magisk' vectorDrawables.useSupportLibrary = true multiDexEnabled true - versionName configProps['appVersion'] - versionCode configProps['appVersionCode'] as Integer + versionName props['appVersion'] + versionCode props['appVersionCode'] as Integer } buildTypes { @@ -62,7 +62,7 @@ dependencies { implementation 'com.jakewharton.timber:timber:4.7.1' implementation 'com.github.skoumalcz:teanity:0.3.3' implementation 'com.ncapdevi:frag-nav:3.2.0' - implementation 'com.github.pwittchen:reactivenetwork-rx2:3.0.3' + implementation 'com.github.pwittchen:reactivenetwork-rx2:3.0.4' def vMarkwon = '3.1.0' implementation "ru.noties.markwon:core:${vMarkwon}" @@ -84,7 +84,7 @@ dependencies { implementation "com.squareup.retrofit2:converter-scalars:${vRetrofit}" implementation "com.squareup.retrofit2:adapter-rxjava2:${vRetrofit}" - def vOkHttp = '4.0.1' + def vOkHttp = '4.1.0' implementation "com.squareup.okhttp3:okhttp:${vOkHttp}" implementation "com.squareup.okhttp3:logging-interceptor:${vOkHttp}" @@ -106,10 +106,10 @@ dependencies { implementation 'androidx.constraintlayout:constraintlayout:1.1.3' implementation 'androidx.browser:browser:1.0.0' - implementation 'androidx.preference:preference:1.0.0' - implementation 'androidx.recyclerview:recyclerview:1.1.0-beta01' + implementation 'androidx.preference:preference:1.1.0-rc01' + implementation 'androidx.recyclerview:recyclerview:1.1.0-beta03' implementation 'androidx.cardview:cardview:1.0.0' - implementation 'androidx.work:work-runtime:2.1.0' + implementation 'androidx.work:work-runtime:2.2.0' implementation 'androidx.transition:transition:1.2.0-beta01' implementation 'androidx.multidex:multidex:2.0.1' implementation 'com.google.android.material:material:1.1.0-alpha09' diff --git a/build.gradle b/build.gradle index 531d7a4aa..393f619f1 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,7 @@ buildscript { maven { url 'https://kotlin.bintray.com/kotlinx' } } dependencies { - classpath 'com.android.tools.build:gradle:3.5.0-rc03' + classpath 'com.android.tools.build:gradle:3.5.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.41" @@ -28,9 +28,7 @@ task clean(type: Delete) { delete rootProject.buildDir } -ext { - configProps = props -} +ext.props = props subprojects { repositories { diff --git a/stub/build.gradle b/stub/build.gradle index 45b69d518..17540f5df 100644 --- a/stub/build.gradle +++ b/stub/build.gradle @@ -4,7 +4,7 @@ android { defaultConfig { applicationId 'com.topjohnwu.magisk' versionCode 1 - versionName configProps['appVersion'] + versionName props['appVersion'] } buildTypes {