upgrade gradle, build tools to work on Android studio 3.2.1

This commit is contained in:
will
2019-01-04 11:11:18 +08:00
parent baeff44d62
commit 6c75cb1252
4 changed files with 37 additions and 36 deletions

View File

@@ -5,7 +5,7 @@ android:
components: components:
- tools - tools
- platform-tools - platform-tools
- build-tools-26.0.2 - build-tools-28.0.3
- android-26 - android-26
- extra-google-m2repository - extra-google-m2repository
- extra-android-m2repository - extra-android-m2repository

View File

@@ -32,7 +32,7 @@ android {
} }
} }
compileSdkVersion 26 compileSdkVersion 26
buildToolsVersion '26.0.2' buildToolsVersion '28.0.3'
defaultConfig { defaultConfig {
applicationId "com.leanote.android" applicationId "com.leanote.android"
minSdkVersion 19 minSdkVersion 19
@@ -63,48 +63,48 @@ android {
dependencies { dependencies {
compile fileTree(dir: 'libs', include: ['*.jar']) api fileTree(dir: 'libs', include: ['*.jar'])
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations' exclude group: 'com.android.support', module: 'support-annotations'
}) })
testCompile 'junit:junit:4.12' testImplementation 'junit:junit:4.12'
compile 'com.android.support:appcompat-v7:26.1.0' implementation 'com.android.support:appcompat-v7:26.1.0'
compile 'com.android.support:support-v4:26.1.0' implementation 'com.android.support:support-v4:26.1.0'
compile 'com.android.support:design:26.1.0' implementation 'com.android.support:design:26.1.0'
compile 'com.android.support:recyclerview-v7:26.1.0' implementation 'com.android.support:recyclerview-v7:26.1.0'
compile 'com.android.support:cardview-v7:26.1.0' implementation 'com.android.support:cardview-v7:26.1.0'
compile 'com.jakewharton:butterknife:8.4.0' implementation 'com.jakewharton:butterknife:8.4.0'
annotationProcessor 'com.jakewharton:butterknife-compiler:8.4.0' annotationProcessor 'com.jakewharton:butterknife-compiler:8.4.0'
compile group: 'com.squareup.okhttp3', name: 'logging-interceptor', version: '3.4.1' implementation group: 'com.squareup.okhttp3', name: 'logging-interceptor', version: '3.4.1'
compile group: 'com.squareup.retrofit2', name: 'adapter-rxjava', version: '2.1.0' implementation group: 'com.squareup.retrofit2', name: 'adapter-rxjava', version: '2.1.0'
annotationProcessor "com.github.Raizlabs.DBFlow:dbflow-processor:${dbflow_version}" annotationProcessor "com.github.Raizlabs.DBFlow:dbflow-processor:${dbflow_version}"
compile "com.github.Raizlabs.DBFlow:dbflow-core:${dbflow_version}" implementation "com.github.Raizlabs.DBFlow:dbflow-core:${dbflow_version}"
compile "com.github.Raizlabs.DBFlow:dbflow:${dbflow_version}" implementation "com.github.Raizlabs.DBFlow:dbflow:${dbflow_version}"
compile 'org.greenrobot:eventbus:3.0.0' implementation 'org.greenrobot:eventbus:3.0.0'
compile 'io.reactivex:rxandroid:1.2.1' implementation 'io.reactivex:rxandroid:1.2.1'
compile 'io.reactivex:rxjava:1.1.9' implementation 'io.reactivex:rxjava:1.1.9'
compile group: 'com.google.code.gson', name: 'gson', version: '2.7' implementation group: 'com.google.code.gson', name: 'gson', version: '2.7'
compile 'org.mongodb:mongo-java-driver:2.12.4' implementation 'org.mongodb:mongo-java-driver:2.12.4'
compile 'com.github.bumptech.glide:glide:3.7.0' implementation 'com.github.bumptech.glide:glide:3.7.0'
compile 'jp.wasabeef:glide-transformations:2.0.1' implementation 'jp.wasabeef:glide-transformations:2.0.1'
compile 'com.android.support:support-v13:26.1.0' implementation 'com.android.support:support-v13:26.1.0'
compile 'com.github.xingstarx:ImageSelector:master-SNAPSHOT' implementation 'com.github.xingstarx:ImageSelector:master-SNAPSHOT'
compile 'com.facebook.stetho:stetho:1.4.2' implementation 'com.facebook.stetho:stetho:1.4.2'
compile 'com.facebook.stetho:stetho-okhttp3:1.4.2' implementation 'com.facebook.stetho:stetho-okhttp3:1.4.2'
compile 'com.github.houxg:FlexLayout:1.2' implementation 'com.github.houxg:FlexLayout:1.2'
compile 'net.danlew:android.joda:2.9.5' implementation 'net.danlew:android.joda:2.9.5'
compile 'com.tencent.bugly:crashreport_upgrade:latest.release' implementation 'com.tencent.bugly:crashreport_upgrade:latest.release'
compile 'com.elvishew:xlog:1.3.0' implementation 'com.elvishew:xlog:1.3.0'
compile 'com.github.piasy:BigImageViewer:1.2.5' implementation 'com.github.piasy:BigImageViewer:1.2.5'
compile 'com.github.piasy:GlideImageLoader:1.2.5' implementation 'com.github.piasy:GlideImageLoader:1.2.5'
compile 'com.weiwangcn.betterspinner:library-material:1.1.0' implementation 'com.weiwangcn.betterspinner:library-material:1.1.0'
implementation 'com.android.support.constraint:constraint-layout:1.0.2' implementation 'com.android.support.constraint:constraint-layout:1.0.2'
} }

View File

@@ -6,7 +6,7 @@ buildscript {
google() google()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.0.1' classpath 'com.android.tools.build:gradle:3.2.1'
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files
@@ -23,3 +23,4 @@ allprojects {
task clean(type: Delete) { task clean(type: Delete) {
delete rootProject.buildDir delete rootProject.buildDir
} }

View File

@@ -1,6 +1,6 @@
#Wed Oct 25 13:31:06 CST 2017 #Wed Jan 02 18:30:46 CST 2019
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-4.1-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip