From 796f8b936eb8c9a50895561d1d57a239504a1fb1 Mon Sep 17 00:00:00 2001
From: Feliciano Long <admin@fz-l.com>
Date: Sat, 4 Jun 2016 12:05:58 -0500
Subject: [PATCH] Fix testcase bug and republish

---
 .idea/modules/xlsx2json.iml      | 2 +-
 .idea/modules/xlsx2json_main.iml | 2 +-
 .idea/modules/xlsx2json_test.iml | 2 +-
 build.gradle                     | 2 +-
 testcases/test4.expected.json    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.idea/modules/xlsx2json.iml b/.idea/modules/xlsx2json.iml
index acd0d54..f2515f9 100644
--- a/.idea/modules/xlsx2json.iml
+++ b/.idea/modules/xlsx2json.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="xlsx2json" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="moe.imvery.utils" external.system.module.version="1.3" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="xlsx2json" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="moe.imvery.utils" external.system.module.version="1.4" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$/../..">
diff --git a/.idea/modules/xlsx2json_main.iml b/.idea/modules/xlsx2json_main.iml
index a9fea06..1a40d7f 100644
--- a/.idea/modules/xlsx2json_main.iml
+++ b/.idea/modules/xlsx2json_main.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="xlsx2json:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="moe.imvery.utils" external.system.module.type="sourceSet" external.system.module.version="1.3" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="xlsx2json:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="moe.imvery.utils" external.system.module.type="sourceSet" external.system.module.version="1.4" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/../../build/classes/main" />
     <exclude-output />
diff --git a/.idea/modules/xlsx2json_test.iml b/.idea/modules/xlsx2json_test.iml
index 084b212..c9730ce 100644
--- a/.idea/modules/xlsx2json_test.iml
+++ b/.idea/modules/xlsx2json_test.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="xlsx2json:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="moe.imvery.utils" external.system.module.type="sourceSet" external.system.module.version="1.3" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="xlsx2json:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="moe.imvery.utils" external.system.module.type="sourceSet" external.system.module.version="1.4" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
     <output-test url="file://$MODULE_DIR$/../../build/classes/test" />
     <exclude-output />
diff --git a/build.gradle b/build.gradle
index f0dd2a8..2d0efb4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 group 'moe.imvery.utils'
-version '1.3'
+version '1.4'
 
 apply plugin: 'java'
 
diff --git a/testcases/test4.expected.json b/testcases/test4.expected.json
index f678d25..f4de62b 100644
--- a/testcases/test4.expected.json
+++ b/testcases/test4.expected.json
@@ -1 +1 @@
-{"weaponStuffs":[{"forSale":false,"durability":0,"priceType":"DIAMOND","description":"desc","pic":"bigflask.png","maxGrade":60,"powerAddtion":108,"life":0,"basePower":0,"price":0,"name":"BIG FLASK","_id":"BIG_FLASK","damageType":"WEAPON"},{"forSale":false,"durability":0,"priceType":"DIAMOND","description":"desc","pic":"bigsword.png","maxGrade":60,"powerAddtion":108,"life":0,"basePower":0,"price":0,"name":"BIG SWORD","_id":"BIG_SWORD","damageType":"WEAPON"}],"skillStuffs":[{"shakeStrengthY":30,"cd":60,"shakeStrengthX":30,"forSale":false,"level":1,"priceType":"DIAMOND","description":"desc","pic":"apple shock.png","maxGrade":10,"powerAddtion":1000,"shakeTime":0.5,"basePower":1000,"hurtMusic":"appleshock.wav","voiceWords":["APPLESHOCK","APPLESHO"],"price":0,"name":"APPLE SHOCK","desicionTime":200,"hurtName":"HIT01","_id":"APPLE_SHOCK","bookPic":"appleshockbook.png","damageType":"DEADATTACK"}],"essenceStuffs":[{"forSale":false,"exAddition":[],"star":2,"level":1,"priceType":"DIAMOND","description":"He is a famous guy","pic":"null","bigSkillStuffId":"MOONWALK","price":0,"basicIntelligence":10,"starAddition":[22,15,10,0.12],"name":"MJ","skillStuffIds":["INFINITY_STRIKE","SHADOW_FIST"],"_id":"S10_ESSENCE","basicPower":18,"basicLife":120}]}
\ No newline at end of file
+{"weaponStuffs":[{"forSale":false,"durability":0,"priceType":"DIAMOND","description":"desc","pic":"bigflask.png","maxGrade":60,"powerAddtion":108,"life":0,"basePower":0,"price":0,"name":"BIG FLASK","_id":"BIG_FLASK","damageType":"WEAPON"},{"forSale":false,"durability":0,"priceType":"DIAMOND","description":"desc","pic":"bigsword.png","maxGrade":60,"powerAddtion":108,"life":0,"basePower":0,"price":0,"name":"BIG SWORD","_id":"BIG_SWORD","damageType":"WEAPON"}],"skillStuffs":[{"shakeStrengthY":30,"cd":60,"shakeStrengthX":30,"forSale":false,"level":1,"priceType":"DIAMOND","description":"desc","pic":"apple shock.png","maxGrade":10,"powerAddtion":1000,"shakeTime":0.5,"basePower":1000,"hurtMusic":"appleshock.wav","voiceWords":["APPLESHOCK","APPLESHO"],"price":0,"name":"APPLE SHOCK","desicionTime":200,"hurtName":"HIT01","_id":"APPLE_SHOCK","bookPic":"appleshockbook.png","damageType":"DEADATTACK"}],"essenceStuffs":[{"forSale":false,"exAddition":[],"star":2,"level":1,"priceType":"DIAMOND","description":"He is a famous guy","pic":null,"bigSkillStuffId":"MOONWALK","price":0,"basicIntelligence":10,"starAddition":[22,15,10,0.12],"name":"MJ","skillStuffIds":["INFINITY_STRIKE","SHADOW_FIST"],"_id":"S10_ESSENCE","basicPower":18,"basicLife":120}]}
\ No newline at end of file