Merge branch 'develop'

# Conflicts: # gradle.properties
jguerinet · Jun 6, 2019 · 710cf35 · 710cf35
2 parents 122a199 + 7176647
commit 710cf35
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Change Log
 
+## Version 8.0.1 (2019-06-06)
+-   Remove percentage formatting on iOS
+
 ## Version 8.0.0 (2019-04-18)
 
 -   Added option to specify the casing for the key and type values in a constants config (none, camel, pascal, snake, caps)

diff --git a/build.gradle b/build.gradle
@@ -16,7 +16,7 @@
  */
 
 buildscript {
-    ext.kotlin_version = '1.3.21'
+    ext.kotlin_version = '1.3.31'
     repositories {
         jcenter()
     }

diff --git a/gradle.properties b/gradle.properties
@@ -16,7 +16,7 @@
 #
 
 # Project properties
-weave_version=8.0.0
+weave_version=8.0.1
 artifact_name=weave
 artifact_main_class=com.guerinet.weave.Weave
 group=com.guerinet

diff --git a/src/main/java/Weave.kt b/src/main/java/Weave.kt
@@ -603,8 +603,6 @@ open class Weave {
                     // Remove <html> </html>tags
                     .replace(HTML_START_TAG, "", ignoreCase = true)
                     .replace(HTML_END_TAG, "", ignoreCase = true)
-                    // Percentages
-                    .replace("%", "%%")
 
                 writer.println("\"$key\" = \"$string\";")
             }