Merge branch 'dev'

.travis.yml

@@ -28,4 +28,6 @@ before_script:
   - adb wait-for-device && sleep 300
   - adb shell input keyevent 82 &
 
-script: ./gradlew lib:connectedAndroidTest -Ptravis --stacktrace
+script:
+  - ./gradlew lib:connectedAndroidTest -Ptravis --stacktrace
+  - ./gradlew lib:check -Ptravis --stacktrace

config/quality.gradle

@@ -16,7 +16,7 @@ task checkstyle(type: Checkstyle) {
 }
 
 
-task findbugs(type: FindBugs) {
+task findbugs(type: FindBugs, dependsOn: assembleDebug) {
     ignoreFailures = false
     effort = "max"
     reportLevel = "high"

config/quality/checkstyle/suppressions.xml

@@ -8,5 +8,5 @@
     <suppress files="R.java" checks="[a-zA-Z0-9]*"/>
     <suppress files="BuildConfig.java" checks="[a-zA-Z0-9]*"/>
     <suppress files="(Test.java)$" checks="[a-zA-Z0-9]*"/>
-
+    <suppress files="CustomLruCache.java" checks="[a-zA-Z0-9]*"/>
 </suppressions>

config/quality/pmd/pmd-ruleset.xml

@@ -1,4 +1,20 @@
 <?xml version="1.0"?>
+<!--
+  ~ Copyright 2015 Vincent Brison.
+  ~
+  ~ 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.
+  -->
+
 <ruleset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Android Application Rules"
     xmlns="http://pmd.sf.net/ruleset/1.0.0"
     xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd"
@@ -8,26 +24,30 @@
 
     <exclude-pattern>.*/R.java</exclude-pattern>
     <exclude-pattern>.*/gen/.*</exclude-pattern>
+    <exclude-pattern>.*/CustomLruCache.java</exclude-pattern>
 
-    <rule ref="rulesets/android.xml">
+    <rule ref="rulesets/java/android.xml">
         <!-- Config.LOGD deprecated in API level 4 !-->
         <exclude name="ProtectLogD" />
         <!-- Config.LOGV deprecated in API level 4 !-->
         <exclude name="ProtectLogV" />
     </rule>
-    <rule ref="rulesets/clone.xml" />
-    <rule ref="rulesets/finalizers.xml" />
-    <rule ref="rulesets/imports.xml" />
-    <rule ref="rulesets/logging-java.xml" />
-    <rule ref="rulesets/braces.xml" />
-    <rule ref="rulesets/strings.xml" />
-    <rule ref="rulesets/basic.xml" />
-    <rule ref="rulesets/naming.xml">
+    <rule ref="rulesets/java/clone.xml" />
+    <rule ref="rulesets/java/finalizers.xml" />
+    <rule ref="rulesets/java/imports.xml">
+        <!-- Espresso is designed this way !-->
+        <exclude name="TooManyStaticImports" />
+    </rule>
+    <rule ref="rulesets/java/logging-java.xml" />
+    <rule ref="rulesets/java/braces.xml" />
+    <rule ref="rulesets/java/strings.xml" />
+    <rule ref="rulesets/java/basic.xml" />
+    <rule ref="rulesets/java/naming.xml">
         <exclude name="AbstractNaming" />
         <exclude name="LongVariable" />
         <exclude name="LongMethodName" />
         <exclude name="ShortMethodName" />
         <exclude name="ShortVariable" />
         <exclude name="VariableNamingConventions" />
     </rule>
-</ruleset>
+</ruleset>

gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=2.1.0
+VERSION_NAME=2.2.0
 VERSION_CODE=1
 
 GROUP=com.vincentbrison.openlibraries.android

lib/build.gradle

@@ -26,7 +26,6 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:support-v4:22.2.0'
     compile 'com.jakewharton:disklrucache:2.0.2'
     compile 'com.fasterxml.jackson.core:jackson-databind:2.4.2'
 

lib/maven_push.gradle

@@ -74,7 +74,8 @@ afterEvaluate { project ->
         allprojects {
             ext."signing.password" = ask("Please provide your key password")
             ext."signing.keyId" = "D376F8F6"
-            ext."signing.secretKeyRingFile" = "/Users/vincentbrison/.gnupg/secring.gpg"
+            ext."signing.secretKeyRingFile" = "C:/Users/Brize/AppData/Roaming/gnupg/secring.gpg"
+            //ext."signing.secretKeyRingFile" = "/Users/vincentbrison/.gnupg/secring.gpg"
         }
         required { isReleaseBuild() && gradle.taskGraph.hasTask("uploadArchives") }
         sign configurations.archives