diff --git a/config.gradle b/config.gradle index 51279c145604416a1daf02adf3367678a4900be1..f1e9c4009ed5bb9019a01c0fdae60f87de7fb33c 100644 --- a/config.gradle +++ b/config.gradle @@ -6,18 +6,18 @@ ext { minSdkVersion : 15, targetSdkVersion : 25, versionCode : 102, - versionName : "2.0.2", + versionName : "2.0.2" ] version = [ androidSupportSdkVersion: "25.3.1", - retrofitSdkVersion : "2.2.0", + retrofitSdkVersion : "2.3.0", dagger2SdkVersion : "2.10", - butterknifeSdkVersion : "8.5.1", + butterknifeSdkVersion : "8.6.0", rxlifecycleSdkVersion : "1.0", rxlifecycle2SdkVersion : "2.0.1", espressoSdkVersion : "2.2.2", - canarySdkVersion : "1.5" + canarySdkVersion : "1.5.1" ] dependencies = [ @@ -34,7 +34,7 @@ ext { "retrofit-converter-gson" : "com.squareup.retrofit2:converter-gson:${version["retrofitSdkVersion"]}", "retrofit-adapter-rxjava" : "com.squareup.retrofit2:adapter-rxjava:${version["retrofitSdkVersion"]}", "retrofit-adapter-rxjava2" : "com.squareup.retrofit2:adapter-rxjava2:${version["retrofitSdkVersion"]}", - "okhttp3" : "com.squareup.okhttp3:okhttp:3.7.0", + "okhttp3" : "com.squareup.okhttp3:okhttp:3.8.0", "okhttp-urlconnection" : "com.squareup.okhttp:okhttp-urlconnection:2.0.0", "glide" : "com.github.bumptech.glide:glide:3.8.0", "picasso" : "com.squareup.picasso:picasso:2.5.2", @@ -51,13 +51,13 @@ ext { //rx1 "rxandroid" : "io.reactivex:rxandroid:1.2.1", - "rxjava" : "io.reactivex:rxjava:1.2.9", + "rxjava" : "io.reactivex:rxjava:1.3.0", "rxlifecycle" : "com.trello:rxlifecycle:${version["rxlifecycleSdkVersion"]}", "rxlifecycle-components" : "com.trello:rxlifecycle-components:${version["rxlifecycleSdkVersion"]}", "rxcache" : "com.github.VictorAlbertos.RxCache:runtime:1.7.0-1.x", "rxcache-jolyglot-gson" : "com.github.VictorAlbertos.Jolyglot:gson:0.0.3", "rxbinding-recyclerview-v7": "com.jakewharton.rxbinding:rxbinding-recyclerview-v7:1.0.1", - "rxpermissions" : "com.tbruyelle.rxpermissions:rxpermissions:0.9.3@aar", + "rxpermissions" : "com.tbruyelle.rxpermissions:rxpermissions:0.9.4@aar", "rxerrorhandler" : "me.jessyan:rxerrorhandler:1.0.1", //rx2 diff --git a/gradle.properties b/gradle.properties index b90fb2cc42957eb7f7f9f872f6d6c1a8330db047..02870775bd963461adcd4d536e3cc9cecd4aca9e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,5 +12,6 @@ # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true -#Wed May 17 16:00:06 CST 2017 +#Thu May 25 20:59:18 CST 2017 +org.gradle.jvmargs=-Xmx1536m android.enableBuildCache=true