Merge pull request #7 from aizuzi/dev

Dev
aizuzi · Jul 29, 2018 · b8ffbd1 · b8ffbd1
2 parents 9f40be1 + a298c58
commit b8ffbd1
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 *.iml
 .gradle
+.idea
 /local.properties
 /.idea/libraries
 /.idea/modules.xml

diff --git a/app/build.gradle b/app/build.gradle
@@ -27,7 +27,8 @@ dependencies {
     implementation 'com.github.bumptech.glide:glide:4.7.1'
     implementation project(':fastadapter')
     annotationProcessor 'com.github.bumptech.glide:compiler:4.7.1'
-    annotationProcessor project(":fastadapter_processor")
+//    annotationProcessor project(":fastadapter_processor")
+    annotationProcessor 'com.github.aizuzi.FastAdapter:fastadapter_processor:0.1.7+'
     annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.1'

diff --git a/build.gradle b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.0'
+        classpath 'com.android.tools.build:gradle:3.1.3'
 
 
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'

diff --git a/fastadapter/build.gradle b/fastadapter/build.gradle
@@ -28,7 +28,7 @@ android {
 dependencies {
   implementation fileTree(dir: 'libs', include: ['*.jar'])
   implementation 'com.android.support:recyclerview-v7:27.1.1'
-  api 'com.github.aizuzi.FastAdapter:fastadapter_processor:0.1.7+'
+//  api 'com.github.aizuzi.FastAdapter:fastadapter_processor:0.1.7+'
 //  api project(':fastadapter_processor')
 
   testImplementation 'junit:junit:4.12'

diff --git a/...java/com/zuzi/adapter/FastBaseHolder.java → ...java/com/zuzi/adapter/FastBaseHolder.java b/...java/com/zuzi/adapter/FastBaseHolder.java → ...java/com/zuzi/adapter/FastBaseHolder.java
diff --git a/...uzi/adapter/annotation/FastAttribute.java → ...uzi/adapter/annotation/FastAttribute.java b/...uzi/adapter/annotation/FastAttribute.java → ...uzi/adapter/annotation/FastAttribute.java
diff --git a/...pter/annotation/RecyclerItemLayoutId.java → ...pter/annotation/RecyclerItemLayoutId.java b/...pter/annotation/RecyclerItemLayoutId.java → ...pter/annotation/RecyclerItemLayoutId.java
diff --git a/fastadapter_processor/build.gradle b/fastadapter_processor/build.gradle
@@ -9,6 +9,7 @@ dependencies {
     implementation 'com.squareup:javapoet:1.8.0'
     implementation 'com.google.auto.service:auto-service:1.0-rc3'
     implementation 'com.google.android:android:4.1.1.4'
+    api project(':fastadapter_processor')
 
 }