Merge pull request #22 from WellingtonCosta/fix/compiler

Fix/compiler
wellingtoncosta · Apr 9, 2018 · 3a95796 · 3a95796
2 parents 6e73d0d + c766186
commit 3a95796
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 24 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,7 +10,7 @@ android:
   components:
     - tools
     - platform-tools
-    - build-tools-27.0.2
+    - build-tools-27.0.3
     - android-27
     - sys-img-${ANDROID_ABI}-${ANDROID_TARGET}
 

diff --git a/README.md b/README.md
@@ -34,8 +34,8 @@ allprojects {
 
 ```groovy
 dependencies {
-  implementation 'com.github.WellingtonCosta.convalida:convalida:2.0.0'
-  annotationProcessor 'com.github.WellingtonCosta.convalida:convalida-compiler:2.0.0'
+  implementation 'com.github.WellingtonCosta.convalida:convalida:2.0.1'
+  annotationProcessor 'com.github.WellingtonCosta.convalida:convalida-compiler:2.0.1'
 }
 ```
 
@@ -63,4 +63,4 @@ dependencies {
 
 [4]: https://material.io/guidelines/patterns/errors.html
 
-[5]: https://github.com/WellingtonCosta/convalida/wiki
+[5]: https://github.com/WellingtonCosta/convalida/wiki
diff --git a/build.gradle b/build.gradle
@@ -1,14 +1,14 @@
 apply plugin: 'com.github.ben-manes.versions'
 
-version = '1.3.7'
+version = '2.0.1'
 
 buildscript {
     ext.versions = [
         'minSdk': 14,
         'compileSdk': 27,
-        'buildTools': '27.0.2',
-        'supportLibrary': '27.1.0',
-        'androidPlugin': '3.0.1'
+        'buildTools': '27.0.3',
+        'supportLibrary': '27.1.1',
+        'androidPlugin': '3.1.0'
     ]
 
     ext.deps = [
@@ -35,7 +35,9 @@ buildscript {
 
     dependencies {
         classpath deps.android.gradlePlugin
-        classpath 'com.dicedmelon.gradle:jacoco-android:0.1.2'
+        classpath('com.dicedmelon.gradle:jacoco-android:0.1.2') {
+            exclude group: 'org.codehaus.groovy', module: 'groovy-all'
+        }
         classpath 'com.github.ben-manes:gradle-versions-plugin:0.17.0'
     }
 }

diff --git a/convalida-compiler/src/main/java/convalida/compiler/Constants.java b/convalida-compiler/src/main/java/convalida/compiler/Constants.java
@@ -33,20 +33,18 @@ class Constants {
     static final String ONLY_NUMBER_ANNOTATION                      = "convalida.annotations.OnlyNumberValidation";
     static final String PASSWORD_ANNOTATION                         = "convalida.annotations.PasswordValidation";
     static final String CONFIRM_PASSWORD_ANNOTATION                 = "convalida.annotations.ConfirmPasswordValidation";
-    static final String VALIDATE_ON_CLICK_ANNOTATION                = "convalida.annotations.ConfirmPasswordValidation";
-    static final String CLEAR_VALIDATIONS_ON_CLICK_ANNOTATION       = "convalida.annotations.ConfirmPasswordValidation";
-    static final String ON_VALIDATION_SUCCESS_ANNOTATION            = "convalida.annotations.ConfirmPasswordValidation";
-    static final String ON_VALIDATION_ERROR_ANNOTATION              = "convalida.annotations.ConfirmPasswordValidation";
-
-    private static final String VALIDATORS_PACKAGE      = "convalida.validators";
-
-    static final ClassName REQUIRED_VALIDATOR           = ClassName.get(VALIDATORS_PACKAGE, "RequiredValidator");
-    static final ClassName EMAIL_VALIDATOR              = ClassName.get(VALIDATORS_PACKAGE, "EmailValidator");
-    static final ClassName CONFIRM_EMAIL_VALIDATOR      = ClassName.get(VALIDATORS_PACKAGE, "ConfirmEmailValidator");
-    static final ClassName PATTERN_VALIDATOR            = ClassName.get(VALIDATORS_PACKAGE, "PatternValidator");
-    static final ClassName LENGTH_VALIDATOR             = ClassName.get(VALIDATORS_PACKAGE, "LengthValidator");
-    static final ClassName ONLY_NUMBER_VALIDATOR        = ClassName.get(VALIDATORS_PACKAGE, "OnlyNumberValidator");
-    static final ClassName PASSWORD_VALIDATOR           = ClassName.get(VALIDATORS_PACKAGE, "PasswordValidator");
-    static final ClassName CONFIRM_PASSWORD_VALIDATOR   = ClassName.get(VALIDATORS_PACKAGE, "ConfirmPasswordValidator");
+    static final String VALIDATE_ON_CLICK_ANNOTATION                = "convalida.annotations.ValidateOnClick";
+    static final String CLEAR_VALIDATIONS_ON_CLICK_ANNOTATION       = "convalida.annotations.ClearValidationsOnClick";
+    static final String ON_VALIDATION_SUCCESS_ANNOTATION            = "convalida.annotations.OnValidationSuccess";
+    static final String ON_VALIDATION_ERROR_ANNOTATION              = "convalida.annotations.OnValidationError";
+
+    static final ClassName REQUIRED_VALIDATOR           = ClassName.get("convalida.validators", "RequiredValidator");
+    static final ClassName EMAIL_VALIDATOR              = ClassName.get("convalida.validators", "EmailValidator");
+    static final ClassName CONFIRM_EMAIL_VALIDATOR      = ClassName.get("convalida.validators", "ConfirmEmailValidator");
+    static final ClassName PATTERN_VALIDATOR            = ClassName.get("convalida.validators", "PatternValidator");
+    static final ClassName LENGTH_VALIDATOR             = ClassName.get("convalida.validators", "LengthValidator");
+    static final ClassName ONLY_NUMBER_VALIDATOR        = ClassName.get("convalida.validators", "OnlyNumberValidator");
+    static final ClassName PASSWORD_VALIDATOR           = ClassName.get("convalida.validators", "PasswordValidator");
+    static final ClassName CONFIRM_PASSWORD_VALIDATOR   = ClassName.get("convalida.validators", "ConfirmPasswordValidator");
 
 }