Update gradle files

This commit is contained in:
topjohnwu 2019-08-21 10:38:09 +08:00
parent 84f0ff2fad
commit 2e7ce2a769
3 changed files with 10 additions and 12 deletions

View File

@ -17,8 +17,8 @@ android {
applicationId 'com.topjohnwu.magisk' applicationId 'com.topjohnwu.magisk'
vectorDrawables.useSupportLibrary = true vectorDrawables.useSupportLibrary = true
multiDexEnabled true multiDexEnabled true
versionName configProps['appVersion'] versionName props['appVersion']
versionCode configProps['appVersionCode'] as Integer versionCode props['appVersionCode'] as Integer
} }
buildTypes { buildTypes {
@ -62,7 +62,7 @@ dependencies {
implementation 'com.jakewharton.timber:timber:4.7.1' implementation 'com.jakewharton.timber:timber:4.7.1'
implementation 'com.github.skoumalcz:teanity:0.3.3' implementation 'com.github.skoumalcz:teanity:0.3.3'
implementation 'com.ncapdevi:frag-nav:3.2.0' 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' def vMarkwon = '3.1.0'
implementation "ru.noties.markwon:core:${vMarkwon}" implementation "ru.noties.markwon:core:${vMarkwon}"
@ -84,7 +84,7 @@ dependencies {
implementation "com.squareup.retrofit2:converter-scalars:${vRetrofit}" implementation "com.squareup.retrofit2:converter-scalars:${vRetrofit}"
implementation "com.squareup.retrofit2:adapter-rxjava2:${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:okhttp:${vOkHttp}"
implementation "com.squareup.okhttp3:logging-interceptor:${vOkHttp}" implementation "com.squareup.okhttp3:logging-interceptor:${vOkHttp}"
@ -106,10 +106,10 @@ dependencies {
implementation 'androidx.constraintlayout:constraintlayout:1.1.3' implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'androidx.browser:browser:1.0.0' implementation 'androidx.browser:browser:1.0.0'
implementation 'androidx.preference:preference:1.0.0' implementation 'androidx.preference:preference:1.1.0-rc01'
implementation 'androidx.recyclerview:recyclerview:1.1.0-beta01' implementation 'androidx.recyclerview:recyclerview:1.1.0-beta03'
implementation 'androidx.cardview:cardview:1.0.0' 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.transition:transition:1.2.0-beta01'
implementation 'androidx.multidex:multidex:2.0.1' implementation 'androidx.multidex:multidex:2.0.1'
implementation 'com.google.android.material:material:1.1.0-alpha09' implementation 'com.google.android.material:material:1.1.0-alpha09'

View File

@ -15,7 +15,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.5.0-rc03' classpath 'com.android.tools.build:gradle:3.5.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.41" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.41"
@ -28,9 +28,7 @@ task clean(type: Delete) {
delete rootProject.buildDir delete rootProject.buildDir
} }
ext { ext.props = props
configProps = props
}
subprojects { subprojects {
repositories { repositories {

View File

@ -4,7 +4,7 @@ android {
defaultConfig { defaultConfig {
applicationId 'com.topjohnwu.magisk' applicationId 'com.topjohnwu.magisk'
versionCode 1 versionCode 1
versionName configProps['appVersion'] versionName props['appVersion']
} }
buildTypes { buildTypes {