From 4f4874496621dd58a2877cea95b70d4f3b7ab16b Mon Sep 17 00:00:00 2001 From: Wellington Costa Date: Sun, 8 Apr 2018 20:54:33 -0300 Subject: [PATCH 1/5] Updated deps --- build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index bcfff59..e0cc092 100644 --- 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 = [ From 88a2770683c355cafed2760df8aabe3b979ce594 Mon Sep 17 00:00:00 2001 From: Wellington Costa Date: Sun, 8 Apr 2018 20:55:43 -0300 Subject: [PATCH 2/5] Adjusted some constants. --- .../java/convalida/compiler/Constants.java | 28 +++++++++---------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/convalida-compiler/src/main/java/convalida/compiler/Constants.java b/convalida-compiler/src/main/java/convalida/compiler/Constants.java index 375a96e..b37ea2c 100644 --- 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"); } \ No newline at end of file From 94735b10dde04e5735dd0187c852cd0c0bce9185 Mon Sep 17 00:00:00 2001 From: Wellington Costa Date: Sun, 8 Apr 2018 21:13:35 -0300 Subject: [PATCH 3/5] Travis CI --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6f7de9e..c2421e6 100644 --- 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} From 20c5900b526e99d26b76d13ddf15c2cdaff7d3fe Mon Sep 17 00:00:00 2001 From: Wellington Costa Date: Sun, 8 Apr 2018 21:22:34 -0300 Subject: [PATCH 4/5] Fix JaCoCo build error --- build.gradle | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index e0cc092..d306b35 100644 --- a/build.gradle +++ b/build.gradle @@ -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' } } From c766186fe981b33cb4c8762075b0f013f42c7ae0 Mon Sep 17 00:00:00 2001 From: Wellington Costa Date: Sun, 8 Apr 2018 21:37:51 -0300 Subject: [PATCH 5/5] Prepare release 2.0.1 --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 5a11059..20e048f 100644 --- 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 \ No newline at end of file +[5]: https://github.com/WellingtonCosta/convalida/wiki