Merge pull request #37 from BrunnerLivio/0.91.1

0.91.1

Author: celandro

bin/add-version.sh

@@ -69,9 +69,13 @@ NEW_JSON_PATH="${NEW_VERSION_FOLDER}/GAME_MASTER.json"
 
 echo $NEW_PROTOBUF_PATH
 
-mkdir $NEW_VERSION_FOLDER
+# Add folder only if needed
+mkdir -p $NEW_VERSION_FOLDER
 
-cp $PROTOBUF_FILE $NEW_PROTOBUF_PATH
+# Check if file is already in the destination
+if [ "$(stat -c "%d:%i" $PROTOBUF_FILE)" != "$(stat -c "%d:%i" $NEW_PROTOBUF_PATH)" ]; then
+  cp $PROTOBUF_FILE $NEW_PROTOBUF_PATH
+fi
 
 docker run -it --rm --name my-maven-project -v "$HOME/.m2":/root/.m2 -v `pwd`:/usr/src/mymaven -w /usr/src/mymaven maven:3.2-jdk-8 mvn clean package exec:java -Dexec.mainClass="com.pokebattler.gamemaster.GenerateJSON" -Dexec.args="${PROTOBUF_FILE} versions/${VERSION_TO_ADD}/GAME_MASTER.json"
 

doc/ADDVERSION.md

@@ -40,7 +40,7 @@ The file system should be order like this
     * *NIX: ` docker run -it --rm --name my-maven-project -v "$HOME/.m2":/root/.m2 -v `pwd`:/usr/src/mymaven -w /usr/src/mymaven maven:3.2-jdk-8 mvn clean package exec:java -Dexec.mainClass="com.pokebattler.gamemaster.GenerateJSON" -Dexec.args="versions/latest/GAME_MASTER.protobuf versions/latest/GAME_MASTER.json"`
 
 3. (Optional) Generate the file manually
-  * WINDOWS: `java -cp target\pokemongo-game-master-2.15.0.jar com.pokebattler.gamemaster.GenerateJSON versions\latest\GAME_MASTER.protobuf versions\latest\GAME_MASTER.json`
-  * *NIX: `java -cp target/pokemongo-game-master-2.15.0.jar com.pokebattler.gamemaster.GenerateJSON versions/latest/GAME_MASTER.protobuf versions/latest/GAME_MASTER.json`
+  * WINDOWS: `java -cp target\pokemongo-game-master-2.22.0.jar com.pokebattler.gamemaster.GenerateJSON versions\latest\GAME_MASTER.protobuf versions\latest\GAME_MASTER.json`
+  * *NIX: `java -cp target/pokemongo-game-master-2.22.0.jar com.pokebattler.gamemaster.GenerateJSON versions/latest/GAME_MASTER.protobuf versions/latest/GAME_MASTER.json`
 
 

pom.xml

@@ -3,7 +3,7 @@
 
     <groupId>com.pokebattler</groupId>
     <artifactId>pokemongo-game-master</artifactId>
-    <version>2.15.0</version>
+    <version>2.22.0</version>
     <packaging>jar</packaging>
 
     <name>PokeBattler Fight</name>
@@ -13,7 +13,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>1.8</java.version>
-        <gamemaster.version>2.15.0</gamemaster.version>
+        <gamemaster.version>2.22.0</gamemaster.version>
     </properties>
 	<repositories>
 	    <repository>