merge code

2017-07-06 11:18:55 +08:00
parent 5aeb8ec4bb 5a223e4b08
commit ce886921a6
95 changed files with 3614 additions and 1535 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -42,7 +42,6 @@ dependencies {
  compile 'com.squareup.okhttp3:okhttp:3.2.0'
  compile 'com.arialyy.frame:MVVM2:2.2.0'
  compile project(':Aria')
-//  compile 'com.arialyy.aria:aria-core:3.2.0'
-//  annotationProcessor 'com.arialyy.aria:aria-compiler:3.2.0'
+  compile project(':AriaCompiler')

 }