Merge commit 'a2e3dcec42f1bfa020de253008d3a13966437742' into develop

Author: maxme

README.md

@@ -1,5 +1,27 @@
 # WordPress-Utils-Android
 
-Part of the [WordPress-Android] project.
+Collection of utility methods for Android and WordPress.
 
-[WordPress-Android]: https://github.com/wordpress-mobile/WordPress-Android
+## Use the library
+
+* In your build.gradle:
+```groovy
+dependencies {
+    // use the latest 1.x version
+    compile 'org.wordpress:utils:1.+'
+}
+```
+
+## Publish it to bintray
+
+```shell
+$ ./gradlew assemble publishToMavenLocal bintrayUpload -PbintrayUser=FIXME -PbintrayKey=FIXME -PdryRun=false
+```
+
+## Apps that use this library
+- [WordPress for Android][1]
+
+## License
+Dual licensed under MIT, and GPL.
+
+[1]: https://github.com/wordpress-mobile/WordPress-Android

WordPressUtils/build.gradle

@@ -4,12 +4,12 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:2.1.3'
+        classpath 'com.novoda:bintray-release:0.3.4'
     }
 }
 
 apply plugin: 'com.android.library'
-apply plugin: 'maven'
-apply plugin: 'signing'
+apply plugin: 'com.novoda.bintray-release'
 
 repositories {
     jcenter()
@@ -32,68 +32,13 @@ android {
     buildToolsVersion "24.0.2"
 
     defaultConfig {
-        versionName "1.10.0"
+        versionName "1.12.0"
         minSdkVersion 14
         targetSdkVersion 24
     }
 }
 
-version android.defaultConfig.versionName
-group = "org.wordpress"
-archivesBaseName = "utils"
-
-signing {
-    required {
-        has("release") && project.properties.containsKey("signing.keyId") && project.properties.containsKey("signing.secretKeyRingFile")
-    }
-    sign configurations.archives
-}
-
-uploadArchives {
-    repositories {
-        mavenDeployer {
-            beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
-
-            repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
-                authentication(userName: project.properties.ossrhUsername, password: project.properties.ossrhPassword)
-            }
-
-            snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
-                authentication(userName: project.properties.ossrhUsername, password: project.properties.ossrhPassword)
-            }
-
-            pom.project {
-                name 'WordPress-Utils-Android'
-                packaging 'aar'
-                description 'Utils lib for WordPress-Android'
-                url 'https://github.com/wordpress-mobile/WordPress-Utils-Android'
-                scm {
-                    connection 'scm:git:https://github.com/wordpress-mobile/WordPress-Utils-Android.git'
-                    developerConnection 'scm:git:https://github.com/wordpress-mobile/WordPress-Utils-Android.git'
-                    url 'https://github.com/wordpress-mobile/WordPress-Utils-Android'
-                }
-
-                licenses {
-                    license {
-                        name 'The MIT License (MIT)'
-                        url 'http://opensource.org/licenses/MIT'
-                    }
-                }
-
-                developers {
-                    developer {
-                        id 'maxme'
-                        name 'Maxime Biais'
-                        email 'maxime@automattic.com'
-                    }
-                }
-            }
-        }
-    }
-}
-
 android.libraryVariants.all { variant ->
-
     task("generate${variant.name}Javadoc", type: Javadoc) {
         description "Generates Javadoc for $variant.name."
         source = variant.javaCompile.source
@@ -105,3 +50,16 @@ android.libraryVariants.all { variant ->
         exclude '**/R.java'
     }
 }
+
+publish {
+    artifactId = 'utils'
+    userOrg = 'wordpress-mobile'
+    groupId = 'org.wordpress'
+    uploadName = 'utils'
+    description = 'Utils library for Android'
+    publishVersion = android.defaultConfig.versionName
+    licences = ['MIT', 'GPL']
+    website = 'https://github.com/wordpress-mobile/WordPress-Utils-Android/'
+    dryRun = 'false'
+    autoPublish = 'true'
+}

WordPressUtils/src/main/java/org/wordpress/android/util/MapUtils.java

@@ -47,12 +47,40 @@ public static long getMapLong(final Map<?, ?> map, final String key, long defaul
         }
     }
 
+    /*
+     * float version of above
+     */
+    public static float getMapFloat(final Map<?, ?> map, final String key) {
+        return getMapFloat(map, key, 0);
+    }
+    public static float getMapFloat(final Map<?, ?> map, final String key, float defaultValue) {
+        try {
+            return Float.parseFloat(getMapStr(map, key));
+        } catch (NumberFormatException e) {
+            return defaultValue;
+        }
+    }
+
+    /*
+     * double version of above
+     */
+    public static double getMapDouble(final Map<?, ?> map, final String key) {
+        return getMapDouble(map, key, 0);
+    }
+    public static double getMapDouble(final Map<?, ?> map, final String key, double defaultValue) {
+        try {
+            return Double.parseDouble(getMapStr(map, key));
+        } catch (NumberFormatException e) {
+            return defaultValue;
+        }
+    }
+
     /*
      * returns a date object from the passed key in the passed map
      * returns null if key doesn't exist or isn't a date
      */
     public static Date getMapDate(final Map<?, ?> map, final String key) {
-        if (map==null || key==null || !map.containsKey(key))
+        if (map == null || key == null || !map.containsKey(key))
             return null;
         try {
             return (Date) map.get(key);

WordPressUtils/src/main/java/org/wordpress/android/util/StringUtils.java

@@ -225,10 +225,10 @@ public static String replaceUnicodeSurrogateBlocksWithHTMLEntities(final String
      * Used to convert a language code ([lc]_[rc] where lc is language code (en, fr, es, etc...)
      * and rc is region code (zh-CN, zh-HK, zh-TW, etc...) to a displayable string with the languages
      * name.
-     * <p/>
+     *
      * The input string must be between 2 and 6 characters, inclusive. An empty string is returned
      * if that is not the case.
-     * <p/>
+     *
      * If the input string is recognized by {@link Locale} the result of this method is the given
      *
      * @return non-null

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Jul 09 11:48:51 CEST 2014
+#Tue Sep 06 11:08:13 CEST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip