From cd964d600e3b46a05fcf7a2e83679d2de0d75f68 Mon Sep 17 00:00:00 2001
From: AriaLyy <511455842@qq.com>
Date: Sat, 17 Jun 2017 14:31:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Das=E7=83=AD=E5=90=AF=E5=8A=A8?=
 =?UTF-8?q?=E5=B4=A9=E6=BA=83=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Aria/build.gradle                                      | 2 +-
 Aria/src/main/java/com/arialyy/aria/orm/DbEntity.java  | 3 +--
 Aria/src/main/java/com/arialyy/aria/orm/SqlHelper.java | 2 +-
 app/build.gradle                                       | 2 +-
 build.gradle                                           | 1 +
 gradle/wrapper/gradle-wrapper.properties               | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Aria/build.gradle b/Aria/build.gradle
index 7b8287a2..9f7b3b26 100644
--- a/Aria/build.gradle
+++ b/Aria/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 
 android {
   compileSdkVersion 23
-  buildToolsVersion '25.0.2'
+  buildToolsVersion '25.0.3'
 
   defaultConfig {
     minSdkVersion 9
diff --git a/Aria/src/main/java/com/arialyy/aria/orm/DbEntity.java b/Aria/src/main/java/com/arialyy/aria/orm/DbEntity.java
index 4378c2d8..fc42e75c 100644
--- a/Aria/src/main/java/com/arialyy/aria/orm/DbEntity.java
+++ b/Aria/src/main/java/com/arialyy/aria/orm/DbEntity.java
@@ -161,8 +161,7 @@ public class DbEntity {
       List<String> values = new ArrayList<>();
       for (Field field : fields) {
         field.setAccessible(true);
-        Ignore ignore = field.getAnnotation(Ignore.class);
-        if (ignore != null && ignore.value()) {
+        if (SqlHelper.ignoreField(field)) {
           continue;
         }
         where.add(field.getName());
diff --git a/Aria/src/main/java/com/arialyy/aria/orm/SqlHelper.java b/Aria/src/main/java/com/arialyy/aria/orm/SqlHelper.java
index 784900b1..0d643822 100644
--- a/Aria/src/main/java/com/arialyy/aria/orm/SqlHelper.java
+++ b/Aria/src/main/java/com/arialyy/aria/orm/SqlHelper.java
@@ -511,7 +511,7 @@ final class SqlHelper extends SQLiteOpenHelper {
    * @return true 忽略该字段
    */
   static boolean ignoreField(Field field) {
-    // field.isSynthetic(), 使用as热启动App时，AS会自动给你的clss添加change字段
+    // field.isSynthetic(), 使用as热启动App时，AS会自动给你的class添加change字段
     Ignore ignore = field.getAnnotation(Ignore.class);
     int modifiers = field.getModifiers();
     return (ignore != null && ignore.value())
diff --git a/app/build.gradle b/app/build.gradle
index 247814e2..e4a53267 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
   compileSdkVersion 23
-  buildToolsVersion '25.0.2'
+  buildToolsVersion '25.0.3'
 
   defaultConfig {
     applicationId "com.arialyy.simple"
diff --git a/build.gradle b/build.gradle
index d4da586b..36979409 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,6 +5,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
+//    classpath 'com.android.tools.build:gradle:2.3.0'
     classpath 'com.android.tools.build:gradle:2.2.2'
 //    classpath 'com.novoda:bintray-release:0.5.0'
     //        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7'
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 3aaadf68..e159d533 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-#distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip
+#distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip