Updated project structure, dependencies and prepared for next release

PSDev · Apr 23, 2016 · 646b974 · 646b974
1 parent b122e2e
commit 646b974
Show file tree

Hide file tree

Showing 11 changed files with 127 additions and 72 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,7 @@
 ############
 .idea
 *.iml
+gen-external-apklibs/
 
 # Eclipse #
 ###########

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,11 @@
 Change Log
 ==========
 
-Version 1.1.2 *(IN DEVELOPMENT)*
+Version 1.1.2 *(2016-04-23)*
 --------------------------------
 
+* **minSdkVersion is now 8**
+* Added spanish translation (#4)
 * Updated dependencies
 
 Version 1.1.1 *(2014-06-01)*

diff --git a/README.md b/README.md
@@ -55,13 +55,13 @@ Download [the latest Release][1] or grab via Maven:
 <dependency>
   <groupId>de.psdev.formvalidations</groupId>
   <artifactId>formvalidations</artifactId>
-  <version>1.1.1</version>
+  <version>1.1.2</version>
   <type>aar</type>
 </dependency>
 ```
 or Gradle:
 ```groovy
-compile 'de.psdev.formvalidations:formvalidations:1.1.1@aar'
+compile 'de.psdev.formvalidations:formvalidations:1.1.2'
 ```
 
 Sample
@@ -74,6 +74,13 @@ Credits
 
 This library is based on [z-validations][3] by [Vitaliy Zasadnyy][4].
 
+Contributors
+------------
+
+Thank you to all the contributors of this project, namely:
+
+- [Cristian Hernandez](https://github.com/PSDev/LicensesDialog/commits?author=devcodaltec)
+
 License
 -------
 

diff --git a/library/AndroidManifest.xml b/library/AndroidManifest.xml
@@ -16,12 +16,12 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    android:versionCode="1001001"
-    android:versionName="1.1.1-SNAPSHOT"
+    android:versionCode="1001002"
+    android:versionName="1.1.2-SNAPSHOT"
     package="de.psdev.formvalidations">
 
     <uses-sdk
-        android:minSdkVersion="7"
-        android:targetSdkVersion="18" />
+        android:minSdkVersion="8"
+        android:targetSdkVersion="23" />
     <application />
 </manifest>
diff --git a/library/pom.xml b/library/pom.xml
@@ -5,6 +5,7 @@
         <groupId>de.psdev.formvalidations</groupId>
         <artifactId>formvalidations-parent</artifactId>
         <version>1.1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>formvalidations</artifactId>
@@ -48,7 +49,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>com.jayway.maven.plugins.android.generation2</groupId>
+                <groupId>com.simpligility.maven.plugins</groupId>
                 <artifactId>android-maven-plugin</artifactId>
                 <extensions>true</extensions>
                 <executions>
@@ -92,14 +93,15 @@
             </plugin>
 
             <plugin>
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-release-plugin</artifactId>
             </plugin>
 
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-release-plugin</artifactId>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
             </plugin>
+
         </plugins>
     </build>
 

diff --git a/library/src/test/java/de/psdev/formvalidations/BaseTest.java b/library/src/test/java/de/psdev/formvalidations/BaseTest.java
@@ -20,7 +20,9 @@
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
+import android.os.Build;
+
 @RunWith(RobolectricTestRunner.class)
-@Config(manifest = "src/test/resources/AndroidManifest.xml")
+@Config(sdk = Build.VERSION_CODES.LOLLIPOP)
 public abstract class BaseTest {
 }
diff --git a/pom.xml b/pom.xml
@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
+    <prerequisites>
+        <maven>3.2.1</maven>
+    </prerequisites>
+
     <parent>
         <groupId>org.sonatype.oss</groupId>
         <artifactId>oss-parent</artifactId>
@@ -57,33 +62,33 @@
 
     <ciManagement>
         <system>Travis CI</system>
-        <url>https://travis-ci.org/PSDev/FormValidations</url>
+        <url>https://ci.psdev.de/job/PSDevFormValidations/</url>
     </ciManagement>
 
     <properties>
         <!-- Project Properties -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.6</java.version>
-        <android.sdk.platform>16</android.sdk.platform>
+        <android.sdk.platform>23</android.sdk.platform>
 
         <!-- Dependency Versions -->
-        <junit.version>4.11</junit.version>
-        <robolectric.version>2.4</robolectric.version>
-        <android.version>4.1.1.4</android.version>
-        <support-v4.version>r7</support-v4.version>
-        <jsr305.version>3.0.0</jsr305.version>
-        <butterknife.version>6.0.0</butterknife.version>
-        <slf4j-api.version>1.7.7</slf4j-api.version>
+        <junit.version>4.12</junit.version>
+        <robolectric.version>3.0</robolectric.version>
+        <android.version>6.0_r3</android.version>
+        <support-v4.version>23.3.0</support-v4.version>
+        <jsr305.version>3.0.1</jsr305.version>
+        <butterknife.version>7.0.1</butterknife.version>
+        <slf4j-api.version>1.7.21</slf4j-api.version>
 
         <!-- Plugin Versions -->
-        <maven-compiler-plugin.version>3.2</maven-compiler-plugin.version>
-        <android-maven-plugin.version>4.0.0-rc.2</android-maven-plugin.version>
-        <maven-release-plugin.version>2.5.1</maven-release-plugin.version>
-        <maven-javadoc-plugin.version>2.10.1</maven-javadoc-plugin.version>
-        <maven-source-plugin.version>2.4</maven-source-plugin.version>
-        <jacoco-maven-plugin.version>0.7.1.201405082137</jacoco-maven-plugin.version>
-        <maven-gpg-plugin.version>1.4</maven-gpg-plugin.version>
+        <maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
+        <android-maven-plugin.version>4.4.1</android-maven-plugin.version>
+        <maven-release-plugin.version>2.5.3</maven-release-plugin.version>
+        <maven-javadoc-plugin.version>2.10.3</maven-javadoc-plugin.version>
+        <maven-source-plugin.version>3.0.0</maven-source-plugin.version>
+        <jacoco-maven-plugin.version>0.7.6.201602180812</jacoco-maven-plugin.version>
+        <maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
     </properties>
 
     <dependencyManagement>
@@ -109,9 +114,10 @@
                 <version>${android.version}</version>
             </dependency>
             <dependency>
-                <groupId>com.google.android</groupId>
+                <groupId>com.android.support</groupId>
                 <artifactId>support-v4</artifactId>
                 <version>${support-v4.version}</version>
+                <type>aar</type>
             </dependency>
 
             <!-- Nullable -->
@@ -163,32 +169,36 @@
                 </plugin>
 
                 <plugin>
-                    <groupId>com.jayway.maven.plugins.android.generation2</groupId>
+                    <groupId>com.simpligility.maven.plugins</groupId>
                     <artifactId>android-maven-plugin</artifactId>
+                    <extensions>true</extensions>
                     <version>${android-maven-plugin.version}</version>
                     <configuration>
+                        <!-- General settings -->
                         <sdk>
+                            <path>${env.ANDROID_HOME}</path>
                             <platform>${android.sdk.platform}</platform>
                         </sdk>
+                        <extractDuplicates>true</extractDuplicates>
+                        <undeployBeforeDeploy>true</undeployBeforeDeploy>
+                        <includeLibsJarsFromApklib>true</includeLibsJarsFromApklib>
+                        <includeLibsJarsFromAar>true</includeLibsJarsFromAar>
+
+                        <!-- Project Structure -->
+                        <androidManifestFile>${project.basedir}/AndroidManifest.xml</androidManifestFile>
+                        <assetsDirectory>${project.basedir}/assets</assetsDirectory>
+                        <resourceDirectory>${project.basedir}/res</resourceDirectory>
+                        <nativeLibrariesDirectory>${project.basedir}/libs</nativeLibrariesDirectory>
+
+                        <!-- Lint -->
                         <lintEnableLibraries>true</lintEnableLibraries>
-                        <lintFailOnError>false</lintFailOnError>
+                        <lintFailOnError>true</lintFailOnError>
                         <lintEnableHtml>true</lintEnableHtml>
                         <lintConfig>${project.basedir}/lint.xml</lintConfig>
                         <lintSkip>false</lintSkip>
-                        <!-- Use old Paths for now -->
-                        <androidManifestFile>${project.basedir}/AndroidManifest.xml</androidManifestFile>
-                        <updatedManifestFile>${project.basedir}/AndroidManifest.xml</updatedManifestFile>
-                        <resourceDirectory>${project.basedir}/res</resourceDirectory>
-                        <assetsDirectory>${project.basedir}/assets</assetsDirectory>
                     </configuration>
                 </plugin>
 
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>build-helper-maven-plugin</artifactId>
-                    <version>${build-helper-maven-plugin.version}</version>
-                </plugin>
-
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-source-plugin</artifactId>
@@ -199,6 +209,29 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
                     <version>${maven-javadoc-plugin.version}</version>
+                    <configuration>
+                        <sourceFileExcludes>
+                            <sourceFileExclude>**/R.java</sourceFileExclude>
+                        </sourceFileExcludes>
+                        <failOnError>false</failOnError>
+                        <tags>
+                            <tag>
+                                <name>attr</name>
+                                <placement>t</placement>
+                                <head>Attribute:</head>
+                            </tag>
+                            <tag>
+                                <name>hide</name>
+                                <placement>x</placement>
+                            </tag>
+                            <tag>
+                                <name>note</name>
+                                <placement>a</placement>
+                                <head>Note:</head>
+                            </tag>
+                        </tags>
+                        <quiet>true</quiet>
+                    </configuration>
                 </plugin>
 
                 <plugin>
@@ -216,6 +249,8 @@
                     <artifactId>jacoco-maven-plugin</artifactId>
                     <version>${jacoco-maven-plugin.version}</version>
                     <configuration>
+                        <inclNoLocationClasses>true</inclNoLocationClasses>
+                        <inclBootstrapClasses>true</inclBootstrapClasses>
                         <excludes>
                             <exclude>**/BuildConfig.class</exclude>
                             <exclude>**/R*.class</exclude>
@@ -238,7 +273,6 @@
                         </execution>
                     </executions>
                 </plugin>
-
             </plugins>
         </pluginManagement>
     </build>

diff --git a/sample/AndroidManifest.xml b/sample/AndroidManifest.xml
@@ -20,8 +20,8 @@
     package="de.psdev.formvalidations.sample">
 
     <uses-sdk
-        android:minSdkVersion="7"
-        android:targetSdkVersion="19" />
+        android:minSdkVersion="8"
+        android:targetSdkVersion="23" />
 
     <application
         android:icon="@drawable/ic_launcher"

diff --git a/sample/lint.xml b/sample/lint.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2013 Philip Schiffer
+  ~
+  ~    Licensed under the Apache License, Version 2.0 (the "License");
+  ~    you may not use this file except in compliance with the License.
+  ~    You may obtain a copy of the License at
+  ~
+  ~        http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~    Unless required by applicable law or agreed to in writing, software
+  ~    distributed under the License is distributed on an "AS IS" BASIS,
+  ~    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~    See the License for the specific language governing permissions and
+  ~    limitations under the License.
+  -->
+
+<lint>
+
+</lint>
diff --git a/sample/pom.xml b/sample/pom.xml
@@ -1,26 +1,11 @@
-<!--
-  ~ Copyright 2013 Philip Schiffer
-  ~
-  ~     Licensed under the Apache License, Version 2.0 (the "License");
-  ~     you may not use this file except in compliance with the License.
-  ~     You may obtain a copy of the License at
-  ~
-  ~         http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~     Unless required by applicable law or agreed to in writing, software
-  ~     distributed under the License is distributed on an "AS IS" BASIS,
-  ~     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~     See the License for the specific language governing permissions and
-  ~     limitations under the License.
-  -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>de.psdev.formvalidations</groupId>
         <artifactId>formvalidations-parent</artifactId>
         <version>1.1.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>sample</artifactId>
@@ -43,8 +28,9 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>com.google.android</groupId>
+            <groupId>com.android.support</groupId>
             <artifactId>support-v4</artifactId>
+            <type>aar</type>
         </dependency>
 
         <!-- ButterKnife View Injection-->
@@ -66,7 +52,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>com.jayway.maven.plugins.android.generation2</groupId>
+                <groupId>com.simpligility.maven.plugins</groupId>
                 <artifactId>android-maven-plugin</artifactId>
                 <extensions>true</extensions>
                 <executions>