merge v_3.0

app/build.gradle

@@ -25,6 +25,11 @@ android {
   packagingOptions {
     exclude 'META-INF/services/javax.annotation.processing.Processor'
   }
+
+  lintOptions {
+    abortOnError false
+  }
+
 }
 
 dependencies {
@@ -36,7 +41,8 @@ dependencies {
   compile 'com.google.code.gson:gson:2.7'
   compile 'com.squareup.okhttp3:okhttp:3.2.0'
   compile 'com.arialyy.frame:MVVM2:2.2.0'
-  compile 'com.arialyy.absadapter:AbsAdapter:1.1.2'
   compile project(':Aria')
-//  compile 'com.arialyy.aria:Aria:3.0.0'
+//  compile 'com.arialyy.aria:aria-core:3.1.7'
+//  annotationProcessor 'com.arialyy.aria:aria-compiler:3.1.7'
+
 }